From 7aab004601e77890b158f19d1735594a8326feaa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 24 四月 2025 17:11:17 +0800
Subject: [PATCH] 数据库事务注解位置调整
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java | 352 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 229 insertions(+), 123 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 121543d..a30cb61 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,15 +2,19 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryConditionVo;
+import com.dy.common.webUtil.QueryResultVo;
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.pojoRm.RmCommandHistory;
+import com.dy.pipIrrGlobal.voIr.*;
+import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
import com.dy.pipIrrWechat.command.CommandSv;
import com.dy.pipIrrWechat.command.dto.AutomaticClose;
+import com.dy.pipIrrWechat.command.dto.ValveClose;
+import com.dy.pipIrrWechat.command.dto.ValveOpen;
import com.dy.pipIrrWechat.irrigatePlan.dto.IrrigatePlan;
import com.dy.pipIrrWechat.irrigatePlan.dto.IrrigateSchedule;
import com.dy.pipIrrWechat.irrigatePlan.dto.PlanSimple;
@@ -23,11 +27,13 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -55,7 +61,7 @@
* @return
*/
@PostMapping(path = "createPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
+ //@Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> createPlan(@RequestBody @Valid IrrigatePlan planAndSchedule, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -159,33 +165,22 @@
}
/**
- * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * 鍒犻櫎鐏屾簤璁″垝
+ * @param planSimple
+ * @param bindingResult
* @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());
+ @PostMapping(path = "deletePlan")
+ public BaseResponse<Boolean> deletePlan(@RequestBody @Valid PlanSimple planSimple, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- }
- /**
- * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
- * @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());
+ Map map_result = irrigatePlanSv.deletePlan(planSimple);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
}
+ return BaseResponseUtils.buildSuccess() ;
}
/**
@@ -198,91 +193,119 @@
* @return
*/
@PostMapping(path = "publishPlan", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
+ //@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;
+ 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){
- 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();
}
/**
@@ -292,7 +315,7 @@
* @return
*/
@PostMapping(path = "terminatePlan", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
+ //@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());
@@ -300,18 +323,52 @@
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";
+ String terminateStartTimeStr = LocalDate.now().getYear() + "-01-01 00:00:00";
Date terminateStartTime = Date.from(LocalDateTime.parse(terminateStartTimeStr, formatter).atZone(ZoneId.systemDefault()).toInstant());
- Integer terminateDuration = 100000;
+ Integer terminateDuration = 9999;
- // 鑾峰彇鍙粓姝㈡搷浣滆鍒掔殑鐏屾簤寮�濮嬫椂闂�
+ // 鍒ゆ柇璇ヨ鍒掓槸鍚﹀彲鎵ц缁堟鎿嶄綔锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
Date planStartTime = irrigatePlanSv.getToTerminatePlan(planId);
if(planStartTime == null){
return BaseResponseUtils.buildErrorMsg("璇ヨ鍒掍笉瀛樺湪鎴栦笉鏀寔缁堟鎿嶄綔");
+ }
+
+ List<VoToTerminateIntakes> toTerminateIntakes = irrigatePlanSv.getToTerminateIntakes(planId);
+ if(toTerminateIntakes != null && toTerminateIntakes.size() > 0){
+ for(VoToTerminateIntakes toTerminateIntake : toTerminateIntakes){
+ Long intakeId = toTerminateIntake.getIntakeId();
+ Long commandId = toTerminateIntake.getCommandId();
+ Date startTime = toTerminateIntake.getStartTime();
+ Date currentTime = new Date();
+ if(currentTime.before(startTime)){
+ // 鍙栨秷锛堣鐩栧紑闃�璁″垝锛�
+ 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, (byte)2, terminateStartTime, terminateDuration);
+ }else {
+ // 缁堟锛堣繙绋嬪叧闃�锛�
+ VoIntakeVc intakeVc = irrigatePlanSv.getValveOpen(commandId);
+ String rtuAddr = intakeVc.getRtuAddr();
+ String vcNum = intakeVc.getVcNum();
+ String orderNo = intakeVc.getOrderNo();
+
+ ValveClose valveClose = new ValveClose();
+ valveClose.setRtuAddr(rtuAddr);
+ valveClose.setVcNum(vcNum);
+ valveClose.setOrderNo(orderNo);
+ valveClose.setOperator(operatorId);
+ valveClose.setOpenType(Byte.valueOf("1"));
+ commandSv.closeWx(valveClose, planId, (byte)3);
+ }
+ }
}
// 缁堟璁″垝
@@ -336,26 +393,75 @@
if(irrigatePlanSv.addPlanOperate(planOperate) == 0){
return BaseResponseUtils.buildErrorMsg("娣诲姞缁堟鎿嶄綔璁板綍澶辫触");
}
+ return BaseResponseUtils.buildSuccess();
+ }
- 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"));
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @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());
+ }
+ }
- commandSv.planedOpenTimedClose(automaticClose, planId, operateType, terminateStartTime, terminateDuration);
- }
- } else {
- // 鎵ц杩滅▼鍏抽榾
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ @GetMapping(path = "/getCompletedPlans")
+ public BaseResponse<QueryResultVo<List<VoPlans>>> getCompletedPlans(QueryConditionVo qo) {
+ try {
+ return BaseResponseUtils.buildSuccess(irrigatePlanSv.getCompletedPlans(qo));
+ } catch (Exception e) {
+ log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
+ * @param planId
+ * @return
+ */
+ @GetMapping(path = "/getPublishResults")
+ public BaseResponse<VoPlanDetails> getPublishResults(@RequestParam Long planId) {
+ if(planId == null) {
+ return BaseResponseUtils.buildErrorMsg("璁″垝ID涓嶈兘涓虹┖");
}
- return BaseResponseUtils.buildSuccess();
+ try {
+ VoPlanDetails res = irrigatePlanSv.getPublishResults(planId);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇璁″垝鍙戝竷缁撴灉寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝缁堟鎿嶄綔缁撴灉
+ * @param planId
+ * @return
+ */
+ @GetMapping(path = "/getTerminateResults")
+ public BaseResponse<VoPlanDetails> getTerminateResults(@RequestParam Long planId) {
+ if(planId == null) {
+ return BaseResponseUtils.buildErrorMsg("璁″垝ID涓嶈兘涓虹┖");
+ }
+
+ try {
+ VoPlanDetails res = irrigatePlanSv.getTerminateResults(planId);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇璁″垝鍙戝竷缁撴灉寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
}
}
--
Gitblit v1.8.0