From 186aac796d81fd1799c9503558c1081c5102ab74 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 二月 2025 17:18:11 +0800
Subject: [PATCH] 根据RTU协议修改内容，将开关阀类型加入上报数据中；

---
 pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java |   78 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 73 insertions(+), 5 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 e123311..c75639d 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,16 +1,21 @@
 package com.dy.pipIrrWechat.irrigatePlan;
 
-import com.dy.pipIrrGlobal.daoIr.IrIrrigateGroupMapper;
-import com.dy.pipIrrGlobal.daoIr.IrIrrigatePlanMapper;
-import com.dy.pipIrrGlobal.daoIr.IrIrrigateScheduleMapper;
-import com.dy.pipIrrGlobal.daoIr.IrIrrigateUnitMapper;
+import com.dy.common.webUtil.QueryResultVo;
+import com.dy.pipIrrGlobal.daoIr.*;
 import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
 import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule;
+import com.dy.pipIrrGlobal.pojoIr.IrOpeningSchedule;
+import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate;
+import com.dy.pipIrrGlobal.voIr.VoIrrigatePlan;
+import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule;
+import com.dy.pipIrrWechat.irrigatePlan.qo.QoIrrigatePlan;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author ZhuBaoMin
@@ -26,7 +31,13 @@
     private IrIrrigatePlanMapper irrigatePlanMapper;
 
     @Autowired
+    private IrPlanOperateMapper irPlanOperateMapper;
+
+    @Autowired
     private IrIrrigateScheduleMapper irIrrigateScheduleMapper;
+
+    @Autowired
+    private IrOpeningScheduleMapper irOpeningScheduleMapper;
 
     @Autowired
     private IrIrrigateGroupMapper irIrrigateGroupMapper;
@@ -35,12 +46,50 @@
     private IrIrrigateUnitMapper irIrrigateUnitMapper;
 
     /**
-     * 娣诲姞鐏屾簤璁″垝璁板綍
+     * 娣诲姞鐏屾簤璁″垝
      * @param po
      * @return
      */
     public Long addIrrigatePlan(IrIrrigatePlan po) {
         irrigatePlanMapper.insert(po);
+        return po.getId();
+    }
+
+    /**
+     * 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛�
+     * @param queryVo
+     * @return
+     */
+    public QueryResultVo<List<VoIrrigatePlan>> getIrrigatePlans(QoIrrigatePlan queryVo) {
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+
+        Long itemTotal = irrigatePlanMapper.getIrrigatePlanCount(params);
+
+        QueryResultVo<List<VoIrrigatePlan>> rsVo = new QueryResultVo<>();
+        rsVo.pageSize = queryVo.pageSize;
+        rsVo.pageCurr = queryVo.pageCurr;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = irrigatePlanMapper.getIrrigatePlans(params);
+        return rsVo;
+    }
+
+    /**
+     * 鍙戝竷鎸囧畾鐨勭亴婧夎鍒�
+     * @param planId
+     * @return
+     */
+    public Integer publishIrrigatePlan(Long planId) {
+        return irrigatePlanMapper.publishIrrigatePlan(planId);
+    }
+
+    /**
+     * 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+     * @param po
+     * @return
+     */
+    public Long addPlanOperate(IrPlanOperate po) {
+        irPlanOperateMapper.insert(po);
         return po.getId();
     }
 
@@ -55,6 +104,25 @@
     }
 
     /**
+     * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭
+     * @param planId
+     * @return
+     */
+    public List<VoIrrigateSchedule> getIrrigateSchedules(Long planId) {
+        return irIrrigateScheduleMapper.getIrrigateSchedules(planId);
+    }
+
+    /**
+     * 娣诲姞寮�闃�璁″垝
+     * @param po
+     * @return
+     */
+    public Long addOpeningSchedule(IrOpeningSchedule po) {
+        irOpeningScheduleMapper.insert(po);
+        return po.getId();
+    }
+
+    /**
      * 鏍规嵁杞亴缁処D鑾峰彇鍙栨按鍙D鍒楄〃
      * @param groupId
      * @return

--
Gitblit v1.8.0