From 7a2fa8d7481a3eb0a39dc9e434776b7ae05013b0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 08:44:16 +0800
Subject: [PATCH] 2024-07-03 朱宝民 获取充值记录兼容10位水卡编号
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 5 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 05e8f1d..59f32ed 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
@@ -5,6 +5,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com97Vo;
import com.dy.common.mw.protocol.p206V1_0_0.downVos.Com98Vo;
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+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;
import com.dy.common.util.IDLongGenerator;
@@ -13,8 +14,10 @@
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.VoUnclosedValve;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
+import com.dy.pipIrrWechat.command.dto.Recharge;
import com.dy.pipIrrWechat.command.dto.ValveClose;
import com.dy.pipIrrWechat.command.dto.ValveOpen;
import com.dy.pipIrrWechat.result.WechatResultCode;
@@ -22,6 +25,8 @@
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
@@ -47,7 +52,9 @@
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
private final IDLongGenerator idLongGenerator;
- private String rtuResultSendWebUrl = "http://127.0.0.1:8087/wx/comRes/receive";
+
+ @Value("${mw.rtuCallbackUrl_wx}")
+ private String rtuCallbackUrl_wx;
/**
* 灏忕▼搴忚繙绋嬪紑闃�
@@ -138,7 +145,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
@@ -168,7 +175,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -237,7 +244,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if (protocol.equals("p206V1_0_1")) {
@@ -264,7 +271,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -288,4 +295,84 @@
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * 灏忕▼搴忚繙绋嬪厖鍊�
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "recharge", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @Transactional(rollbackFor = Exception.class)
+ public BaseResponse<Boolean> recharge(@RequestBody @Valid Recharge po, BindingResult bindingResult) {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+
+ Long intakeId = po.getIntakeId();
+ Long cardId = po.getCardId();
+ Double chargeMoney = po.getChargeMoney();
+ Double chargeWater = po.getChargeWater();
+ Long operator = po.getOperator();
+ String flowNo = RandomStringUtils.randomNumeric(12); // 鐢熸垚12浣嶉殢鏈烘暟
+ Long comId = idLongGenerator.generate();
+
+ // 鑾峰彇绯荤粺鍙傛暟
+ if(!setuped) {
+ setUp();
+ }
+
+ // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
+ JSONObject job_rtu = getRtu(intakeId, null);
+ if(job_rtu == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.RTU_NOT_EXIST.getMessage());
+ }
+ String rtuAddr = job_rtu.getString("rtuAddr");
+ String protocol = job_rtu.getString("protocol");
+
+ // 姘村崱ID鎹㈡按鍗″湴鍧�鍙婃按鍗＄紪鍙�
+ SeClientCard seClientCard = commandSv.geClientCardByCardId(cardId);
+ if(seClientCard == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.CLIENT_CARD_NOT_EXIST.getMessage());
+ }
+ String icCardAddr = seClientCard.getCardaddr();
+ String icCardNo = seClientCard.getCardnum();
+
+ String commandCode = null;
+ if(protocol.equals("p206V202404")) {
+ // 鑾峰彇鍔熻兘鐮�
+ commandCode = CodeV202404.cd_15;
+
+ // 鍒涘缓瑙嗗浘
+ ComCd15Vo param = new ComCd15Vo();
+ param.controllerType = controllerType;
+ param.projectNo = projectNo;
+ param.icCardAddr = icCardAddr;
+ param.icCardNo = icCardNo;
+ param.chargeMoney = chargeMoney;
+ param.chargeWater = chargeWater;
+ param.flowNo = flowNo;
+
+ /**
+ * 鏋勯�犲懡浠ゃ�佸彂閫佸懡浠ゅ苟澶勭悊璇锋眰缁撴灉鍙婃墽琛岀粨鏋�
+ * 1 鍑嗗鍙傛暟
+ * 2 璋冪敤鍏叡鏂规硶
+ */
+ Param myParam = new Param();
+ myParam.setComId(comId);
+ myParam.setCommandCode(commandCode);
+ myParam.setCommandName(CodeV202404.getCodeName(commandCode));
+ myParam.setIntakeId(intakeId);
+ myParam.setRtuAddr(rtuAddr);
+ myParam.setProtocol(protocol);
+ myParam.setParam(param);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
+ myParam.setOperator(operator);
+ return dealWithCommandResult(myParam);
+ } else if(protocol.equals("p206V1_0_1")) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
+ } else {
+ return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
+ }
+ }
}
--
Gitblit v1.8.0