From cbd171f118678681b9685a6fae2bdf24d53556ac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 15:50:28 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java | 87 ++++++++++++++++++++++++++-----------------
1 files changed, 53 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 1727a53..ffd55e9 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,6 +2,8 @@
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;
@@ -31,6 +33,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -162,6 +165,25 @@
}
/**
+ * 鍒犻櫎鐏屾簤璁″垝
+ * @param planSimple
+ * @param bindingResult
+ * @return
+ */
+ @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());
+ }
+
+ Map map_result = irrigatePlanSv.deletePlan(planSimple);
+ if(map_result.get("success").equals(false)) {
+ return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString());
+ }
+ return BaseResponseUtils.buildSuccess() ;
+ }
+
+ /**
* 鍙戝竷鐏屾簤璁″垝
* 1. 淇敼鐏屾簤璁″垝鐘舵�佷负鍙戝竷鐘舵��
* 2. 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
@@ -289,39 +311,37 @@
}
List<VoToTerminateIntakes> toTerminateIntakes = irrigatePlanSv.getToTerminateIntakes(planId);
- if(toTerminateIntakes == null || toTerminateIntakes.size() == 0){
- return BaseResponseUtils.buildErrorMsg("璇ヨ鍒掍笉瀛樺湪鎴栧凡缁堟");
- }
+ 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"));
- 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();
- 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);
+ 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);
+ }
}
}
@@ -370,10 +390,9 @@
* @return
*/
@GetMapping(path = "/getCompletedPlans")
- public BaseResponse<List<VoPlans>> getCompletedPlans() {
+ public BaseResponse<QueryResultVo<List<VoPlans>>> getCompletedPlans(QueryConditionVo qo) {
try {
- List<VoPlans> res = irrigatePlanSv.getCompletedPlans();
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(irrigatePlanSv.getCompletedPlans(qo));
} catch (Exception e) {
log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
--
Gitblit v1.8.0