From cc0e9036de6e922e8fe254fef01d8de9996024b7 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 18:16:03 +0800
Subject: [PATCH] 获取报警描述修改
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 0a0d678..eae4353 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -79,9 +79,18 @@
dto = new MdcEquipmentRunningSectionDto();
BeanUtils.copyProperties(entity, dto);
if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist && !"ZUOLAN".equals(equip.getDrivetype())) {
- List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
- if (esList != null && esList.size() > 1) {
- dto.setSequenceNumber(esList.get(0).getSequencenumber());
+ //FANUC鑾峰彇绋嬪簭鍚嶇壒娈婂鐞�
+ if (equip.getDrivetype().startsWith("FANUC")) {
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
+ entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getProductName());
+ }
+ }else {
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getSequencenumber());
+ }
}
}
dtos.add(dto);
@@ -94,9 +103,14 @@
BeanUtils.copyProperties(entity, dto);
if (entity.getStatus() == 22) {
if (equip != null) {
- List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, equip.getDrivetype()).eq(MdcAlarmInfo::getAlarmCode, entity.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
- if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
- dto.setAlarmContent(mdcAlarmInfo.get(0).getAlarmContent());
+ Optional<TmpEquipmentAlarm> tmpEquipmentAlarm = entity.getTmpEquipmentAlarmSet().stream().findFirst();
+ if (tmpEquipmentAlarm.isPresent() && StringUtils.isNotBlank(tmpEquipmentAlarm.get().getAlarmContent())) {
+ dto.setAlarmContent(tmpEquipmentAlarm.get().getAlarmContent());
+ }else {
+ List<MdcAlarmInfo> mdcAlarmInfo = mdcAlarmInfoService.list(new LambdaQueryWrapper<MdcAlarmInfo>().eq(MdcAlarmInfo::getDriveType, equip.getDrivetype()).eq(MdcAlarmInfo::getAlarmCode, entity.getAlarm()).eq(MdcAlarmInfo::getIsUse, 0));
+ if (mdcAlarmInfo != null && !mdcAlarmInfo.isEmpty()) {
+ dto.setAlarmContent(mdcAlarmInfo.get(0).getAlarmContent());
+ }
}
}
}
@@ -215,6 +229,9 @@
queryWrapper.le(MdcEquipmentRunningSection::getStartTime, endTime);
queryWrapper.orderByAsc(MdcEquipmentRunningSection::getStartTime);
list = this.baseMapper.selectList(queryWrapper);
+
+ list = mergeErrorRunningTrace(list);
+
}
if (list == null || list.isEmpty()) {
return Collections.emptyList();
@@ -556,7 +573,7 @@
List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipProgramNum(equip.getDrivetype(), equip.getEquipmentid(),
e.getStartTime(), e.getEndTime());
if (esList != null && esList.size() > 1) {
- e.setSequenceNumber(esList.get(0).getProgramnumber());
+ e.setSequenceNumber(esList.get(0).getProductName());
}
} else if (StringUtils.isNotBlank(equip.getDrivetype()) && equip.getDrivetype().startsWith("SIEMENS")) {
List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype() + "_" + equip.getEquipmentid(), e.getStartTime(), e.getEndTime());
--
Gitblit v1.9.3