From e67870fff62635cd14beb0d5988f08aeef4b22fa Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 21:27:06 +0800
Subject: [PATCH] 添加远程关阀式终止灌溉计划，未测试
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 206 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 198 insertions(+), 8 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..abe5155 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,15 +1,20 @@
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.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.voRm.VoIntakeVc;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
/**
@@ -26,7 +31,13 @@
private IrIrrigatePlanMapper irrigatePlanMapper;
@Autowired
+ private IrPlanOperateMapper irPlanOperateMapper;
+
+ @Autowired
private IrIrrigateScheduleMapper irIrrigateScheduleMapper;
+
+ @Autowired
+ private IrOpeningScheduleMapper irOpeningScheduleMapper;
@Autowired
private IrIrrigateGroupMapper irIrrigateGroupMapper;
@@ -34,13 +45,124 @@
@Autowired
private IrIrrigateUnitMapper irIrrigateUnitMapper;
+ @Autowired
+ private IrPlanScheduleMapper irPlanScheduleMapper;
+
+ @Autowired
+ private IrGroupIntakeMapper irGroupIntakeMapper;
+
+ @Autowired
+ private IrIntakeOperateMapper irIntakeOperateMapper;
+
+ @Autowired
+ private RmCommandHistoryMapper rmdCommandHistoryMapper;
+
/**
- * 娣诲姞鐏屾簤璁″垝璁板綍
+ * 娣诲姞鐏屾簤璁″垝
* @param po
* @return
*/
public Long addIrrigatePlan(IrIrrigatePlan po) {
irrigatePlanMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
+ * @param planId
+ * @return
+ */
+ public Date getToTerminatePlan(Long planId) {
+ return irrigatePlanMapper.getToTerminatePlan(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛�
+ * @param planId
+ * @return
+ */
+ public List<Long> getToTerminateIntakeIds(Long planId) {
+ return irIntakeOperateMapper.getToTerminateIntakeIds(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID鍒楄〃
+ * @param planId
+ * @return
+ */
+ public List<Long> getTerminateCommandIds(Long planId) {
+ return irIntakeOperateMapper.getTerminateCommandIds(planId);
+ }
+
+ /**
+ * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙ｅ強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾
+ * @param commandId
+ * @return
+ */
+ public VoIntakeVc getIntakeVc(Long commandId) {
+ return rmdCommandHistoryMapper.getIntakeVc(commandId);
+ }
+
+ /**
+ * 淇敼鐏屾簤璁″垝
+ * @param po
+ * @return
+ */
+ public Integer updatePlan(IrIrrigatePlan po) {
+ return irrigatePlanMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public List<VoPlans> getNotCompletePlans() {
+ return irrigatePlanMapper.getNotCompletePlans();
+ }
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public List<VoPlans> getCompletedPlans() {
+ return irrigatePlanMapper.getCompletedPlans();
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇鍚姩妯″紡
+ * @param planId
+ * @return
+ */
+ public Byte getStartupMode(Long planId) {
+ return irrigatePlanMapper.getStartupMode(planId);
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛�
+ * @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 po
+ * @return
+ */
+ public Long addPlanOperate(IrPlanOperate po) {
+ irPlanOperateMapper.insert(po);
return po.getId();
}
@@ -55,15 +177,83 @@
}
/**
- * 鏍规嵁杞亴缁処D鑾峰彇鍙栨按鍙D鍒楄〃
+ * 鏍规嵁璁″垝ID缁堟鐏屾簤娆″簭锛屽皢鐏屾簤娆″簭鐨勫綋鍓嶇姸鎬佹敼涓哄凡缁堟
+ * @param planId
+ * @return
+ */
+ public Integer terminateSchedule(Long planId) {
+ return irIrrigateScheduleMapper.terminateSchedule(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍
+ * @param planId
+ * @return
+ */
+ public List<VoIrrigateSchedule> getSchedulesByPlanId(Long planId) {
+ return irIrrigateScheduleMapper.getSchedulesByPlanId(planId);
+ }
+
+ /**
+ * 鏍规嵁缁処D鑾峰彇鍙栨按鍙D闆嗗悎
* @param groupId
* @return
*/
- public List<Long> getIntakesByGroupId(Long groupId) {
- return irIrrigateGroupMapper.getIntakesByGroupId(groupId);
+ public List<Long> getIntakeIdsByGroupId(Long groupId) {
+ return irGroupIntakeMapper.getIntakeIdsByGroupId(groupId);
}
/**
+ * 娣诲姞璁″垝娆″簭鍏宠仈璁板綍
+ * @param po
+ * @return
+ */
+ public Long addPlanSchedule(IrPlanSchedule po) {
+ irPlanScheduleMapper.insert(po);
+ return po.getId();
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭垪琛�
+ * @param planId
+ * @return
+ */
+ public VoPlanSimple getPlanSimple(Long planId) {
+ return irrigatePlanMapper.getPlanSimple(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ * @param planStartTime
+ * @param planEndTime
+ * @param planId
+ * @return
+ */
+ public Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId) {
+ return irrigatePlanMapper.updatePlanTimes(planStartTime, planEndTime, planId);
+ }
+
+ /**
+ * 鏍规嵁鐏屾簤娆″簭ID鏇存柊娆″簭寮�濮嬫椂闂�
+ * @param scheduleId
+ * @param startTime
+ * @return
+ */
+ public Integer updateScheduleStartTime(Long scheduleId, Date startTime) {
+ return irIrrigateScheduleMapper.updateScheduleStartTime(scheduleId, startTime);
+ }
+
+ ///**
+ // * 娣诲姞寮�闃�璁″垝
+ // * @param po
+ // * @return
+ // */
+ //public Long addOpeningSchedule(IrOpeningSchedule po) {
+ // irOpeningScheduleMapper.insert(po);
+ // return po.getId();
+ //}
+
+ /**
* 鏍规嵁鐏屾簤鍗曞厓ID鑾峰彇鍙栨按鍙D
* @param unitId
* @return
--
Gitblit v1.8.0