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-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java | 21 ++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml | 55 ++++++
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java | 180 ++++++++++++---------
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml | 7
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 163 +++++++++++++++++---
5 files changed, 321 insertions(+), 105 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
index 4725152..a0d9f99 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
@@ -115,4 +115,25 @@
* @return
*/
Integer getPlanState(@Param("planId") Long planId);
+
+ /**
+ * 鍒ゆ柇褰撳墠椤圭洰鏄惁瀛樺湪宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚鐨勮鍒掞紝鍙戝竷璁″垝鍓嶅垽鏂娇鐢�
+ * @param planId
+ * @return
+ */
+ Integer hasPlan_CurrentProject(Long planId);
+
+ /**
+ * 鍒ゆ柇褰撳墠璁″垝鍖呭惈鐨勮疆鐏岀粍鏄惁涓庡叾浠栭」鐩笅璁″垝鍖呭惈鐨勮疆鐏岀粍鏈変氦闆嗭紝涓斿叾浠栭」鐩殑璁″垝鐘舵�佷负宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚锛屽彂甯冭鍒掑墠鍒ゆ柇浣跨敤
+ * @param planId
+ * @return
+ */
+ Integer hasPlan_OtherProject(Long planId);
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ Integer getPlanLatestState(@Param("planId") Long planId);
}
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
index d127b5d..5121d98 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -320,7 +320,12 @@
IF(#{terminateTime} > sche.start_time, sche.start_time, NULL) AS startTime,
IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) AS stopTime,
- sche.duration,
+ <!--sche.duration,-->
+ TIMESTAMPDIFF(MINUTE,
+ IF('2025-04-15 15:27' > sche.start_time, sche.start_time, NULL),
+ IF('2025-04-15 15:27' > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE),
+ IF('2025-04-15 15:27' > sche.start_time, '2025-04-15 15:27', NULL))
+ ) AS duration,
NULL AS publishResult
FROM ir_irrigate_group grp
INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
index 94e29d9..46bafd5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -325,8 +325,9 @@
IF(plan.executing_state = 3, 5, 4) AS planState
FROM ir_irrigate_plan plan
INNER JOIN ir_project pro ON pro.id = plan.project_id
- WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() >= plan.plan_stop_time) OR (plan.executing_state = 3))
- ORDER BY plan.plan_state DESC
+ INNER JOIN ir_plan_operate po ON po.plan_id = plan.id
+ WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() >= plan.plan_stop_time) OR (plan.executing_state = 3)) AND po.operate_type = 1
+ ORDER BY po.operate_time DESC
<trim prefix="limit ">
<if test="start != null and count != null">
#{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
@@ -396,4 +397,54 @@
AND deleted = 0
</select>
+ <!--鍒ゆ柇褰撳墠椤圭洰鏄惁瀛樺湪宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚鐨勮鍒掞紝鍙戝竷璁″垝鍓嶅垽鏂娇鐢�-->
+ <select id="hasPlan_CurrentProject" resultType="java.lang.Integer">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ir_irrigate_plan
+ WHERE project_id = (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId})
+ AND id != #{planId}
+ AND plan_state = 2
+ AND executing_state != 3
+ AND deleted = 0
+ AND NOW() < plan_stop_time
+ </select>
+
+ <!--鍒ゆ柇褰撳墠璁″垝鍖呭惈鐨勮疆鐏岀粍鏄惁涓庡叾浠栭」鐩笅璁″垝鍖呭惈鐨勮疆鐏岀粍鏈変氦闆嗭紝涓斿叾浠栭」鐩殑璁″垝鐘舵�佷负宸插彂甯冦�佹湭缁堟銆佹湭鍒犻櫎銆佹湭瀹屾垚锛屽彂甯冭鍒掑墠鍒ゆ柇浣跨敤-->
+ <select id="hasPlan_OtherProject" resultType="java.lang.Integer">
+ SELECT EXISTS(
+ SELECT sche.group_id
+ FROM ir_irrigate_plan plan
+ INNER JOIN ir_plan_schedule ps ON ps.plan_id = plan.id
+ INNER JOIN ir_irrigate_schedule sche ON sche.id = ps.schedule_id
+ WHERE plan.project_id != (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId})
+ AND plan_state = 2
+ AND executing_state != 3
+ AND deleted = 0
+ AND NOW() < plan_stop_time
+
+ INTERSECT
+
+ SELECT sche.group_id
+ FROM ir_irrigate_schedule sche
+ INNER JOIN ir_plan_schedule ps ON schedule_id = sche.id
+ WHERE ps.plan_id = #{planId}
+ LIMIT 1
+ ) AS has_intersection
+ </select>
+
+ <!--鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�-->
+ <select id="getPlanLatestState" resultType="java.lang.Integer">
+ SELECT
+ IF(plan_state = 1, 1,
+ IF(executing_state = 3, 5,
+ IF(NOW() < plan_start_time, 2,
+ IF(NOW() > plan_stop_time, 3, 4)
+ )
+ )
+ ) AS planState
+ FROM ir_irrigate_plan
+ WHERE deleted = 0 AND id = #{planId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
index 2b7b88c..481f38d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
@@ -199,87 +199,113 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- Long planId = planSimple.getPlanId();
- Long operatorId = planSimple.getOperatorId();
- Byte operateType = 1;
+ Map map_result = irrigatePlanSv.publishPlan(planSimple);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
+ }
+ return BaseResponseUtils.buildSuccess() ;
- /**
- * 鑾峰彇鐏屾簤璁″垝淇℃伅
- * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
- */
- VoPlanSimple plan = irrigatePlanSv.getPlanSimple(planId);
- if(plan == null){
- return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍙戝竷鐨勮鍒掍笉瀛樺湪锛屾垨璇ヨ鍒掑凡鍙戝竷");
+ //Long planId = planSimple.getPlanId();
+ //Long operatorId = planSimple.getOperatorId();
+ //Byte operateType = 1;
+ //
+ ///**
+ // * 鑾峰彇鐏屾簤璁″垝淇℃伅
+ // * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
+ // */
+ //VoPlanSimple plan = irrigatePlanSv.getPlanSimple(planId);
+ //if(plan == null){
+ // return BaseResponseUtils.buildErrorMsg("鎮ㄨ鍙戝竷鐨勮鍒掍笉瀛樺湪锛屾垨璇ヨ鍒掑凡鍙戝竷");
+ //}
+ //
+ //Byte startupMode = plan.getStartupMode();
+ //Integer duration = plan.getDuration();
+ //Date planStartTime = plan.getPlanStartTime();
+ //Date planStopTime = null;
+ //
+ //if(startupMode == 1){
+ // planStartTime = new Date();
+ //}
+ //LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ //if(startupMode == 1){
+ // // 娴嬭瘯闃舵寤跺悗2鍒嗛挓锛屾寮忓彂甯冧负5鍒嗛挓
+ // startTime = startTime.plusMinutes(2);
+ // //startTime = startTime.plusMinutes(5);
+ //}
+ //planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant());
+ //LocalDateTime stopTime = startTime.plusMinutes(duration);
+ //planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
+ //
+ //
+ //if(irrigatePlanSv.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
+ // return BaseResponseUtils.buildErrorMsg("璁″垝淇℃伅鏇存柊澶辫触");
+ //}
+ //
+ //// 鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂�
+ //List<VoIrrigateSchedule> schedules = irrigatePlanSv.getSchedulesByPlanId(planId);
+ //Date scheduleStartTime = null;
+ //Integer sort = 0;
+ //for(VoIrrigateSchedule schedule : schedules){
+ // if(scheduleStartTime == null) {
+ // scheduleStartTime = planStartTime;
+ // }
+ // irrigatePlanSv.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
+ //
+ // // 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
+ // LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ // LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
+ // scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
+ //}
+ //
+ //// 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ //IrPlanOperate planOperate = new IrPlanOperate();
+ //planOperate.setPlanId(planId);
+ //planOperate.setOperator(operatorId);
+ //planOperate.setOperateType(OperateTypeENUM.PUBLISH.getCode());
+ //planOperate.setOperateTime(new Date());
+ //if(irrigatePlanSv.addPlanOperate(planOperate) == 0){
+ // return BaseResponseUtils.buildErrorMsg("娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
+ //}
+ //
+ //schedules = irrigatePlanSv.getSchedulesByPlanId(planId);
+ //for(VoIrrigateSchedule schedule : schedules) {
+ // Long groupId = schedule.getGroupId();
+ // List<Long> intakeIds = irrigatePlanSv.getIntakeIdsByGroupId(groupId);
+ // for(Long intakeId : intakeIds) {
+ // if(schedule.getDuration() > 0) {
+ // // 浠婂彂甯冪亴婧夋椂闀垮ぇ浜�0鐨�
+ // AutomaticClose automaticClose = new AutomaticClose();
+ // automaticClose.setIntakeId(intakeId);
+ // automaticClose.setPlannedOpenTime(schedule.getStartTime());
+ // automaticClose.setMinutes(schedule.getDuration());
+ // automaticClose.setOperator(operatorId);
+ // automaticClose.setOpenType(Byte.valueOf("1"));
+ //
+ // commandSv.planedOpenTimedClose(automaticClose, planId, operateType, schedule.getStartTime(), schedule.getDuration());
+ // }
+ // }
+ //}
+ //
+ //return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ @GetMapping(path = "/getPlanLatestState")
+ public BaseResponse<Integer> getPlanLatestState(@RequestParam Long planId) {
+ if(planId == null) {
+ return BaseResponseUtils.buildErrorMsg("璁″垝ID涓嶈兘涓虹┖");
}
- Byte startupMode = plan.getStartupMode();
- Integer duration = plan.getDuration();
- Date planStartTime = plan.getPlanStartTime();
- Date planStopTime = null;
-
- if(startupMode == 1){
- planStartTime = new Date();
+ try {
+ return BaseResponseUtils.buildSuccess(irrigatePlanSv.getPlanLatestState(planId));
+ } catch (Exception e) {
+ log.error("鑾峰彇鏈畬鐨勮鍒掑紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
- LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
- if(startupMode == 1){
- // 娴嬭瘯闃舵寤跺悗2鍒嗛挓锛屾寮忓彂甯冧负5鍒嗛挓
- startTime = startTime.plusMinutes(2);
- //startTime = startTime.plusMinutes(5);
- }
- planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant());
- LocalDateTime stopTime = startTime.plusMinutes(duration);
- planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
-
- if(irrigatePlanSv.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
- return BaseResponseUtils.buildErrorMsg("璁″垝淇℃伅鏇存柊澶辫触");
- }
-
- // 鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂�
- List<VoIrrigateSchedule> schedules = irrigatePlanSv.getSchedulesByPlanId(planId);
- Date scheduleStartTime = null;
- Integer sort = 0;
- for(VoIrrigateSchedule schedule : schedules){
- if(scheduleStartTime == null) {
- scheduleStartTime = planStartTime;
- }
- irrigatePlanSv.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
-
- // 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
- LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
- LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
- scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
- }
-
- // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
- IrPlanOperate planOperate = new IrPlanOperate();
- planOperate.setPlanId(planId);
- planOperate.setOperator(operatorId);
- planOperate.setOperateType(OperateTypeENUM.PUBLISH.getCode());
- planOperate.setOperateTime(new Date());
- if(irrigatePlanSv.addPlanOperate(planOperate) == 0){
- return BaseResponseUtils.buildErrorMsg("娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
- }
-
- schedules = irrigatePlanSv.getSchedulesByPlanId(planId);
- for(VoIrrigateSchedule schedule : schedules) {
- Long groupId = schedule.getGroupId();
- List<Long> intakeIds = irrigatePlanSv.getIntakeIdsByGroupId(groupId);
- for(Long intakeId : intakeIds) {
- if(schedule.getDuration() > 0) {
- // 浠婂彂甯冪亴婧夋椂闀垮ぇ浜�0鐨�
- AutomaticClose automaticClose = new AutomaticClose();
- automaticClose.setIntakeId(intakeId);
- automaticClose.setPlannedOpenTime(schedule.getStartTime());
- automaticClose.setMinutes(schedule.getDuration());
- automaticClose.setOperator(operatorId);
- automaticClose.setOpenType(Byte.valueOf("1"));
-
- commandSv.planedOpenTimedClose(automaticClose, planId, operateType, schedule.getStartTime(), schedule.getDuration());
- }
- }
- }
-
- return BaseResponseUtils.buildSuccess();
}
/**
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 faebbfc..2c30753 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,9 +1,5 @@
package com.dy.pipIrrWechat.irrigatePlan;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryConditionVo;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoIr.*;
@@ -14,7 +10,8 @@
import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
import com.dy.pipIrrGlobal.voIr.*;
import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
-import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrWechat.command.CommandSv;
+import com.dy.pipIrrWechat.command.dto.AutomaticClose;
import com.dy.pipIrrWechat.irrigatePlan.dto.PlanSimple;
import com.dy.pipIrrWechat.irrigatePlan.enums.OperateTypeENUM;
import lombok.extern.slf4j.Slf4j;
@@ -23,6 +20,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.*;
/**
@@ -64,6 +63,9 @@
@Autowired
private RmCommandHistoryMapper rmdCommandHistoryMapper;
+
+ @Autowired
+ private CommandSv commandSv;
/**
* 娣诲姞鐏屾簤璁″垝
@@ -122,6 +124,137 @@
map.put("content", null);
return map;
}
+ }
+
+ /**
+ * 鍙戝竷鐏屾簤璁″垝
+ * @param planSimple
+ * @return
+ */
+ public Map publishPlan(PlanSimple planSimple) {
+ Long planId = planSimple.getPlanId();
+ Long operatorId = planSimple.getOperatorId();
+ Byte operateType = 1;
+
+ if(irrigatePlanMapper.hasPlan_CurrentProject(planId) == 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "褰撳墠椤圭洰瀛樺湪鏈畬鎴愮殑鐏屾簤璁″垝");
+ map.put("content", null);
+ return map;
+ }
+
+ if(irrigatePlanMapper.hasPlan_CurrentProject(planId) == 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "寰呭彂甯冭鍒掔殑杞亴缁勫湪鍏朵粬椤圭洰鐨勭亴婧夎鍒掍腑锛屼笖璇ヨ鍒掑皻鏈畬鎴�");
+ map.put("content", null);
+ return map;
+ }
+
+ /**
+ * 鑾峰彇鐏屾簤璁″垝淇℃伅
+ * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
+ */
+ VoPlanSimple plan = irrigatePlanMapper.getPlanSimple(planId);
+ if(plan == null){
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鎮ㄨ鍙戝竷鐨勮鍒掍笉瀛樺湪锛屾垨璇ヨ鍒掑凡鍙戝竷");
+ map.put("content", null);
+ return map;
+ }
+
+ Byte startupMode = plan.getStartupMode();
+ Integer duration = plan.getDuration();
+ Date planStartTime = plan.getPlanStartTime();
+ Date planStopTime = null;
+
+ if(startupMode == 1){
+ planStartTime = new Date();
+ }
+ LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ if(startupMode == 1){
+ // 娴嬭瘯闃舵寤跺悗2鍒嗛挓锛屾寮忓彂甯冧负5鍒嗛挓
+ startTime = startTime.plusMinutes(2);
+ //startTime = startTime.plusMinutes(5);
+ }
+ planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant());
+ LocalDateTime stopTime = startTime.plusMinutes(duration);
+ planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
+
+ // 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ if(irrigatePlanMapper.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "璁″垝淇℃伅鏇存柊澶辫触");
+ map.put("content", null);
+ return map;
+ }
+
+ // 鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂�
+ List<VoIrrigateSchedule> schedules = getSchedulesByPlanId(planId);
+ Date scheduleStartTime = null;
+ Integer sort = 0;
+ for(VoIrrigateSchedule schedule : schedules){
+ if(scheduleStartTime == null) {
+ scheduleStartTime = planStartTime;
+ }
+ updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
+
+ // 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
+ LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
+ scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
+ }
+
+ // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ IrPlanOperate planOperate = new IrPlanOperate();
+ planOperate.setPlanId(planId);
+ planOperate.setOperator(operatorId);
+ planOperate.setOperateType(OperateTypeENUM.PUBLISH.getCode());
+ planOperate.setOperateTime(new Date());
+ if(addPlanOperate(planOperate) == 0){
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
+ map.put("content", null);
+ return map;
+ }
+
+ schedules = getSchedulesByPlanId(planId);
+ for(VoIrrigateSchedule schedule : schedules) {
+ Long groupId = schedule.getGroupId();
+ List<Long> intakeIds = getIntakeIdsByGroupId(groupId);
+ for(Long intakeId : intakeIds) {
+ if(schedule.getDuration() > 0) {
+ // 浠婂彂甯冪亴婧夋椂闀垮ぇ浜�0鐨�
+ AutomaticClose automaticClose = new AutomaticClose();
+ automaticClose.setIntakeId(intakeId);
+ automaticClose.setPlannedOpenTime(schedule.getStartTime());
+ automaticClose.setMinutes(schedule.getDuration());
+ automaticClose.setOperator(operatorId);
+ automaticClose.setOpenType(Byte.valueOf("1"));
+
+ commandSv.planedOpenTimedClose(automaticClose, planId, operateType, schedule.getStartTime(), schedule.getDuration());
+ }
+ }
+ }
+
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎鎴愬姛");
+ map.put("content", null);
+ return map;
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ public Integer getPlanLatestState(Long planId) {
+ return irrigatePlanMapper.getPlanLatestState(planId);
}
/**
@@ -287,26 +420,6 @@
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);
}
/**
--
Gitblit v1.8.0