From 548678d4cf3d1792e2cb989f26cf7e8af0ec8fde Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 09 四月 2025 11:41:49 +0800
Subject: [PATCH] 优化灌溉计划起止时间格式，精确到分钟

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java |   74 +++++++++++++++++++++++++++++++++++--
 1 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index 4ac5574..0fdabce 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -1,14 +1,18 @@
 package com.dy.pipIrrWechat.irrigatePlan;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.dy.pipIrrGlobal.daoIr.*;
+import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
 import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
 import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule;
 import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate;
 import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
-import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule;
-import com.dy.pipIrrGlobal.voIr.VoPlanSimple;
-import com.dy.pipIrrGlobal.voIr.VoPlans;
+import com.dy.pipIrrGlobal.voIr.*;
+import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -52,6 +56,9 @@
     @Autowired
     private IrIntakeOperateMapper irIntakeOperateMapper;
 
+    @Autowired
+    private RmCommandHistoryMapper rmdCommandHistoryMapper;
+
     /**
      * 娣诲姞鐏屾簤璁″垝
      * @param po
@@ -81,12 +88,30 @@
     }
 
     /**
-     * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID
+     * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID鍒楄〃
      * @param planId
      * @return
      */
     public List<Long> getTerminateCommandIds(Long planId) {
         return irIntakeOperateMapper.getTerminateCommandIds(planId);
+    }
+
+    /**
+     * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙ｅ垪琛紙寮�闃�鎴愬姛鐨勶級
+     * @param planId
+     * @return
+     */
+    public List<VoToTerminateIntakes> getToTerminateIntakes(Long planId) {
+        return irIntakeOperateMapper.getToTerminateIntakes(planId);
+    }
+
+    /**
+     * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙ｅ強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾
+     * @param commandId
+     * @return
+     */
+    public VoIntakeVc getValveOpen(Long commandId) {
+        return rmdCommandHistoryMapper.getValveOpen(commandId);
     }
 
     /**
@@ -247,4 +272,45 @@
     public Long getIntakeIdByUnitId(Long unitId) {
         return irIrrigateUnitMapper.getIntakeIdByUnitId(unitId);
     }
+
+    /**
+     * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
+     * @param planId
+     * @return
+     */
+    public VoPlanDetails getPublishResults(Long planId) {
+        List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult(planId);
+        if(groupResults == null || groupResults.size() == 0){
+            return null;
+        }
+
+        VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
+
+        for (VoGroupResult groupResult : groupResults) {
+            List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
+            if(intakeResults != null) {
+                groupResult.setPublishResult(intakeResults);
+            }
+        }
+
+        planDetails.setGroups(groupResults);
+        return planDetails;
+
+
+        //JSONArray array_groupResult = (JSONArray) JSON.toJSON(groupResults);
+        //for(int i = 0; i < array_groupResult.size(); i++){
+        //    JSONObject job_groupResult = array_groupResult.getJSONObject(i);
+        //    Long groupId = job_groupResult.getLong("groupId");
+        //
+        //    List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupId);
+        //    if(intakeResults != null) {
+        //        JSONArray array_intakeResult = (JSONArray) JSON.toJSON(intakeResults);
+        //        job_groupResult.put("publishResult", array_intakeResult);
+        //    }
+        //}
+        //
+        //List<VoGroupResult> publishResults = array_groupResult.toJavaList(VoGroupResult.class);
+        //return publishResults;
+
+    }
 }

--
Gitblit v1.8.0