From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
index ef28617..b3b180a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningEquipmentStatusJob.java
@@ -3,6 +3,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.constant.enums.MessageSplitTypeEnum;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.mdc.constant.MdcConstant;
@@ -134,7 +135,8 @@
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
+ messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
@@ -174,7 +176,8 @@
for (SysUser sysUser : adminList) {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
+ messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
@@ -183,7 +186,8 @@
} else {
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
- messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
+ messageDTO.setCategory(MessageSplitTypeEnum.deviceRunError.getNote());
+ messageDTO.setMessageType(MessageSplitTypeEnum.deviceRunError.getType());
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
--
Gitblit v1.9.3