From c8ffc5ed851f85808aa735a575402ebae4b00da9 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 09 十一月 2024 08:19:21 +0800
Subject: [PATCH] 获取全部取水口接口取消在线情况判断
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index c88ecf0..db5cd4d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -2,9 +2,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.multiDataSource.DataSourceContext;
-import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.downVos.*;
+import com.dy.common.mw.protocol.p206V1.CodeV1;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
+import com.dy.common.mw.protocol.p206V1.downVos.*;
+import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd15Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd92_A2Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd93_A3Vo;
@@ -19,10 +22,7 @@
import com.dy.pipIrrGlobal.voRm.VoIrrigaterProfile;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
-import com.dy.pipIrrWechat.command.dto.AutomaticClose;
-import com.dy.pipIrrWechat.command.dto.Recharge;
-import com.dy.pipIrrWechat.command.dto.ValveClose;
-import com.dy.pipIrrWechat.command.dto.ValveOpen;
+import com.dy.pipIrrWechat.command.dto.*;
import com.dy.pipIrrWechat.result.WechatResultCode;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -159,7 +159,7 @@
}
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A2;
@@ -193,9 +193,9 @@
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
- } else if (protocol.equals("p206V1_0_1")) {
+ } else if (protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_97;
+ commandCode = CodeV1.cd_97;
// 鍒涘缓瑙嗗浘
Com97Vo param = new Com97Vo();
@@ -213,7 +213,7 @@
myParam.setComId(comId);
myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -263,7 +263,7 @@
comSendUrl = env.getProperty(pro_mw + "." + DataSourceContext.get() + "." + key_mw);
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A3;
@@ -292,9 +292,9 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
- } else if (protocol.equals("p206V1_0_1")) {
+ } else if (protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_98;
+ commandCode = CodeV1.cd_98;
// 鍒涘缓瑙嗗浘
Com98Vo param = new Com98Vo();
@@ -310,7 +310,7 @@
myParam.setComId(comId);
myParam.setComType((byte)2);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -390,11 +390,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_99;
+ commandCode = CodeV1.cd_99;
// 鍒涘缓瑙嗗浘
Com99Vo param = new Com99Vo();
@@ -411,9 +411,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -493,11 +493,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_A0;
+ commandCode = CodeV1.cd_A0;
// 鍒涘缓瑙嗗浘
ComA0Vo param = new ComA0Vo();
@@ -514,9 +514,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -603,11 +603,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_A1;
+ commandCode = CodeV1.cd_A1;
// 鍒涘缓瑙嗗浘
ComA1Vo param = new ComA1Vo();
@@ -629,9 +629,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -718,11 +718,11 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
return BaseResponseUtils.buildSuccess();
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_A2;
+ commandCode = CodeV1.cd_A2;
// 鍒涘缓瑙嗗浘
ComA2Vo param = new ComA2Vo();
@@ -744,9 +744,9 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
- myParam.setCommandName(CodeV1_0_1.getCodeName(commandCode));
+ myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
@@ -775,6 +775,22 @@
log.error("鑾峰彇鏈叧闃�璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
+ }
+
+ /**
+ * 寮哄埗闅愯棌鏈叧闃�璁板綍锛氫负鎸囧畾锛堥榾鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteUnclosed", consumes = MediaType.APPLICATION_JSON_VALUE)
+ public BaseResponse<Boolean> deleteUnclosed(@RequestBody @Valid deleteUnclosedParam po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ commandSv.addClostTime(po.getRtuAddr(), po.getVcNum());
+ return BaseResponseUtils.buildSuccess();
}
/**
@@ -815,7 +831,7 @@
String icCardNo = seClientCard.getCardnum();
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_15;
@@ -845,7 +861,7 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
- } else if(protocol.equals("p206V1_0_1")) {
+ } else if(protocol.equals(ProtocolConstantV206V1.protocolName) || protocol.equals(ProtocolConstantV206V2.protocolName)) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
--
Gitblit v1.8.0