From a3cb768d958e64625786857e0db69335875f5d8e Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 06 六月 2025 13:43:55 +0800
Subject: [PATCH] 消息类型更新
---
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java | 4 ++--
lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java | 4 ++--
lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 2 +-
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java | 4 ++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 2 +-
lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java
index a8b1b45..c37662d 100644
--- a/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java
+++ b/lxzn-boot-base-core/src/main/java/org/jeecg/common/constant/enums/MessageSplitTypeEnum.java
@@ -18,7 +18,7 @@
/** 璁惧杩愯寮傚父 */
deviceRunError("deviceRunError", "璁惧杩愯寮傚父", "device_run_error"),
/** 閽夌姸鎬侀暱鏈熸棤鍙樺寲 */
- statusPermanentlyNoChange("statusPermanentlyNoChange", "閽夌姸鎬侀暱鏈熸棤鍙樺寲", "status_permanently_no_change"),
+ statusPermanentlyNoChange("statusPermanentlyNoChange", "鐘舵�侀暱鏈熸棤鍙樺寲", "status_permanently_no_change"),
/** 缃戠粶鏁呴殰 */
networkFault("networkFault", "缃戠粶鏁呴殰", "network_fault");
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 1080626..d38e4e2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -1190,7 +1190,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle(headInfo);
messageDTO.setFromUser("鏁版嵁瀵煎叆灏忓姪鎵�-灏忓");
- messageDTO.setCategory("瀵煎叆鎿嶄綔闄勫姞淇℃伅");
+ messageDTO.setCategory("瀵煎叆淇℃伅");
messageDTO.setContent(exceptionInfo);
messageDTO.setToUser(user.getUsername());
sysBaseApi.sendSysAnnouncement(messageDTO);
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index fbbfa06..36bb9ae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -296,7 +296,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("鏈夋柊鐨勪繚鍏诲伐鍗�");
messageDTO.setContent(msg);
- messageDTO.setCategory("绯荤粺娑堟伅");
+ messageDTO.setCategory("淇濆吇宸ュ崟");
messageDTO.setFromUser(user.getUsername());
messageDTO.setToUser("admin");
if(equipmentMaintenancePlanDetails.size()!=0){
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
index ec9b129..e1a889f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartCancellingStocksDetailServiceImpl.java
@@ -172,7 +172,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺涓嶈冻锛岃鍙婃椂澶勭悊!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮侊細" + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸蹭綆浜庡畨鍏ㄥ簱瀛�!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢搴撳瓨閲忎笉瓒�");
}
}else if(quantity > sparePart.getInventoryUpperLimit()){
String messageTitle;
@@ -181,7 +181,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺嚭鐜扮Н鍘嬫儏鍐碉紝璇峰強鏃跺鐞�!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸查珮浜庡簱瀛樹笂闄愬�硷紝鍑虹幇绉帇鎯呭喌!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢绉帇");
}
}
return true;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
index 8ec89cf..fd4d7f0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartOutboundDetailServiceImpl.java
@@ -162,7 +162,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺涓嶈冻锛岃鍙婃椂澶勭悊!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮侊細" + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸蹭綆浜庡畨鍏ㄥ簱瀛�!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢搴撳瓨閲忎笉瓒�");
}
}else if(quantity > sparePart.getInventoryUpperLimit()){
String messageTitle;
@@ -171,7 +171,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺嚭鐜扮Н鍘嬫儏鍐碉紝璇峰強鏃跺鐞�!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸查珮浜庡簱瀛樹笂闄愬�硷紝鍑虹幇绉帇鎯呭喌!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢绉帇");
}
}
return true;
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
index a266bfe..6ea6315 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/spare/service/impl/SparePartPurchaseStorageDetailServiceImpl.java
@@ -166,7 +166,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺涓嶈冻锛岃鍙婃椂澶勭悊!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮侊細" + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸蹭綆浜庡畨鍏ㄥ簱瀛�!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢搴撳瓨閲忎笉瓒�");
}
}else if(quantity > sparePart.getInventoryUpperLimit()){
String messageTitle;
@@ -175,7 +175,7 @@
messageTitle = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺嚭鐜扮Н鍘嬫儏鍐碉紝璇峰強鏃跺鐞�!";
messageContent = "绯荤粺娑堟伅锛氬浠剁紪鐮佷负 " + sparePart.getNum() + " 鐨勫浠跺簱瀛橀噺宸查珮浜庡簱瀛樹笂闄愬�硷紝鍑虹幇绉帇鎯呭喌!" + "\n" + "娑堟伅鏃堕棿:" + sysTime + "\n";
for (SysUser sysUser : sysUsers) {
- sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent);
+ sysBaseAPI.sendAnnouncement("admin", sysUser.getUsername(), messageTitle, messageContent, "澶囦欢绉帇");
}
}
return true;
diff --git a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
index c9594c9..aed5c87 100644
--- a/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
+++ b/lxzn-module-system/lxzn-system-api/lxzn-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java
@@ -448,5 +448,5 @@
* @param title 娑堟伅涓婚
* @param msgContent 娑堟伅鍐呭
*/
- public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent);
+ public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent, String category);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
index fe2ecce..0b4395b 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
@@ -1483,7 +1483,7 @@
}
@Override
- public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent) {
+ public void sendAnnouncement(String fromUser, String toUser, String title, String msgContent, String category) {
SysAnnouncement announcement = new SysAnnouncement();
announcement.setTitile(title);
announcement.setMsgContent(msgContent);
@@ -1492,7 +1492,7 @@
announcement.setMsgType(CommonConstant.MSG_TYPE_UESR);
announcement.setSendStatus(CommonConstant.HAS_SEND);
announcement.setSendTime(new Date());
- announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2);
+ announcement.setMsgCategory(org.apache.commons.lang3.StringUtils.isNotBlank(category) ? category : CommonConstant.MSG_CATEGORY_2);
announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0));
sysAnnouncementMapper.insert(announcement);
// 2.鎻掑叆鐢ㄦ埛閫氬憡闃呰鏍囪琛ㄨ褰�
--
Gitblit v1.9.3