From 5a147d12e5f8093017c939b81499732c5fa3344d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 14 三月 2025 10:08:40 +0800
Subject: [PATCH] 消息发送地址调整
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java | 5 +-
ruoyi-common/src/main/java/com/ruoyi/common/constant/MenuJumpPathConstants.java | 40 ++++++++++++++++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java | 3 +
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java | 3 +
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 11 +++--
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 9 ++--
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenancePlanServiceImpl.java | 3 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 5 +-
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java | 3 +
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceTraceabilityManagementServiceImpl.java | 3 +
cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java | 3 +
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 5 +-
12 files changed, 72 insertions(+), 21 deletions(-)
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
index a31d3da..3e6e513 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceCalibrationPlanServiceImpl.java
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
@@ -181,7 +182,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(deviceCalibrationPlan.getRatifyUserId());
- info.setJumpPath("a6-device");
+ info.setJumpPath(MenuJumpPathConstants.DEVICE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
index 959c349..b0d6ba6 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceExaminePlanServiceImpl.java
@@ -11,6 +11,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
@@ -192,7 +193,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(examinePlan.getRatifyUserId());
- info.setJumpPath("a6-device");
+ info.setJumpPath(MenuJumpPathConstants.DEVICE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenancePlanServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenancePlanServiceImpl.java
index 3b66ce8..0823576 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenancePlanServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenancePlanServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
@@ -250,7 +251,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(audit.getId());
- info.setJumpPath("a6-device");
+ info.setJumpPath(MenuJumpPathConstants.DEVICE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceTraceabilityManagementServiceImpl.java b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceTraceabilityManagementServiceImpl.java
index 843fa3f..818d22d 100644
--- a/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceTraceabilityManagementServiceImpl.java
+++ b/cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceTraceabilityManagementServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
@@ -201,7 +202,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(audit.getId());
- info.setJumpPath("a6-device");
+ info.setJumpPath(MenuJumpPathConstants.DEVICE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
index 0c056f1..d835099 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonPersonnelCapacityServiceImpl.java
@@ -8,6 +8,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -132,7 +133,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(personPersonnelCapacity.getConfirmOperatingPersonnelId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
this.saveOrUpdate(personPersonnelCapacity);
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
index 4b11bb5..7ec9037 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.SecurityUtils;
@@ -152,7 +153,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(personTrainingRecordSubmitDto.getAssessmentUserId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index 3463126..39218db 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -11,6 +11,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -118,7 +119,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(training.getApproverId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -178,7 +179,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(training.getApproverId());
- info.setJumpPath("a6-personnel");
+ info.setJumpPath(MenuJumpPathConstants.PERSONNEL);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index 27638db..2c86286 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -14,6 +14,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -128,7 +129,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(monitor.getExamineUserId());
- info.setJumpPath("a7-Ensure-results-validity");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -215,7 +216,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualityMonitor.getRatifyUserId());
- info.setJumpPath("a7-Ensure-results-validity");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -439,7 +440,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualityMonitorDetailsRatify.getRatifyUserId());
- info.setJumpPath("a7-Ensure-results-validity");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -553,7 +554,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualityMonitorDetailsEvaluate.getRatifyUserId());
- info.setJumpPath("a7-Ensure-results-validity");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -587,7 +588,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualityMonitorDetailsEvaluate.getImplementUserId());
- info.setJumpPath("a7-Ensure-results-validity");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_MONITOR);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index 2283874..74d9b09 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -14,6 +14,7 @@
import com.deepoove.poi.config.ConfigureBuilder;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.DateImageUtil;
@@ -128,7 +129,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(supervise.getRatifyUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -388,7 +389,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(qualitySuperviseDetailsRecord.getRatifyUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -607,7 +608,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(detailsAccording.getApproverUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
@@ -881,7 +882,7 @@
info.setSenderId(userId);
// 鎺ユ敹浜�
info.setConsigneeId(detailsCorrect.getApproverUserId());
- info.setJumpPath("a7-quality-control-plan");
+ info.setJumpPath(MenuJumpPathConstants.QUALITY_SUPERVISE);
informationNotificationService.addInformationNotification(info);
// 鍙戦�佷紒涓氬井淇￠�氱煡
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 7e74e76..cab07f0 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -30,6 +30,7 @@
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.constant.DictDataConstants;
import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.entity.Custom;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
@@ -142,7 +143,7 @@
private InsOrderFactoryVerifyMapper insOrderFactoryVerifyMapper;
@Resource
private InsOrderFactoryVerifyItemService insOrderFactoryVerifyItemService;
-
+
@Resource
private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper;
@Resource
@@ -810,7 +811,7 @@
info.setSenderId(userId);
info.setConsigneeId(verifyUser);
info.setViewStatus(false);
- info.setJumpPath("b1-inspect-orderPlan-review");
+ info.setJumpPath(MenuJumpPathConstants.INSPECTION_REVIEW);
informationNotificationService.addInformationNotification(info);
// 6.澶嶆牳浜�--鏂板妫�楠屽崟鐩稿叧璐熻矗浜�
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 3bff4d3..46c30d9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -22,6 +22,7 @@
import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.constant.MenuJumpPathConstants;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.InformationNotification;
import com.ruoyi.common.core.domain.entity.User;
@@ -187,7 +188,7 @@
info.setSenderId(submitUserId); //鍙戦�佷汉
info.setConsigneeId(userId); //鏀朵欢浜�
info.setViewStatus(false);
- info.setJumpPath("b1-report-preparation");
+ info.setJumpPath(MenuJumpPathConstants.REPORT_PREPARATION);
informationNotificationService.addInformationNotification(info);
//绯荤粺鐢熸垚鎶ュ憡鍦板潃
String url = insReport.getUrl();
@@ -308,7 +309,7 @@
info.setSenderId(checkUserId); //鍙戦�佷汉
info.setConsigneeId(userId); //鏀朵欢浜�
info.setViewStatus(false);
- info.setJumpPath("b1-report-preparation");
+ info.setJumpPath(MenuJumpPathConstants.REPORT_PREPARATION);
informationNotificationService.addInformationNotification(info);
//绯荤粺鐢熸垚鎶ュ憡鍦板潃
String url = insReport.getUrl();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/MenuJumpPathConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/MenuJumpPathConstants.java
new file mode 100644
index 0000000..50f5933
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/MenuJumpPathConstants.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 鑿滃崟璋冨噯璺緞
+ *
+ * @Author zhuo
+ * @Date 2025/3/14
+ */
+public class MenuJumpPathConstants {
+
+ /**
+ * 鎶ュ憡缂栧埗
+ */
+ public static final String REPORT_PREPARATION = "ReportPreparation";
+
+ /**
+ * 妫�楠屼换鍔″鏍�
+ */
+ public static final String INSPECTION_REVIEW = "InspectionReview";
+
+ /**
+ * 璐ㄩ噺鐩戞帶
+ */
+ public static final String QUALITY_MONITOR = "EnsureResultsValidity";
+
+ /**
+ * 璐ㄩ噺鐩戠潱
+ */
+ public static final String QUALITY_SUPERVISE = "QualityControlPlan";
+
+ /**
+ * 浜哄憳
+ */
+ public static final String DEVICE = "Device";
+
+ /**
+ * 璁惧
+ */
+ public static final String PERSONNEL = "PersonnelInfo";
+}
--
Gitblit v1.9.3