From a7c7bff93a8bf44524314a6d1d986611ce466b2c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 四月 2025 15:24:29 +0800
Subject: [PATCH] 发布灌溉计划时延迟1分钟
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 139 insertions(+), 26 deletions(-)
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 4ef7508..8114e04 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
@@ -2,9 +2,13 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
-import com.dy.pipIrrGlobal.pojoIr.*;
+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.pipIrrWechat.command.CommandSv;
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
import com.dy.pipIrrWechat.irrigatePlan.dto.IrrigatePlan;
@@ -17,13 +21,11 @@
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -59,6 +61,7 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ Long projectId = planAndSchedule.getProjectId();
Long operatorId = planAndSchedule.getOperatorId();
Byte startupMode = planAndSchedule.getStartupMode();
Date planStartTime = planAndSchedule.getPlanStartTime();;
@@ -67,6 +70,20 @@
Integer duration = 0;
for(IrrigateSchedule schedule : planAndSchedule.getSchedules()){
duration = duration + schedule.getDuration();
+ }
+
+ if(startupMode == 2){
+ if(planStartTime == null) {
+ return BaseResponseUtils.buildErrorMsg("鑷姩鍚姩妯″紡蹇呴』鎸囧畾璁″垝鍚姩鏃堕棿");
+ }
+
+ LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ LocalDateTime currentTime = LocalDateTime.now();
+ currentTime = currentTime.plusHours(8);
+
+ if(!startTime.isAfter(currentTime)) {
+ return BaseResponseUtils.buildErrorMsg("鍚姩鏃堕棿涓嶈兘鍦�8灏忔椂涔嬪唴");
+ }
}
//if(startupMode == 1){
@@ -79,6 +96,7 @@
//planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
IrIrrigatePlan plan = new IrIrrigatePlan();
+ plan.setProjectId(projectId);
plan.setPlanName(planAndSchedule.getPlanName());
plan.setStartupMode(startupMode);
plan.setPlanStartTime(planStartTime);
@@ -95,7 +113,7 @@
// 娣诲姞鐏屾簤娆″簭鍙婅鍒掓搴忓叧鑱旇〃
//Date scheduleStartTime = null;
- Integer sort = 0;
+ Integer sort = 1;
for(IrrigateSchedule schedule : planAndSchedule.getSchedules()){
IrIrrigateSchedule po = new IrIrrigateSchedule();
po.setGroupId(schedule.getGroupId());
@@ -141,6 +159,36 @@
}
/**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ @GetMapping(path = "/getNotCompletePlans")
+ public BaseResponse<List<VoPlans>> getNotCompletePlans() {
+ try {
+ List<VoPlans> res = irrigatePlanSv.getNotCompletePlans();
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇鏈畬鐨勮鍒掑紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ @GetMapping(path = "/getCompletedPlans")
+ public BaseResponse<List<VoPlans>> getCompletedPlans() {
+ try {
+ List<VoPlans> res = irrigatePlanSv.getCompletedPlans();
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
* 鍙戝竷鐏屾簤璁″垝
* 1. 淇敼鐏屾簤璁″垝鐘舵�佷负鍙戝竷鐘舵��
* 2. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
@@ -158,6 +206,7 @@
Long planId = planSimple.getPlanId();
Long operatorId = planSimple.getOperatorId();
+ Byte operateType = 1;
/**
* 鑾峰彇鐏屾簤璁″垝淇℃伅
@@ -177,7 +226,10 @@
planStartTime = new Date();
}
LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
- startTime = startTime.plusMinutes(5);
+ if(startupMode == 1){
+ startTime = startTime.plusMinutes(1);
+ //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());
@@ -217,14 +269,17 @@
Long groupId = schedule.getGroupId();
List<Long> intakeIds = irrigatePlanSv.getIntakeIdsByGroupId(groupId);
for(Long intakeId : intakeIds) {
- AutomaticClose automaticClose = new AutomaticClose();
- automaticClose.setIntakeId(intakeId);
- automaticClose.setPlannedOpenTime(schedule.getStartTime());
- automaticClose.setMinutes(schedule.getDuration());
- automaticClose.setOperator(operatorId);
- automaticClose.setOpenType(Byte.valueOf("1"));
+ 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, schedule.getStartTime(), schedule.getDuration());
+ commandSv.planedOpenTimedClose(automaticClose, planId, operateType, schedule.getStartTime(), schedule.getDuration());
+ }
}
}
@@ -232,18 +287,76 @@
}
/**
- * 鑾峰彇鐏屾簤璁″垝鍒楄〃
- * @param vo
+ * 缁堟鐏屾簤璁″垝
+ * @param planSimple
+ * @param bindingResult
* @return
*/
- //@GetMapping(path = "/getIrrigatePlans")
- //public BaseResponse<QueryResultVo<List<VoIrrigatePlan>>> getIrrigatePlans(QoIrrigatePlan vo) {
- // try {
- // QueryResultVo<List<VoIrrigatePlan>> res = irrigatePlanSv.getIrrigatePlans(vo);
- // return BaseResponseUtils.buildSuccess(res);
- // } catch (Exception e) {
- // log.error("鑾峰彇杞亴缁勮褰曞紓甯�", e);
- // return BaseResponseUtils.buildException(e.getMessage());
- // }
- //}
+ @PostMapping(path = "terminatePlan", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> terminatePlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult){
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long planId = planSimple.getPlanId();
+ Long operatorId = planSimple.getOperatorId();
+ Byte operateType = 2;
+
+ // 鐢熸垚缁堟寮�濮嬫椂闂淬�佺粓姝㈢亴婧夋椂闀�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String terminateStartTimeStr = "2000-01-01 00:00:00";
+ Date terminateStartTime = Date.from(LocalDateTime.parse(terminateStartTimeStr, formatter).atZone(ZoneId.systemDefault()).toInstant());
+ Integer terminateDuration = 100000;
+
+ // 鑾峰彇鍙粓姝㈡搷浣滆鍒掔殑鐏屾簤寮�濮嬫椂闂�
+ Date planStartTime = irrigatePlanSv.getToTerminatePlan(planId);
+ if(planStartTime == null){
+ return BaseResponseUtils.buildErrorMsg("璇ヨ鍒掍笉瀛樺湪鎴栦笉鏀寔缁堟鎿嶄綔");
+ }
+
+ // 缁堟璁″垝
+ IrIrrigatePlan iIrrigatePlan = new IrIrrigatePlan();
+ iIrrigatePlan.setId(planId);
+ iIrrigatePlan.setExecutingState((byte)3);
+ if(irrigatePlanSv.updatePlan(iIrrigatePlan) == 0){
+ return BaseResponseUtils.buildErrorMsg("缁堟璁″垝澶辫触");
+ }
+
+ // 缁堟鐏屾簤娆″簭
+ if(irrigatePlanSv.terminateSchedule(planId) == 0){
+ return BaseResponseUtils.buildErrorMsg("缁堟鐏屾簤娆″簭澶辫触");
+ }
+
+ // 娣诲姞缁堟鎿嶄綔璁板綍
+ IrPlanOperate planOperate = new IrPlanOperate();
+ planOperate.setPlanId(planId);
+ planOperate.setOperator(operatorId);
+ planOperate.setOperateType(OperateTypeENUM.TERMINATE.getCode());
+ planOperate.setOperateTime(new Date());
+ if(irrigatePlanSv.addPlanOperate(planOperate) == 0){
+ return BaseResponseUtils.buildErrorMsg("娣诲姞缁堟鎿嶄綔璁板綍澶辫触");
+ }
+
+ Date currentTime = new Date();
+ if(currentTime.before(planStartTime)){
+ // 鍙栨秷寮�闃�璁″垝
+ List<Long> intakeIds = irrigatePlanSv.getToTerminateIntakeIds(planId);
+ for(Long intakeId : intakeIds) {
+ AutomaticClose automaticClose = new AutomaticClose();
+ automaticClose.setIntakeId(intakeId);
+ automaticClose.setPlannedOpenTime(terminateStartTime);
+ automaticClose.setMinutes(terminateDuration);
+ automaticClose.setOperator(operatorId);
+ automaticClose.setOpenType(Byte.valueOf("1"));
+
+ commandSv.planedOpenTimedClose(automaticClose, planId, operateType, terminateStartTime, terminateDuration);
+ }
+ } else {
+ // 鎵ц杩滅▼鍏抽榾
+ }
+
+ return BaseResponseUtils.buildSuccess();
+
+ }
}
--
Gitblit v1.8.0