From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
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 bc8cac9..e6ba463 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
@@ -422,15 +422,19 @@
} else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindlespeed".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱杞�熷瓧娈祍pindlespeed
value = String.valueOf(((new Random().nextInt(35)) + 1) * 100);
+ mdcEquipmentDto.setSpindlespeed(value);
} else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindleload".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱璐熻嵎瀛楁spindleload
value = String.valueOf(Integer.valueOf(new Random().nextInt(21)));
+ mdcEquipmentDto.setSpindleload(value);
} else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "spindlebeilv".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧涓昏酱鍊嶇巼瀛楁spindlebeilv
value = String.valueOf((new Random().nextInt(13)) * 10);
+ mdcEquipmentDto.setSpindlebeilv(value);
} else if ("ZUOLAN".equals(mdcEquipment.getDriveType()) && "feedbeilv".equals(englishName) && oporation == 3) {
// ZUOLAN璁惧杩涚粰鍊嶇巼瀛楁feedbeilv
value = String.valueOf((new Random().nextInt(13)) * 10);
+ mdcEquipmentDto.setFeedbeilv(value);
} else if ("spindle_current".equals(englishName)) {
// 鍏朵粬璁惧鐢垫祦瀛楁
String devicePower = mdcEquipment.getDevicePower();
@@ -741,6 +745,9 @@
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
+ if (vo.getDeviceImportanceLevel() != null) {
+ queryWrapper.eq(MdcEquipment::getDeviceImportanceLevel, vo.getDeviceImportanceLevel());
+ }
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
@@ -764,8 +771,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();
@@ -788,7 +796,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");
@@ -798,15 +806,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);
}
}
@@ -892,6 +900,9 @@
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
+ if (vo.getDeviceImportanceLevel() != null) {
+ queryWrapper.eq(MdcEquipment::getDeviceImportanceLevel, vo.getDeviceImportanceLevel());
+ }
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
--
Gitblit v1.9.3