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/RunningEquipmentStatusJob.java | 23 ++++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/RunningMonitoringSpeedJob.java | 22 ++++++----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 4 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java | 9 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 13 +++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml | 28 ++++++++++----
6 files changed, 66 insertions(+), 33 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 8ea5606..ef28617 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
@@ -31,6 +31,7 @@
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -102,10 +103,12 @@
if (dictModelList3 != null && !dictModelList3.isEmpty()) {
equipmentStatusJudge = Integer.valueOf(dictModelList3.get(0).getValue());
}
+ Map<String, String> proNamesByEquipmentIds = mdcEquipmentService.getProNamesByEquipmentIds(equipmentList.stream().map(MdcEquipment::getId).collect(Collectors.toList()));
for (MdcEquipment mdcEquipment : equipmentList) {
+ String productionName = proNamesByEquipmentIds.get(mdcEquipment.getId());
// 鍒ゆ柇鍒╃敤鐜�
// step.1 鏌ヨ娑堟伅涓璁惧鎶ヨ鏃堕棿
- SysAnnouncement sysAnnouncement = sysAnnouncementService.findLastMessage("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊兼姤璀︼紒");
+ SysAnnouncement sysAnnouncement = sysAnnouncementService.findLastMessage("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
boolean flag1 = true;
if (sysAnnouncement != null) {
Date createTime = sysAnnouncement.getCreateTime();
@@ -130,18 +133,18 @@
if (flag) {
// 涓婃姤
MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧鍒╃敤鐜囨姤璀︼紒");
+ messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊兼姤璀︼紒");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囧埄鐢ㄧ巼浣庝簬姝ｅ父鍊硷紒");
sysBaseApi.sendSysAnnouncement(messageDTO);
}
}
}
// 鍒ゆ柇璁惧鐘舵�侀暱鏃堕棿鏃犲彉鍖栧鎵逛汉
- SysAnnouncement sysAnnouncement1 = sysAnnouncementService.findLastMessage("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ SysAnnouncement sysAnnouncement1 = sysAnnouncementService.findLastMessage("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
if (sysAnnouncement1 != null) {
Date createTime = sysAnnouncement1.getCreateTime();
Date msgDate = DateUtils.toDate(DateUtils.format(createTime, DateUtils.STR_DATE), DateUtils.STR_DATE);
@@ -170,28 +173,28 @@
if (adminList != null && !adminList.isEmpty()) {
for (SysUser sysUser : adminList) {
MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser(sysUser.getUsername());
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
}
} else {
MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
sysBaseApi.sendSysAnnouncement(messageDTO);
}
if (adminList != null && !adminList.isEmpty() && superList != null && !superList.isEmpty()) {
MdcMessageApproval mdcMessageApproval = new MdcMessageApproval();
mdcMessageApproval.setEquipmentId(mdcEquipment.getEquipmentId());
- mdcMessageApproval.setTitile("璁惧鐘舵�侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
- mdcMessageApproval.setMsgContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲鎶ヨ锛�");
+ mdcMessageApproval.setTitile("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
+ mdcMessageApproval.setMsgContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶囩姸鎬侀暱鏈熸棤鍙樺寲锛�");
List<String> senderIdList = adminList.stream().map(SysUser::getId).collect(Collectors.toList());
mdcMessageApproval.setSenderIds(String.join(",", senderIdList));
List<String> senderNameList = adminList.stream().map(SysUser::getRealname).collect(Collectors.toList());
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);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
index 5ba9404..fbf4917 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEfficiencyReportMapper.xml
@@ -179,17 +179,29 @@
#{ id }
</foreach>
</if>
- <if test="vo.driveType != null and vo.driveType != null">
- AND me.drive_type = #{ vo.driveType }
+ <if test="vo.driveTypeList != null and vo.driveTypeList .size() > 0 ">
+ AND me.drive_type IN
+ <foreach collection="vo.driveTypeList" item="driveType" index="index" open="(" close=")" separator=",">
+ #{ driveType }
+ </foreach>
</if>
- <if test="vo.equipmentType != null and vo.equipmentType != '' ">
- AND me.equipment_type = #{ vo.equipmentType }
+ <if test="vo.equipmentTypeList != null and vo.equipmentTypeList.size() > 0 ">
+ AND me.equipment_type IN
+ <foreach collection="vo.equipmentTypeList" item="equipmentType" index="index" open="(" close=")" separator=",">
+ #{ equipmentType }
+ </foreach>
</if>
- <if test="vo.deviceLevel != null and vo.deviceLevel != '' ">
- AND me.device_level = #{vo.deviceLevel}
+ <if test="vo.deviceLevelList != null and vo.deviceLevelList.size() > 0 ">
+ AND me.device_level IN
+ <foreach collection="vo.deviceLevelList" item="deviceLevel" index="index" open="(" close=")" separator=",">
+ #{ deviceLevel }
+ </foreach>
</if>
- <if test="vo.deviceCategory != null and vo.deviceCategory != '' ">
- AND me.device_category = #{vo.deviceCategory}
+ <if test="vo.deviceCategoryList != null and vo.deviceCategoryList.size() > 0 ">
+ AND me.device_category IN
+ <foreach collection="vo.deviceCategoryList" item="deviceCategory" index="index" open="(" close=")" separator=",">
+ #{ deviceCategory }
+ </foreach>
</if>
<if test="vo.deviceImportanceLevel != null and vo.deviceImportanceLevel != '' ">
AND me.device_importance_level = #{vo.deviceImportanceLevel}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index 6575ebd..f1dbb69 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -1344,6 +1344,10 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
return result;
}
+ vo.setDeviceCategoryList(Arrays.asList(vo.getDeviceCategory().split(",")));
+ vo.setDeviceLevelList(Arrays.asList(vo.getDeviceLevel().split(",")));
+ vo.setDriveTypeList(Arrays.asList(vo.getDriveType().split(",")));
+ vo.setEquipmentTypeList(Arrays.asList(vo.getEquipmentType().split(",")));
// 鏌ヨ鍘熷鏁版嵁
List<MdcComAnaDto> resultDtos = mdcEfficiencyReportMapper.comparativeAnalysis(vo);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index dd4256c..0f7bbce 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -767,8 +767,9 @@
// List<MdcEquipment> equipmentList = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getDriveType, "FANUC"));
List<MdcEquipment> equipmentList = super.list();
//List<MdcEquipment> equipmentList = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, "2140198"));
-
+ Map<String, String> proNamesByEquipmentIds = this.getProNamesByEquipmentIds(equipmentList.stream().map(MdcEquipment::getId).collect(Collectors.toList()));
for (MdcEquipment mdcEquipment : equipmentList) {
+ String productionName = proNamesByEquipmentIds.get(mdcEquipment.getId());
List<MdcEquipmentThreshold> mdcEquipmentThresholdList = mdcEquipmentThresholdService.list(new LambdaQueryWrapper<MdcEquipmentThreshold>().eq(MdcEquipmentThreshold::getControlSystemType, mdcEquipment.getDriveType()));
if (mdcEquipmentThresholdList != null && !mdcEquipmentThresholdList.isEmpty()) {
String saveTableName = mdcEquipment.getSaveTableName();
@@ -791,7 +792,7 @@
Integer max = mdcEquipmentThreshold.getMaxThreshold();
Integer min = mdcEquipmentThreshold.getMinThreshold();
MessageDTO messageDTO = new MessageDTO();
- messageDTO.setTitle("璁惧" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
+ messageDTO.setTitle("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "鎶ヨ锛�");
messageDTO.setCategory(CommonConstant.MSG_CATEGORY_2);
messageDTO.setFromUser("admin");
messageDTO.setToUser("admin");
@@ -801,15 +802,15 @@
mdcOverrunAlarm.setRealValue(actualValue.toString());
if (actualValue > max) {
// 楂�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "楂樻姤璀︼紒");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "楂樻姤璀︼紒");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent(mdcEquipmentThreshold.getChineseName() + "楂樻姤璀�");
+ mdcOverrunAlarm.setAlarmContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "楂樻姤璀︼紒");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
} else if (actualValue < min) {
// 浣�
- messageDTO.setContent("璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "浣庢姤璀︼紒");
+ messageDTO.setContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "浣庢姤璀︼紒");
sysBaseApi.sendSysAnnouncement(messageDTO);
- mdcOverrunAlarm.setAlarmContent(mdcEquipmentThreshold.getChineseName() + "浣庢姤璀�");
+ mdcOverrunAlarm.setAlarmContent("銆愯澶囧紓甯告彁閱掋��" + productionName + "杞﹂棿璁惧缂栧彿涓� [" + mdcEquipment.getEquipmentId() + "] 鐨勮澶�" + mdcEquipmentThreshold.getChineseName() + "浣庢姤璀︼紒");
mdcOverrunAlarmService.save(mdcOverrunAlarm);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
index a65aa7f..7b5ba51 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/vo/ComparativeAnalysisQueryVo.java
@@ -16,6 +16,8 @@
*/
private String driveType;
+ private List<String> driveTypeList;
+
/**
* 寮�濮嬫椂闂� -> 20220101
*/
@@ -45,16 +47,23 @@
* 璁惧绫诲瀷
*/
private String equipmentType;
+
+ private List<String> equipmentTypeList;
/**
* 璁惧绾у埆
*/
private String deviceLevel;
+
+ private List<String> deviceLevelList;
/**
* 璁惧绉嶇被
*/
private String deviceCategory;
+
+ private List<String> deviceCategoryList;
/**
* 閲嶈绋嬪害
*/
private Integer deviceImportanceLevel;
+
}
--
Gitblit v1.9.3