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/stClient/StClientCtrl.java |  101 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 101 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
new file mode 100644
index 0000000..e33506e
--- /dev/null
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/stClient/StClientCtrl.java
@@ -0,0 +1,101 @@
+package com.dy.pipIrrStatistics.stClient;
+
+import com.dy.common.aop.SsoAop;
+import com.dy.common.util.DateTime;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountDay;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountMonth;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountYear;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/30 15:22
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="stClient")
+@RequiredArgsConstructor
+public class StClientCtrl {
+
+    private static final int startYear4YearStatistics = 2024 ;
+
+    private StClientSv sv ;
+
+    @Autowired
+    private void setSv(StClientSv sv){
+        this.sv = sv ;
+    }
+
+    /**
+     * 鏌ヨ鎸囧畾骞存湀鍐滄埛鍚勬棩鐢ㄦ按閲�
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/amountOfDay")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoStClientAmountDay>>> amountOfDay(StClientQo qo) throws Exception {
+        String yearMonth = qo.getYearMonth();
+        if(yearMonth == null || yearMonth.trim().equals("")) {
+            return BaseResponseUtils.buildErrorMsg("鏌ヨ鏉′欢骞存湀涓嶈兘涓虹┖");
+        }
+        int[] ymd = DateTime.yyyy_MM_ymdGroup(yearMonth) ;
+        qo.year = ymd[0] ;
+        qo.month = ymd[1] ;
+        return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountDay(qo));
+    }
+
+
+    /**
+     * 鏌ヨ鎸囧畾骞村啘鎴峰悇鏈堢敤姘撮噺
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/amountOfMonth")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoStClientAmountMonth>>> amountOfMonth(StClientQo qo) throws Exception {
+        if(qo.year == null) {
+            return BaseResponseUtils.buildErrorMsg("鏌ヨ鏉′欢骞村害涓嶈兘涓虹┖");
+        }
+        return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountMonth(qo));
+    }
+
+
+
+    /**
+     * 鏌ヨ鎸囧畾骞村啘鎴峰悇骞寸敤姘撮噺
+     * @param qo
+     * @return
+     */
+    @GetMapping(path = "/amountOfYear")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoStClientAmountYear>>> amountOfYear(StClientQo qo) throws Exception {
+        List<Integer> yearGrp = new ArrayList<Integer>();
+        int nowYear = Integer.parseInt(DateTime.yyyy()) ;
+        if(qo.year == null) {
+            for(int i = startYear4YearStatistics; i <= nowYear; i++) {
+                yearGrp.add(i) ;
+            }
+        }else{
+            if(qo.year > nowYear){
+                qo.year = nowYear;
+            }
+            if(qo.year < startYear4YearStatistics){
+                qo.year = startYear4YearStatistics;
+            }
+            yearGrp.add(qo.year) ;
+        }
+        return BaseResponseUtils.buildSuccess(this.sv.selectStClientAmountYear(qo, yearGrp));
+    }
+}

--
Gitblit v1.8.0