From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 390 ++++++++++++++++---------------------------------------
1 files changed, 116 insertions(+), 274 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index 613d661..45472a9 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -15,10 +15,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -44,9 +41,6 @@
@Autowired
private RmLossDayLastMapper rmLossDayLastMapper;
- @Value("${rtu.batteryVolt}")
- private Double batteryVolt;
-
@Value("${rtu.signalIntensity.weak}")
private Integer weak;
@@ -58,29 +52,10 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(CommonQO qo) {
- DecimalFormat df = new DecimalFormat("0.00");
- /**
- * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
- */
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
-
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- }else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- }else {
- timeStart = null;
- }
- qo.setTimeStart(timeStart);
- qo.setTimeStop(timeStop);
-
- // 鐢熸垚鏌ヨ鍙傛暟
+ public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(CommonQO qo, Long idStart, Long idEnd) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ params.put("idStart", idStart) ;
+ params.put("idEnd", idEnd) ;
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(rmOnHourReportHistoryMapper.getNotOnlineIntakesCount(params)).orElse(0L);
@@ -92,6 +67,24 @@
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = rmOnHourReportHistoryMapper.getNotOnlineIntakes(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);
+
+ QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
return rsVo ;
}
@@ -145,7 +138,6 @@
* @return
*/
public QueryResultVo<List<VoBatteryVolt>> getUnderVoltIntakes(BatteryVoltQO qo) {
- qo.setBatteryVolt(batteryVolt);
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -189,33 +181,21 @@
/**
* 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
+ * @param qo
+ * @param idStart
+ * @param idEnd
* @return
*/
- public QueryResultVo<List<VoIntake>> getNeverOpenValveIntakes(CommonQO qo) {
-
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
+ public QueryResultVo<List<VoIntakeUnOpenValve>> getNeverOpenValveIntakes(CommonQO qo, Long idStart, Long idEnd) {
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ params.put("idStart", idStart) ;
+ params.put("idEnd", idEnd) ;
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(rmOpenCloseValveHistoryMapper.getNeverOpenValveIntakesCount(params)).orElse(0L);
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoIntakeUnOpenValve>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
@@ -231,23 +211,6 @@
* @return
*/
public QueryResultVo<List<VoIntakeOpenCount>> getOpenValveGtIntakes(IntakeCountValueQO qo) {
-
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -270,25 +233,8 @@
* @return
*/
public QueryResultVo<List<VoIntakeOpenCount>> getOpenValveLtIntakes(IntakeCountValueQO qo) {
-
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
// 鐢熸垚鏌ヨ鍙傛暟
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(rmOpenCloseValveHistoryMapper.getOpenValveLtIntakesCount(params)).orElse(0L);
@@ -305,137 +251,103 @@
/**
* 鏍规嵁寮�闃�绫诲瀷鑾峰彇鎿嶄綔娆℃暟
- * @param qo
+ * @param idStart
+ * @param idEnd
+ * @param openType
* @return
*/
- public VoCountOfOpenType getCountByOpenType(OpenTypeQO qo) {
- /**
- * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡锛屽鏋滅粨鏉熸椂闂翠负绌猴紝鍒欐煡璇㈡椂闂翠负绌�
- */
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- }else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- }else {
- timeStart = null;
- }
- qo.setTimeStart(timeStart);
- qo.setTimeStop(timeStop);
-
- Integer openType = qo.getOpenType();
- String openTypeName = "";
- if (openType == null){
- openTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ寮�闃�绫诲瀷";
- }else {
- switch (openType) {
- case 1:
- openTypeName = "鍒峰崱寮�闃�";
- break;
- case 3:
- openTypeName = "涓績绔欏紑闃�";
- break;
- case 8:
- openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
- break;
- case 11:
- openTypeName = "宸℃鍗″紑闃�";
- break;
- case 13:
- openTypeName = "宸℃鍗″紑闃�";
- break;
- default:
- openTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ寮�闃�绫诲瀷";
- }
- }
-
+ public List<VoCountOfOpenType> getCountByOpenType(Long idStart, Long idEnd, Integer openType) {
// 鐢熸垚鏌ヨ鍙傛暟
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ Map<String, Object> params = new HashMap<>() ;
+ params.put("idStart", idStart);
+ params.put("idEnd", idEnd);
+ params.put("openType", openType);
- Integer openTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByOpenType(params)).orElse(0);
-
- VoCountOfOpenType vo = new VoCountOfOpenType();
- vo.setOpenTypeName(openTypeName);
- vo.setOpenTypeCount(openTypeCount);
- return vo;
+ List<VoCountOfOpenType> list = rmOpenCloseValveLastMapper.getCountByOpenType(params) ;
+ if(list != null){
+ for (VoCountOfOpenType vo : list) {
+ if (vo.openType != null){
+ switch (vo.openType) {
+ case 1:
+ vo.openTypeName = "鍒峰崱寮�闃�";
+ break;
+ case 3:
+ vo.openTypeName = "涓績绔欏紑闃�";
+ break;
+ case 8:
+ vo.openTypeName = "鐢ㄦ埛杩滅▼寮�闃�";
+ break;
+ case 11:
+ vo.openTypeName = "宸℃鍗″紑闃�";
+ break;
+ default:
+ vo.openTypeName = "鏈煡绫诲瀷寮�闃�";
+ }
+ }else{
+ vo.openTypeName = "鏈煡绫诲瀷寮�闃�";
+ }
+ }
+ }
+ return list ;
}
/**
* 鏍规嵁鍏抽榾绫诲瀷鑾峰彇鎿嶄綔娆℃暟
- * @param qo
+ * @param idStart
+ * @param idEnd
+ * @param closeType
* @return
*/
- public VoCountOfCloseType getCountByCloseType(CloseTypeQo qo) {
- /**
- * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
- */
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- }else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- }else {
- timeStart = null;
- }
- qo.setTimeStart(timeStart);
- qo.setTimeStop(timeStop);
+ public List<VoCountOfCloseType> getCountByCloseType(Long idStart, Long idEnd, Integer closeType) {
+ Map<String, Object> params = new HashMap<>() ;
+ params.put("idStart", idStart);
+ params.put("idEnd", idEnd);
+ params.put("closeType", closeType);
- Integer closeType = qo.getCloseType();
- String closeTypeName = "";
- if (closeType == null){
- closeTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ鍏抽榾绫诲瀷";
- }else {
- switch (closeType) {
- case 2:
- closeTypeName = "鍒峰崱鍏抽榾";
- break;
- case 4:
- closeTypeName = "涓績绔欏叧闃�";
- break;
- case 5:
- closeTypeName = "娆犺垂鍏抽榾";
- break;
- case 6:
- closeTypeName = "娴侀噺璁℃晠闅滃叧闃�";
- break;
- case 7:
- closeTypeName = "绱ф�ュ叧闃�";
- break;
- case 9:
- closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
- break;
- case 10:
- closeTypeName = "宸℃鍗″叧闃�";
- break;
- case 12:
- closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
- break;
- case 13:
- closeTypeName = "杩滅▼瀹氭椂鍏抽榾";
- break;
- case 14:
- closeTypeName = "杩滅▼瀹氶噺鍏抽榾";
- break;
- default:
- closeTypeName = "涓嶇煡閬撴偍瑕佹煡閭ｇ鍏抽榾绫诲瀷";
+ List<VoCountOfCloseType> list = rmOpenCloseValveLastMapper.getCountByCloseType(params) ;
+ if(list != null) {
+ for (VoCountOfCloseType vo : list) {
+ if (vo.closeType != null) {
+ switch (vo.closeType) {
+ case 2:
+ vo.closeTypeName = "鍒峰崱鍏抽榾";
+ break;
+ case 4:
+ vo.closeTypeName = "涓績绔欏叧闃�";
+ break;
+ case 5:
+ vo.closeTypeName = "娆犺垂鍏抽榾";
+ break;
+ case 6:
+ vo.closeTypeName = "娴侀噺璁℃晠闅滃叧闃�";
+ break;
+ case 7:
+ vo.closeTypeName = "绱ф�ュ叧闃�";
+ break;
+ case 9:
+ vo.closeTypeName = "鐢ㄦ埛杩滅▼鍏抽榾";
+ break;
+ case 10:
+ vo.closeTypeName = "宸℃鍗″叧闃�";
+ break;
+ case 12:
+ vo.closeTypeName = "榛戝悕鍗曞懡浠ゅ叧闃�";
+ break;
+ case 13:
+ vo.closeTypeName = "杩滅▼瀹氭椂鍏抽榾";
+ break;
+ case 14:
+ vo.closeTypeName = "杩滅▼瀹氶噺鍏抽榾";
+ break;
+ default:
+ vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
+ }
+ }else{
+ vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
+ }
}
}
- // 鐢熸垚鏌ヨ鍙傛暟
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
- Integer closeTypeCount = Optional.ofNullable(rmOpenCloseValveLastMapper.getCountByCloseType(params)).orElse(0);
-
- VoCountOfCloseType vo = new VoCountOfCloseType();
- vo.setCloseTypeName(closeTypeName);
- vo.setCloseTypeCount(closeTypeCount);
- return vo;
+ return list ;
}
/**
@@ -615,24 +527,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoIntake>> getHaveOpenNoCloseIntakes(CommonQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
-
+ public QueryResultVo<List<VoIntake>> getHaveOpenNoCloseIntakes(IntakeCountValueQO qo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getHaveOpenNoCloseIntakesCount(params);
@@ -650,24 +545,7 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoIntake>> getNoOpenHaveCloseIntakes(CommonQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- } else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }else {
- timeStop = LocalDate.now() + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
-
+ public QueryResultVo<List<VoIntake>> getNoOpenHaveCloseIntakes(IntakeCountValueQO qo) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getNoOpenHaveCloseIntakesCount(params);
@@ -795,40 +673,4 @@
return rsVo ;
}
- /**
- * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
- * @param qo
- * @return
- */
- public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart == "") {
- timeStart = null;
- }
- if(timeStop == "") {
- timeStop = null;
- }
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
-
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
- Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);
-
- QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = qo.pageSize ;
- rsVo.pageCurr = qo.pageCurr ;
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
- return rsVo ;
- }
}
--
Gitblit v1.8.0