From 7474a5b2cbc71047aa2fbd44692b4127d52c3a9c Mon Sep 17 00:00:00 2001 From: 10002617 Date: Fri, 5 Jun 2026 10:01:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1529=20=E7=89=A9=E6=96=99=E7=A0=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=92=8C=E5=8C=85=E8=A3=85=E7=AE=B1=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=8F=AA=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=9C=AC=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java | 6 ++++++ .../src/main/resources/mapper/WmsQrCodeMasterMapper.xml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java index c7bb15e8..c23b958d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java @@ -21,4 +21,10 @@ public class QrCodeItemSearchQO extends SearchBaseQO { * 库存地点 */ private String storageLocation; + + + /** + * 供应商编号 + */ + private String supplierNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml index 02f70b51..c12ae7c4 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml @@ -49,6 +49,9 @@ and a.create_time <= #{request.endDate} + + and d.supplier_code=#{request.supplierNo} + From 6e28f6f2fc350e40cf85feeb9622e7d466919d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 8 Jun 2026 08:29:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(todo):=20=E6=9B=B4=E6=96=B0=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BB=A5=E6=94=AF=E6=8C=81=E6=96=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 IQmsIssueTicketToDoService 中更新 search 方法参数类型 - 在 QmsIssueTicketTodoController 中更新接口参数类型 - 在 QmsIssueTicketTodoControllerService 中更新服务层参数类型 - 新增 QmsIssueTicketTodoItemSearchQO 查询对象类 - 在 QmsIssueTicketToDoMapper 中更新数据库查询方法参数 - 在 QmsIssueTicketToDoServiceImpl 中更新实现方法参数类型 --- .../QmsIssueTicketTodoController.java | 3 ++- .../QmsIssueTicketTodoControllerService.java | 3 ++- .../qo/QmsIssueTicketTodoItemSearchQO.java | 22 +++++++++++++++++++ .../mapper/QmsIssueTicketToDoMapper.java | 3 ++- .../service/IQmsIssueTicketToDoService.java | 3 ++- .../impl/QmsIssueTicketToDoServiceImpl.java | 3 ++- 6 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java index 86dd2a58..30aa33da 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.qms.admin.service.QmsIssueTicketTodoControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -26,7 +27,7 @@ public class QmsIssueTicketTodoController extends BaseController { * 查询 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody QmsTodoItemSearchQO request) { + public ApiResult> search(@Valid @RequestBody QmsIssueTicketTodoItemSearchQO request) { IPage page = qmsIssueTicketTodoControllerService.search(request); return ApiResult.success(page); } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java index 033fa204..025d8bea 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java @@ -3,6 +3,7 @@ package com.nflg.qms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -28,7 +29,7 @@ public class QmsIssueTicketTodoControllerService { /** * 分页查询待办事项列表 */ - public IPage search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = issueTicketToDoService.search(request); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { pageData.getRecords().forEach(item -> { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java new file mode 100644 index 00000000..c6f7ca05 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java @@ -0,0 +1,22 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单待办事项 列表查询参数 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QmsIssueTicketTodoItemSearchQO extends SearchBaseQO { + + /** + * 标题 + */ + private String title; + + /** + * 来源类型：0=IQC检测任务，1=PDI检测任务，2=巡检，3=PQC检测任务 + */ + private Integer sourceType; +} diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java index 3ac073c5..e18ea632 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -13,7 +14,7 @@ import com.nflg.wms.repository.entity.QmsIssueTicketToDo; */ public interface QmsIssueTicketToDoMapper extends BaseMapper { - IPage search(QmsTodoItemSearchQO request, Long userId, Page page); + IPage search(QmsIssueTicketTodoItemSearchQO request, Long userId, Page page); IssueTicketTodoNotReadNumVO getCount(Long userId); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java index d0b1a281..e8551e71 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java @@ -2,6 +2,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -15,7 +16,7 @@ public interface IQmsIssueTicketToDoService extends IService /** * 分页查询待办事项列表 */ - IPage search(QmsTodoItemSearchQO request); + IPage search(QmsIssueTicketTodoItemSearchQO request); void processed(Long id); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java index 710ed868..087f7de0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsIssueTicketToDoServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -24,7 +25,7 @@ public class QmsIssueTicketToDoServiceImpl implements IQmsIssueTicketToDoService { @Override - public IPage search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = baseMapper.search(request, UserUtil.getUserId(), new Page<>(request.getPage(), request.getPageSize())); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { List ticketIds = pageData.getRecords() From 442893830ed0aa9b665556c6a4614dab15e9d28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 8 Jun 2026 09:02:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(api):=20=E7=BB=9F=E4=B8=80API=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=A0=BC=E5=BC=8F=E5=B9=B6=E4=BF=AE=E5=A4=8DCOA?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改CoaController.existsReport方法返回ApiResult包装格式 - 移除NormalOrderController中未使用的StringUtil导入 - 将COA报告存在性检查改为审核通过状态检查 - 更新错误提示信息为更明确的COA报告提交审核要求 - 修复QmsCoaReviewServiceImpl中删除状态判断条件 - 重命名QmsService.existsReport方法为coaReportPass - 优化COA报告验证结果处理逻辑，避免空值导致的异常 --- .../admin/controller/external/CoaController.java | 5 +++-- .../wms/admin/controller/NormalOrderController.java | 13 ++++++------- .../java/com/nflg/wms/admin/service/QmsService.java | 6 +++--- .../service/impl/QmsCoaReviewServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java index b78a3693..16495d48 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java @@ -1,5 +1,6 @@ package com.nflg.qms.admin.controller.external; +import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.qo.QmsCoaReportCheckQO; import com.nflg.wms.repository.service.IQmsCoaReviewService; import com.nflg.wms.starter.BaseController; @@ -23,7 +24,7 @@ public class CoaController extends BaseController { * 检测COA报告是否存在且已审核 */ @PostMapping("existsReport") - public boolean existsReport(@RequestBody QmsCoaReportCheckQO qo){ - return coaReviewService.existsReport(qo); + public ApiResult existsReport(@RequestBody QmsCoaReportCheckQO qo){ + return ApiResult.success(coaReviewService.existsReport(qo)); } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index 5ac3f10d..5e94de56 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -18,7 +18,6 @@ import com.nflg.wms.common.pojo.dto.SAPOrderDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.DeliverNormalOrderVO; import com.nflg.wms.common.util.NumberUtil; -import com.nflg.wms.common.util.StringUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; @@ -227,8 +226,8 @@ public class NormalOrderController extends BaseController { // VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); exportPdfPerPage(qrCodeMasters, response); } @@ -252,8 +251,8 @@ public class NormalOrderController extends BaseController { // exportPdfInAll(convert(orders), response); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); exportPdfInAll(qrCodeMasters, response); } @@ -405,8 +404,8 @@ public class NormalOrderController extends BaseController { // VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); return exportItemImageZip(convertToPrintDTO(qrCodeMasters)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java index d2148a9b..5f5c2cd0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java @@ -113,9 +113,9 @@ public class QmsService { } /** - * 检查是否免检物料 + * 检查COA报告 */ - public boolean existsReport(String supplierCode,String materialNo,String purchaseNo) { + public boolean coaReportPass(String supplierCode, String materialNo, String purchaseNo) { log.info("检测是否已提交COA报告，供应商：{}，物料编号：{}，采购单号：{}", supplierCode, materialNo,purchaseNo); HttpHeaders headers = new HttpHeaders(); @@ -135,7 +135,7 @@ public class QmsService { VUtil.trueThrowBusinessError( Objects.isNull(response.getBody()) || response.getBody().getCode() != 200 ).throwMessage("检测是否已提交COA报告失败：" + response.getBody().getMessage()); - return response.getBody().getResult(); + return !Objects.equals(response.getBody().getResult(),false); } public void pushInventoryInspection(InventoryDetectionApplyQO request) { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java index 57765246..c9f65490 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java @@ -617,7 +617,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl Date: Mon, 8 Jun 2026 10:33:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(gateway):=20=E6=9B=B4=E6=96=B0SaToken?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E5=85=8D=E7=99=BB=E5=BD=95=E8=B7=AF=E5=BE=84=E5=92=8C=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E8=B7=AF=E5=BE=84=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 /qms/external/** 到免登录接口列表 - 为 /actuator/ 路径添加特殊处理逻辑 - 重新格式化 notMatch 方法中的路径配置 - 实现请求路径包含检查替代通配符匹配 --- .../nflg/wms/gateway/satoken/SaTokenConfigure.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java index dfd04b4e..d6006ea1 100644 --- a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java +++ b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java @@ -38,9 +38,17 @@ public class SaTokenConfigure { .setAuth(obj -> { // 登录校验 -- 拦截所有路由 SaRouter.match("/**") - .notMatch("/auth/**","/srm-receive/**", "/shipment/material/**","**/actuator/**","**/external/**" + .notMatch("/auth/**" + , "/srm-receive/**" + , "/shipment/material/**" + , "/qms/external/**" // MPM 免登录接口 - , "/admin/material/mpm/**", "/admin/package/mpm/**") + , "/admin/material/mpm/**" + , "/admin/package/mpm/**") + .notMatch(r -> { + String path = SaHolder.getRequest().getRequestPath(); + return path.contains("/actuator/"); + }) .check(r -> { String traceId = SaHolder.getRequest().getHeader(Constant.TRACE_ID_HEADER, IdUtil.getSnowflakeNextIdStr()); MDC.put(Constant.TRACE_ID, traceId);