From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 242 +++++++++++-------------------------------------
1 files changed, 57 insertions(+), 185 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 8f205cb..504c532 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
@@ -3,9 +3,12 @@
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.aop.SsoAop;
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;
@@ -57,7 +60,6 @@
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
- private final IDLongGenerator idLongGenerator;
@Value("${mw.rtuCallbackUrl_rm}")
private String rtuCallbackUrl_rm;
@@ -72,19 +74,12 @@
private String key_mw = "comSendUrl";
@Autowired
- public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
+ public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, Environment env) {
this.commandSv = commandSv;
this.seVirtualCardMapper = seVirtualCardMapper;
- this.idLongGenerator = idLongGenerator;
this.env = env;
}
- /**
- * 骞冲彴杩滅▼寮�闃�锛堝己鍒跺紑闃�锛�
- * @param valve
- * @param bindingResult
- * @return
- */
@PostMapping(path = "open", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -97,7 +92,7 @@
Long intakeId = valve.getIntakeId();
Long vcId = valve.getVcId();
Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 鑾峰彇姘翠环
Double waterPrice = commandSv.getPrice();
@@ -126,7 +121,7 @@
}
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鏂板崗璁弬鏁颁腑闇�瑕佽櫄鎷熷崱
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
@@ -159,11 +154,6 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -177,20 +167,15 @@
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;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -204,12 +189,6 @@
}
}
- /**
- * 骞冲彴杩滅▼鍏抽榾锛堝己鍒跺叧闃�锛�
- * @param dtoBase
- * @param bindingResult
- * @return
- */
@PostMapping(path = "close_intake", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -224,6 +203,9 @@
VoUnclosedParam voUnclosedParam = null;
try {
voUnclosedParam = commandSv.getUncloseParam(intakeId);
+ if(voUnclosedParam == null) {
+ return BaseResponseUtils.buildErrorMsg("涓嶅瓨鍦ㄧ鍚堟潯浠剁殑鏈叧闃�鍙栨按鍙�");
+ }
}catch (Exception e) {
return BaseResponseUtils.buildErrorMsg("鑾峰彇鏈叧闃�淇℃伅閿欒");
}
@@ -235,7 +217,7 @@
String vcNum = voUnclosedParam.getVcNum();
Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
String orderNo = voUnclosedParam.getOrderNo();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -252,7 +234,7 @@
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_93;
@@ -281,9 +263,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;
/**
* 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
@@ -294,7 +276,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);
@@ -308,12 +290,6 @@
}
}
- /**
- * 杩滅▼寮�闃�锛堜唬鍐滄埛锛�
- * @param valve
- * @param bindingResult
- * @return
- */
@PostMapping(path = "open_client", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -325,13 +301,8 @@
Long intakeId = valve.getIntakeId();
Long vcId = valve.getVcId();
Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if (vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if (vcId == null) {
@@ -377,7 +348,7 @@
}
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A2;
@@ -392,11 +363,6 @@
param.elePrice = 0.0;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)1);
@@ -411,9 +377,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();
@@ -422,16 +388,11 @@
param.waterPrice = waterPrice;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -445,12 +406,6 @@
}
}
- /**
- * 杩滅▼鍏抽榾锛堜唬鍐滄埛锛�
- * @param dtoBase
- * @param bindingResult
- * @return
- */
@PostMapping(path = "close_client", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -476,7 +431,7 @@
String vcNum = voUnclosedParam.getVcNum();
Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
String orderNo = voUnclosedParam.getOrderNo();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -492,7 +447,7 @@
comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
- if (protocol.equals("p206V202404")) {
+ if (protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_A3;
@@ -503,11 +458,6 @@
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setComType((byte)2);
@@ -521,25 +471,20 @@
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();
param.icCardNo = vcNum;
param.orderNo = orderNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -553,12 +498,6 @@
}
}
- /**
- * 瀹氭椂鍏抽榾寮忓紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -571,13 +510,8 @@
Long vcId = automaticClose.getVcId();
Integer minutes = automaticClose.getMinutes();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -620,11 +554,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();
@@ -634,16 +568,11 @@
param.setMinutes(minutes);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -657,12 +586,6 @@
}
}
- /**
- * 瀹氶噺鍏抽榾寮忓紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "quantify_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -675,13 +598,8 @@
Long vcId = automaticClose.getVcId();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -724,11 +642,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();
@@ -738,16 +656,11 @@
param.setWaterAmount(waterAmount);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -761,12 +674,6 @@
}
}
- /**
- * 瀹氭椂鍏抽榾寮忚鍒掑紑闃�
- * @param automaticClose
- * @param bindingResult
- * @return
- */
@PostMapping(path = "planed_open_timed_close", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
@@ -780,7 +687,7 @@
Date plannedOpenTime = automaticClose.getPlannedOpenTime();
Integer minutes = automaticClose.getMinutes();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -788,11 +695,6 @@
Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -835,11 +737,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();
@@ -854,16 +756,11 @@
param.setMinute(minute);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -896,7 +793,7 @@
Date plannedOpenTime = automaticClose.getPlannedOpenTime();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
Integer year = Integer.parseInt(String.format("%tY", plannedOpenTime));
Integer month = Integer.parseInt(String.format("%tm", plannedOpenTime));
@@ -904,11 +801,6 @@
Integer hour = Integer.parseInt(String.format("%tH", plannedOpenTime));
Integer minute = Integer.parseInt(String.format("%tM", plannedOpenTime));
- /**
- * 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
- * 濡傛灉鍐滄埛鏈�夋嫨铏氭嫙鍗★紝鍒欐牴鎹彇姘村彛ID鑾峰彇涓庝箣缁戝畾鐨勮櫄鎷熷崱
- * 濡傛灉鍙栨按鍙ｆ病鏈変笌涔嬬粦瀹氱殑铏氭嫙鍗★紝鍒欐彁绀哄啘鎴烽�夋嫨涓�寮犺櫄鎷熷崱
- */
if(vcId == null) {
vcId = commandSv.getVcIdByIntakeId(intakeId);
if(vcId == null) {
@@ -951,11 +843,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,16 +862,11 @@
param.setMinute(minute);
param.setOrderNo(orderNo);
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
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);
@@ -993,11 +880,6 @@
}
}
- /**
- * 鏍规嵁鎿嶄綔鍛業D鑾峰彇鏈叧闃�璁板綍
- * @param operator
- * @return
- */
@GetMapping(path = "/get")
@SsoAop()
public BaseResponse<List<VoUnclosedValve>> getUnclosedValves(@RequestParam Long operator){
@@ -1048,7 +930,7 @@
Double chargeWater = po.getChargeWater();
Long operator = po.getOperator();
String flowNo = RandomStringUtils.randomNumeric(12); // 鐢熸垚12浣嶉殢鏈烘暟
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -1067,7 +949,7 @@
String icCardNo = seClientCard.getCardnum();
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_15;
@@ -1081,11 +963,6 @@
param.chargeWater = chargeWater;
param.flowNo = flowNo;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setCommandCode(commandCode);
@@ -1097,7 +974,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("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
@@ -1121,7 +998,7 @@
Long intakeId = card.getIntakeId();
String cardAddr = card.getCardAddr();
Long operator = card.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
JSONObject job_rtu = getRtu(intakeId, null);
@@ -1132,7 +1009,7 @@
String protocol = job_rtu.getString("protocol");
String commandCode = null;
- if(protocol.equals("p206V202404")) {
+ if(protocol.equals(ProtocolConstantV206V202404.protocolName)) {
// 鑾峰彇鍔熻兘鐮�
commandCode = CodeV202404.cd_9C;
@@ -1142,11 +1019,6 @@
param.projectNo = projectNo;
param.icCardAddr = cardAddr;
- /**
- * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
- * 1 鍑嗗鍙傛暟
- * 2 璋冪敤鍏叡鏂规硶
- */
Param myParam = new Param();
myParam.setComId(comId);
myParam.setCommandCode(commandCode);
@@ -1158,7 +1030,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("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
@@ -1193,7 +1065,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;
@@ -1247,7 +1119,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