From 7cea139a5eec2c3b4985fb853adfa143d1995129 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 18 七月 2024 16:47:35 +0800
Subject: [PATCH] 2024-07-18 朱宝民 重构开关阀公共方法，提交操作稳定性
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 a353cf7..b3058bf 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
@@ -26,6 +26,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.RandomStringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
@@ -53,10 +54,17 @@
private final SeVirtualCardMapper seVirtualCardMapper;
private final IDLongGenerator idLongGenerator;
- //@Value("${mw.rtuCallbackUrl_wx}")
- private String rtuCallbackUrl_wx = null;
+ @Value("${mw.rtuCallbackUrl_wx}")
+ private String rtuCallbackUrl_wx;
+ /**
+ * pro_mw锛氬睘鎬�
+ * tag浠庢帶鍒跺櫒涓幏鍙�
+ * key_mw锛歶rl鐨刱ey
+ */
private Environment env = null;
+ private String pro_mw = "mw";
+ private String key_mw = "comSendUrl";
@Autowired
public ValveCtrl(CommandSv commandSv, SeVirtualCardMapper seVirtualCardMapper, IDLongGenerator idLongGenerator, Environment env) {
@@ -73,15 +81,11 @@
* @return
*/
@PostMapping(path = "open_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
+ //@Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> open(@RequestBody @Valid ValveOpen valve, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
- String pro_mw = "mw";
- String key_mw = "comSendUrl";
- rtuCallbackUrl_wx = env.getProperty(pro_mw + "." + key_mw);
Long intakeId = valve.getIntakeId();
String intakeName = valve.getIntakeName();
@@ -140,6 +144,8 @@
}
String rtuAddr = job_rtu.getString("rtuAddr");
String protocol = job_rtu.getString("protocol");
+ String orgTag = job_rtu.getString("orgTag");
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
// 鐢熸垚璁㈠崟鍙�
String orderNo = generateOrderNo();
@@ -153,7 +159,7 @@
ComCd92_A2Vo param = new ComCd92_A2Vo();
param.controllerType = controllerType;
param.projectNo = projectNo;
- param.icCardNo = vc.getVcNum();
+ param.icCardNo = vc.getVcNum().toString();
param.waterRemain = 0.0;
param.moneyRemain = vc.getMoney();
param.waterPrice = waterPrice;
@@ -185,7 +191,7 @@
// 鍒涘缓瑙嗗浘
Com97Vo param = new Com97Vo();
- param.icCardNo = vc.getVcNum();
+ param.icCardNo = vc.getVcNum().toString();
param.moneyRemain = vc.getMoney();
param.waterPrice = waterPrice;
param.orderNo = orderNo;
@@ -221,7 +227,7 @@
* @return
*/
@PostMapping(path = "close_wx", consumes = MediaType.APPLICATION_JSON_VALUE)
- @Transactional(rollbackFor = Exception.class)
+ //@Transactional(rollbackFor = Exception.class)
public BaseResponse<Boolean> close(@RequestBody @Valid ValveClose valve, BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -246,6 +252,8 @@
}
Long intakeId = job_rtu.getLong("intakeId");
String protocol = job_rtu.getString("protocol");
+ String orgTag = job_rtu.getString("orgTag");
+ comSendUrl = env.getProperty(pro_mw + "." + orgTag + "." + key_mw);
String commandCode = null;
if (protocol.equals("p206V202404")) {
--
Gitblit v1.8.0