From c6beb89b7170115eada78526f87406381c931229 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 03 四月 2025 10:37:51 +0800
Subject: [PATCH] 灌溉计划发布时仅发布灌溉时长大于0的
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java | 340 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 306 insertions(+), 34 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 ed15346..121543d 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
@@ -4,19 +4,29 @@
import com.dy.common.webUtil.BaseResponseUtils;
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;
import com.dy.pipIrrWechat.irrigatePlan.dto.IrrigateSchedule;
+import com.dy.pipIrrWechat.irrigatePlan.dto.PlanSimple;
+import com.dy.pipIrrWechat.irrigatePlan.enums.OperateTypeENUM;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
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;
@@ -33,7 +43,17 @@
@RequiredArgsConstructor
public class IrrigatePlanCtrl {
private final IrrigatePlanSv irrigatePlanSv;
+ private final CommandSv commandSv;
+ /**
+ * 鍒涘缓鐏屾簤璁″垝
+ * 1. 娣诲姞鐏屾簤璁″垝
+ * 2. 娣诲姞鐏屾簤娆″簭
+ * 3. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ * @param planAndSchedule
+ * @param bindingResult
+ * @return
+ */
@PostMapping(path = "createPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> createPlan(@RequestBody @Valid IrrigatePlan planAndSchedule, BindingResult bindingResult){
@@ -41,49 +61,301 @@
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ Long projectId = planAndSchedule.getProjectId();
+ Long operatorId = planAndSchedule.getOperatorId();
+ Byte startupMode = planAndSchedule.getStartupMode();
+ Date planStartTime = planAndSchedule.getPlanStartTime();;
+ Date planStopTime = null;
+
+ 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){
+ // planStartTime = new Date();
+ //}
+ //LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ //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());
+
IrIrrigatePlan plan = new IrIrrigatePlan();
- plan.setProjectId(planAndSchedule.getProjectId());
+ plan.setProjectId(projectId);
plan.setPlanName(planAndSchedule.getPlanName());
- plan.setStartupMode(planAndSchedule.getStartupMode());
- plan.setPlanStartTime(planAndSchedule.getPlanStartTime());
- plan.setPlanStopTime(planAndSchedule.getPlanStopTime());
+ plan.setStartupMode(startupMode);
+ plan.setPlanStartTime(planStartTime);
+ //plan.setPlanStopTime(planStopTime);
+ plan.setDuration(duration);
plan.setPlanState((byte)1);
plan.setExecutingState((byte)1);
plan.setDeleted(0L);
Long planId = irrigatePlanSv.addIrrigatePlan(plan);
- if(planId != null){
- for(IrrigateSchedule schedule : planAndSchedule.getSchedules()){
- IrIrrigateSchedule po = new IrIrrigateSchedule();
- po.setPlanId(planId);
+ if(planId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍒涘缓鐏屾簤璁″垝澶辫触");
+ }
- if(planAndSchedule.getIrrigateType() == 1) {
- po.setGroupId(schedule.getIrrigateId());
- List<Long> intakesData = irrigatePlanSv.getIntakesByGroupId(schedule.getIrrigateId());
- if(intakesData != null && intakesData.size() > 0){
- String intakeIds = "";
- for(Long intakeId : intakesData){
- intakeIds += intakeId + ",";
- }
- po.setIntakeIds(intakeIds.substring(0, intakeIds.length() - 1));
- }
- }else {
- po.setUnitId(schedule.getIrrigateId());
- Long intakeId = irrigatePlanSv.getIntakeIdByUnitId(schedule.getIrrigateId());
- if(intakeId != null){
- po.setIntakeIds(intakeId.toString());
- }
+ // 娣诲姞鐏屾簤娆″簭鍙婅鍒掓搴忓叧鑱旇〃
+ //Date scheduleStartTime = null;
+ Integer sort = 1;
+ for(IrrigateSchedule schedule : planAndSchedule.getSchedules()){
+ IrIrrigateSchedule po = new IrIrrigateSchedule();
+ po.setGroupId(schedule.getGroupId());
+
+ //if(scheduleStartTime == null) {
+ // scheduleStartTime = planStartTime;
+ //}
+ //po.setStartTime(scheduleStartTime);
+ //// 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
+ //LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ //LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
+ //scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
+
+ po.setDuration(schedule.getDuration());
+ po.setCurrentState((byte)1);
+ Long scheduleId = irrigatePlanSv.addIrrigateSchedule(po);
+ if(scheduleId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍒涘缓鐏屾簤璁″垝澶辫触");
+ }
+
+ IrPlanSchedule planSchedule = new IrPlanSchedule();
+ planSchedule.setPlanId(planId);
+ planSchedule.setScheduleId(scheduleId);
+ planSchedule.setSort(sort++);
+ Long planScheduleId = irrigatePlanSv.addPlanSchedule(planSchedule);
+ if(planScheduleId == null) {
+ return BaseResponseUtils.buildErrorMsg("鍒涘缓鐏屾簤璁″垝澶辫触");
+ }
+
+ }
+
+ // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ IrPlanOperate planOperate = new IrPlanOperate();
+ planOperate.setPlanId(planId);
+ planOperate.setOperator(operatorId);
+ planOperate.setOperateType(OperateTypeENUM.CREATE.getCode());
+ planOperate.setOperateTime(new Date());
+ if(irrigatePlanSv.addPlanOperate(planOperate) == 0){
+ return BaseResponseUtils.buildErrorMsg("娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
+ }
+
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @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. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ * 3. 鐢熸垚寮�闃�璁″垝
+ * @param planSimple
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "publishPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> publishPlan(@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 = 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){
+ 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());
}
-
- po.setStartTime(schedule.getStartTime());
- po.setStopTime(schedule.getStopTime());
- //po.setIntakeIds(schedule.getIntakeIds());
- po.setCurrentState((byte)1);
- Long scheduleId = irrigatePlanSv.addIrrigateSchedule(po);
}
}
+ return BaseResponseUtils.buildSuccess();
+ }
+
+ /**
+ * 缁堟鐏屾簤璁″垝
+ * @param planSimple
+ * @param bindingResult
+ * @return
+ */
+ @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