From dc8008be8836c212f17fa29df7eac52a8fe716c4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 15:46:21 +0800
Subject: [PATCH] 2024-07-03 朱宝民 小程序远程开阀支持扫码开阀
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 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 f678e9b..7cc13da 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.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;
@@ -51,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;
/**
* 灏忕▼搴忚繙绋嬪紑闃�
@@ -67,9 +70,22 @@
}
Long intakeId = valve.getIntakeId();
+ String intakeName = valve.getIntakeName();
Long vcId = valve.getVcId();
Long operator = valve.getOperator();
Long comId = idLongGenerator.generate();
+
+ if(intakeId == null && intakeName == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ }
+
+ // intakeName鎹ntakeId
+ if(intakeId == null) {
+ intakeId = commandSv.getIntakeIdByName(intakeName);
+ if(intakeId == null) {
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_INTAKE.getMessage());
+ }
+ }
/**
* 濡傛灉鍐滄埛閫夋嫨浜嗚櫄鎷熷崱锛屽垯浣跨敤璇ヨ櫄鎷熷崱
@@ -142,7 +158,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
@@ -172,7 +188,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -241,7 +257,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")) {
@@ -268,7 +284,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -363,16 +379,11 @@
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_wx);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if(protocol.equals("p206V1_0_1")) {
- // 鑾峰彇鍔熻兘鐮�
- commandCode = CodeV1_0_1.cd_10;
-
- // 鍒涘缓瑙嗗浘
- Com97Vo param = new Com97Vo() ;
- return BaseResponseUtils.buildSuccess("");
+ return BaseResponseUtils.buildErrorMsg(WechatResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
--
Gitblit v1.8.0