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/IntkeCtrl.java |  102 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
index d718760..8d28f5b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntkeCtrl.java
@@ -59,11 +59,11 @@
         }
         if(timeStop != null && !timeStop.trim().equals("")){
             int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
-            endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+            endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         }
         if(startId != null && endId != null){
             if(endId < startId){
-                return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+                return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
             }
         }
         try {
@@ -97,6 +97,47 @@
             return BaseResponseUtils.buildException(e.getMessage()) ;
         }
     }
+
+
+
+    /** ok 113
+     * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
+     * @param
+     * @return
+     */
+    @GetMapping(path = "/getNeverOpenValveIntakes")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoIntakeUnOpenValve>>> getNeverOpenValveIntakes(@Valid CommonQO qo, BindingResult bindingResult) {
+        if(bindingResult != null && bindingResult.hasErrors()){
+            return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+        }
+        String timeStart = qo.getTimeStart();
+        String timeStop = qo.getTimeStop();
+        Long startId = null ;
+        Long endId = null ;
+        if(timeStart != null && !timeStart.trim().equals("")){
+            int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
+            startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
+        }
+        if(timeStop != null && !timeStop.trim().equals("")){
+            int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
+            endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        }
+        if(startId != null && endId != null){
+            if(endId < startId){
+                return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            }
+        }
+        try {
+            QueryResultVo<List<VoIntakeUnOpenValve>> res = intakeSv.getNeverOpenValveIntakes(qo, startId, endId) ;
+            return BaseResponseUtils.buildSuccess(res);
+        } catch (Exception e) {
+            log.error("鑾峰彇璁板綍寮傚父", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
+
+
     /** ok 1
      * 鑾峰彇绱娴侀噺瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
      * @param qo
@@ -135,7 +176,7 @@
         }
     }
 
-    /**
+    /** ok 114
      * 鑾峰彇娆犲帇鍙栨按鍙�
      * @param qo
      * @return
@@ -154,7 +195,7 @@
         }
     }
 
-    /**
+    /** ok 115
      * 鑾峰彇鎸囧畾淇″彿寮哄害鐨勫彇姘村彛
      * @param qo
      * @return
@@ -190,11 +231,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -202,7 +243,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         long startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        long endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        long endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getCountByOpenType(startId, endId, qo.getOpenType()));
         } catch (Exception e) {
@@ -228,11 +269,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -240,7 +281,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         long startId = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        long endId = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        long endId = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             return BaseResponseUtils.buildSuccess(intakeSv.getCountByCloseType(startId, endId, qo.getCloseType()));
         } catch (Exception e) {
@@ -266,11 +307,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -278,7 +319,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveGtIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -305,11 +346,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -317,7 +358,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntakeOpenCount>> res = intakeSv.getOpenValveLtIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -327,23 +368,6 @@
         }
     }
 
-
-    /**
-     * 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
-     * @param
-     * @return
-     */
-    @GetMapping(path = "/getNeverOpenValveIntakes")
-    @SsoAop()
-    public BaseResponse<QueryResultVo<List<VoIntake>>> getNeverOpenValveIntakes(CommonQO qo) {
-        try {
-            QueryResultVo<List<VoIntake>> res = intakeSv.getNeverOpenValveIntakes(qo);
-            return BaseResponseUtils.buildSuccess(res);
-        } catch (Exception e) {
-            log.error("鑾峰彇璁板綍寮傚父", e);
-            return BaseResponseUtils.buildException(e.getMessage()) ;
-        }
-    }
 
     /**
      * 鎸囧畾鏃堕棿娈靛唴绱Н娴侀噺(瀹氭椂鎶ラ噷鐨勭疮绉祦閲�)瓒呰繃鎸囧畾鍊肩殑鍙栨按鍙�
@@ -444,11 +468,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -456,7 +480,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntake>> res = intakeSv.getHaveOpenNoCloseIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);
@@ -480,11 +504,11 @@
             return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈠紑濮嬫椂闂�");
         }
         if(timeStop == null || timeStop.trim().equals("")){
-            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈡埅姝㈡椂闂�");
+            return BaseResponseUtils.buildErrorMsg("璇疯缃煡璇㈢粨鏉熸椂闂�");
         }
         long dur = DateTime.daysBetweenyyyy_MM_dd(timeStop, timeStart) ;
         if(dur < 0){
-            return BaseResponseUtils.buildErrorMsg("鎴鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
+            return BaseResponseUtils.buildErrorMsg("缁撴潫鏃堕棿涓嶈兘鏃╀簬寮�濮嬫椂闂�");
         }
         if(dur > 366){
             return BaseResponseUtils.buildErrorMsg("鏃堕棿璺ㄥ害涓嶈兘瓒呰繃涓�骞�");
@@ -492,7 +516,7 @@
         int[] ymdStart = DateTime.yyyy_MM_dd_2_ymdGroup(timeStart) ;
         int[] ymdEnd = DateTime.yyyy_MM_dd_2_ymdGroup(timeStop) ;
         qo.idStart = IDLongGenerator.generateOneDayStartId(ymdStart[0], ymdStart[1], ymdStart[2]) ;
-        qo.idEnd = IDLongGenerator.generateOneDayStartId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
+        qo.idEnd = IDLongGenerator.generateOneDayEndId(ymdEnd[0], ymdEnd[1], ymdEnd[2]) ;
         try {
             QueryResultVo<List<VoIntake>> res = intakeSv.getNoOpenHaveCloseIntakes(qo);
             return BaseResponseUtils.buildSuccess(res);

--
Gitblit v1.8.0