From 0be32a3805e1430b82b5bded8bd23946e274fa84 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 06 十一月 2024 14:27:35 +0800
Subject: [PATCH] 优化虚拟卡占用逻辑，占用时写入取水口编号，解除占用时清空虚拟卡编号；工单使用的4个表
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 176 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 103 insertions(+), 73 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
index 648354f..53778ea 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java
@@ -2,9 +2,13 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
-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.multiDataSource.DataSourceContext;
+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;
@@ -22,6 +26,7 @@
import com.dy.pipIrrRemote.common.CommandSv;
import com.dy.pipIrrRemote.common.dto.*;
import com.dy.pipIrrRemote.result.RemoteResultCode;
+import com.dy.pipIrrRemote.valve.dto.deleteUnclosedParam;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
@@ -110,10 +115,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -123,7 +129,7 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鏂板崗璁弬鏁颁腑闇�瑕佽櫄鎷熷崱
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
@@ -174,9 +180,9 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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_92;
+ commandCode = CodeV1.cd_92;
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -187,7 +193,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);
@@ -241,14 +247,15 @@
}
//Long intakeId = job_rtu.getLong("intakeId");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_93;
@@ -277,9 +284,9 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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_93;
+ commandCode = CodeV1.cd_93;
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -290,7 +297,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);
@@ -359,10 +366,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -372,7 +380,7 @@
}
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A2;
@@ -406,9 +414,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();
@@ -426,7 +434,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);
@@ -479,15 +487,15 @@
return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_EXIST.getMessage());
}
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
-
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A3;
@@ -516,9 +524,9 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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();
@@ -534,7 +542,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);
@@ -601,10 +609,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -614,11 +623,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();
@@ -637,7 +646,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);
@@ -704,10 +713,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -717,11 +727,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();
@@ -740,7 +750,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);
@@ -814,10 +824,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -827,11 +838,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();
@@ -855,7 +866,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);
@@ -929,10 +940,11 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
- String orgTag = job_rtu.getString("orgTag");
- if(orgTag == null) {
- return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
- }
+ //String orgTag = job_rtu.getString("orgTag");
+ //if(orgTag == null) {
+ // return BaseResponseUtils.buildErrorMsg(RemoteResultCode.RTU_NOT_SET_DATA_SOURCE.getMessage());
+ //}
+ String orgTag = DataSourceContext.get();
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
@@ -942,11 +954,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();
@@ -970,7 +982,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);
@@ -999,6 +1011,24 @@
log.error("鑾峰彇鏈叧闃�璁板綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
+ }
+
+ /**
+ * 寮哄埗鍥犳鏈叧闃�璁板綍锛氫负鎸囧畾锛堥榾鎺у櫒鍦板潃銆佹按鍗＄紪鍙枫�佹棤鍏抽榾璁板綍锛夊紑鍏抽榾鏈�鏂拌褰曟坊鍔犲叧闃�鏃堕棿锛屼娇涔嬩笉鍦ㄦ湭鍏抽榾璁板綍涓樉绀�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "deleteUnclosed", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ @SsoAop()
+ 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();
}
/**
@@ -1040,7 +1070,7 @@
String icCardNo = seClientCard.getCardnum();
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_15;
@@ -1070,7 +1100,7 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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(RemoteResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
@@ -1105,7 +1135,7 @@
String protocol = job_rtu.getString("protocol");
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_9C;
@@ -1131,7 +1161,7 @@
myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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(RemoteResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
@@ -1166,7 +1196,7 @@
// String protocol = job_rtu.getString("protocol");
//
// String commandCode = null;
- // if(protocol.equals("p206V202404")) {
+ // if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// if(valid) {
// // 鑾峰彇鍔熻兘鐮�
// commandCode = CodeV202404.cd_30;
@@ -1220,7 +1250,7 @@
// 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(RemoteResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
// } else {
// return BaseResponseUtils.buildErrorMsg("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
--
Gitblit v1.8.0