From 6a49247e27307c35bc8e4dd4ce368c7d8850318a Mon Sep 17 00:00:00 2001
From: liulin <lin.liu@88.com>
Date: 星期日, 27 四月 2025 11:06:46 +0800
Subject: [PATCH] 修改运行状态判断
---
src/main/java/com/nanjing/water/service/DataUploadRecordService.java | 17 ++++-------------
src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java | 4 ++--
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/nanjing/water/service/DataUploadRecordService.java b/src/main/java/com/nanjing/water/service/DataUploadRecordService.java
index 7dddf01..9a82468 100644
--- a/src/main/java/com/nanjing/water/service/DataUploadRecordService.java
+++ b/src/main/java/com/nanjing/water/service/DataUploadRecordService.java
@@ -417,21 +417,12 @@
//2号泵启泵次数
startNumber(facilityPO,parameterPO1, recordPOList,dataVOList);
break;
- case "B001Start":
- waterPumpStartNumber(recordPOList,facilityPO,"B001Start", vo.getValue());
+ case "B001Run":
+ waterPumpStartNumber(recordPOList,facilityPO,"B001Run", vo.getValue());
break;
- case "B002Start":
- waterPumpStartNumber(recordPOList,facilityPO,"B002Start", vo.getValue());
+ case "B002Run":
+ waterPumpStartNumber(recordPOList,facilityPO,"B002Run", vo.getValue());
break;
-// case "B001Time":
-//
-// break;
-// case "B002Time":
-// break;
-// case "B001TimeSum":
-// break;
-// case "B002TimeSum":
-// break;
}
parameterList.add(parameterPO1);
}
diff --git a/src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java b/src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java
index d4b5be5..de5182a 100644
--- a/src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java
+++ b/src/main/java/com/nanjing/water/service/WaterFacilityParameterService.java
@@ -291,8 +291,8 @@
result = CopierUtil.mapTo(facilityPOList, WaterFacilityVO.class);
int sumTime=0;
for(WaterFacilityVO facilityVO:result){
- WaterPumpOperatingRecordPO b001 = recordPOList.stream().filter(item -> item.getFacilityId().equals(facilityVO.getId()) && item.getCode().equals("B001Start")).findFirst().orElse(null);
- WaterPumpOperatingRecordPO b002 = recordPOList.stream().filter(item -> item.getFacilityId().equals(facilityVO.getId()) && item.getCode().equals("B002Start")).findFirst().orElse(null);
+ WaterPumpOperatingRecordPO b001 = recordPOList.stream().filter(item -> item.getFacilityId().equals(facilityVO.getId()) && item.getCode().equals("B001Run")).findFirst().orElse(null);
+ WaterPumpOperatingRecordPO b002 = recordPOList.stream().filter(item -> item.getFacilityId().equals(facilityVO.getId()) && item.getCode().equals("B002Run")).findFirst().orElse(null);
if(Objects.nonNull(b001)){
sumTime+=b001.getSumStartTime();
}
--
Gitblit v1.9.3