From ee1800e3988e4913f5328c2cba07735fb4d06eff Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 06 六月 2025 17:30:37 +0800
Subject: [PATCH] 操作回调开卡附加充值部分
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 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 53778ea..4c4b193 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
@@ -19,7 +19,6 @@
import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.command.dto.Param;
import com.dy.pipIrrGlobal.daoSe.SeVirtualCardMapper;
-import com.dy.pipIrrGlobal.pojoSe.SeClientCard;
import com.dy.pipIrrGlobal.voRm.VoUnclosedParam;
import com.dy.pipIrrGlobal.voRm.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
@@ -60,7 +59,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;
@@ -75,10 +73,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;
}
@@ -100,7 +97,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();
@@ -238,7 +235,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);
@@ -328,7 +325,7 @@
Long intakeId = valve.getIntakeId();
Long vcId = valve.getVcId();
Long operator = valve.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -479,7 +476,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);
@@ -574,7 +571,7 @@
Long vcId = automaticClose.getVcId();
Integer minutes = automaticClose.getMinutes();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -678,7 +675,7 @@
Long vcId = automaticClose.getVcId();
Integer waterAmount = automaticClose.getWaterAmount();
Long operator = automaticClose.getOperator();
- Long comId = idLongGenerator.generate();
+ Long comId = new IDLongGenerator().generate();
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -783,7 +780,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));
@@ -899,7 +896,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));
@@ -1051,7 +1048,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);
@@ -1124,7 +1121,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);
--
Gitblit v1.8.0