From 36deabe1df249a56a553fb606447dd326a2c81a7 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 06 三月 2025 15:22:54 +0800
Subject: [PATCH] UPDATE
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
index 657c24f..91adf06 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java
@@ -27,6 +27,8 @@
import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @author Lius
@@ -77,7 +79,9 @@
range = new BigDecimal(dictModelList.get(0).getValue());
}
+ Map<String, String> proNamesByEquipmentIds = mdcEquipmentService.getProNamesByEquipmentIds(mdcEquipmentList.stream().map(MdcEquipment::getId).collect(Collectors.toList()));
for (MdcEquipment mdcEquipment : mdcEquipmentList) {
+ String productionName = proNamesByEquipmentIds.get(mdcEquipment.getId());
String saveTableName = mdcEquipment.getSaveTableName();
MdcEquipmentDto mdcEquipmentDto = new MdcEquipmentDto();
@@ -86,7 +90,7 @@
if (mdcEquipmentDto != null && StringUtils.isNotBlank(mdcEquipmentDto.getSpindlespeed()) && StringUtils.isNotBlank(mdcEquipmentDto.getActualspindlespeed())) {
MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧杩愯杞�熸姤璀︼紒");
+ messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧 [" + mdcEquipment.getEquipmentId() + "] 杩愯杞�燂紒");
messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
@@ -102,15 +106,15 @@
if (range.equals(BigDecimal.ZERO)) {
if (spindlespeed.compareTo(actualspindlespeed) == 1) {
// 璁惧畾鍊煎ぇ浜庡疄闄呭�� 浣�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊间綆鎶ヨ");
+ mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊间綆");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
} else if (spindlespeed.compareTo(actualspindlespeed) == -1) {
// 璁惧畾鍊煎皬浜庡疄闄呭�� 楂�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊奸珮鎶ヨ");
+ mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊奸珮");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
}
} else {
@@ -120,15 +124,15 @@
if (actualspindlespeed.compareTo(max) == 1 || actualspindlespeed.compareTo(min) == -1) {
if (spindlespeed.compareTo(actualspindlespeed) == 1) {
// 璁惧畾鍊煎ぇ浜庡疄闄呭�� 浣�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熶綆锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊间綆鎶ヨ");
+ mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊间綆");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
} else if (spindlespeed.compareTo(actualspindlespeed) == -1) {
// 璁惧畾鍊煎皬浜庡疄闄呭�� 楂�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囪繍琛岃浆閫熼珮锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊奸珮鎶ヨ");
+ mdcOverrunAlarm.setAlarmContent("璁惧杩愯杞�熸瘮NC浠ｇ爜璁惧畾鍊奸珮");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
}
}
--
Gitblit v1.9.3