From 078e94627c72eb6cada22a6e5478b003cff57f4c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 31 十二月 2024 11:11:24 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 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 f4e601d..30a29d3 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
@@ -113,7 +113,34 @@
dtos.add(dto);
}
}
- return dtos;
+
+ List<MdcEquipmentRunningSectionDto> result = new ArrayList<>();
+ //鍚堝苟鐩稿悓鐘舵�佹暟鎹�
+ for (int i = 0; i < dtos.size() - 1; i++) {
+ MdcEquipmentRunningSectionDto mdcEquipmentRunningSectionDto = dtos.get(i);
+ MdcEquipmentRunningSectionDto next = dtos.get(i + 1);
+ if (mdcEquipmentRunningSectionDto.getStatus().equals(next.getStatus()) && mdcEquipmentRunningSectionDto.getEndTime().equals(next.getStartTime())) {
+ MdcEquipmentRunningSectionDto equipmentRunningSectionDto = new MdcEquipmentRunningSectionDto();
+ BeanUtils.copyProperties(mdcEquipmentRunningSectionDto, equipmentRunningSectionDto);
+ equipmentRunningSectionDto.setEndTime(next.getEndTime());
+ equipmentRunningSectionDto.setDuration(mdcEquipmentRunningSectionDto.getDuration() + next.getDuration());
+ result.add(equipmentRunningSectionDto);
+ i++;
+ } else {
+ result.add(mdcEquipmentRunningSectionDto);
+ }
+ }
+ if (dtos.size() > 1) {
+ MdcEquipmentRunningSectionDto a = dtos.get(dtos.size() - 2);
+ MdcEquipmentRunningSectionDto b = dtos.get(dtos.size() - 1);
+ if (!a.getStatus().equals(b.getStatus()) && a.getEndTime().equals(b.getStartTime())) {
+ result.add(dtos.get(dtos.size() - 1));
+ }
+ } else if (dtos.size() == 1){
+ result.addAll(dtos);
+ }
+
+ return result;
}
/**
@@ -492,9 +519,13 @@
//鑾峰彇running杩愯鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> list = this.equipmentRunningTracesLog(equipment.getEquipmentid());
if (list != null && !list.isEmpty()) {
- List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
- this.ergodicTrim(equipList);
- super.saveBatch(equipList);
+ try {
+ List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
+ this.ergodicTrim(equipList);
+ super.saveBatch(equipList);
+ } catch (Exception e) {
+ log.error("娣诲姞绋嬪簭鍙峰嚭鐜板紓甯�:", e);
+ }
}
//鑾峰彇鎶ヨ鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> errorList = this.equipmentRunningTracesErrorLog(equipment.getEquipmentid());
@@ -937,9 +968,9 @@
ert.setStartTime(logList.get(i).getCollectTime());
ert.setEndTime(logList.get(i + 1).getCollectTime());
ert.setDuration(DateUtils.differentSecond(ert.getStartTime(), ert.getEndTime()));
-// if (ert.getDuration() > 0) {
+
erts.add(ert);
-// }
+
} else {
long count = differentSecond / 86400;
if (count % 86400 > 0) {
--
Gitblit v1.9.3