From 7bd3b76929e9a126b237ab9e1c8c82e7d20a4a6a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 14 二月 2025 16:42:46 +0800
Subject: [PATCH] 开关阀记录中，对于当前未关阀的记录，不进行关阀类型名称翻译
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 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 eaac347..4d03330 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
@@ -55,7 +55,6 @@
public class ValveCtrl extends ComSupport {
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
- private final IDLongGenerator idLongGenerator;
@Value("${mw.rtuCallbackUrl_wx}")
private String rtuCallbackUrl_wx;
@@ -70,10 +69,9 @@
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;
}
@@ -84,7 +82,7 @@
* @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());
@@ -95,7 +93,7 @@
Long vcId = valve.getVcId();
Boolean forceOpen = valve.getForceOpen();
Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
if(intakeId == null && intakeName == null) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
@@ -246,7 +244,7 @@
Long vcId = Optional.ofNullable(seVirtualCardMapper.getVcIdByNum(vcNum)).orElse(0L);
String orderNo = valve.getOrderNo();
Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
// 闃�鎺у櫒鍦板潃鎹㈠彇姘村彛ID鍜岄�氳鍗忚
JSONObject job_rtu = getRtu(null, rtuAddr);
@@ -341,7 +339,7 @@
Long vcId = automaticClose.getVcId();
Integer minutes = automaticClose.getMinutes();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -411,7 +409,7 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
@@ -444,7 +442,7 @@
Long vcId = automaticClose.getVcId();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -514,7 +512,7 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
@@ -548,7 +546,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));
@@ -629,7 +627,7 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
@@ -663,7 +661,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));
@@ -744,7 +742,7 @@
*/
Param myParam = new Param();
myParam.setComId(comId);
- myParam.setComType((byte)2);
+ myParam.setComType((byte)1);
myParam.setCommandCode(commandCode);
myParam.setCommandName(CodeV1.getCodeName(commandCode));
myParam.setIntakeId(intakeId);
@@ -812,7 +810,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);
--
Gitblit v1.8.0