From b83f639362ae959de55900d14d132585cd72a90d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 08:39:41 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/valve/ValveCtrl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 caed798..15af450 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
@@ -29,6 +29,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;
@@ -55,7 +56,9 @@
private final CommandSv commandSv;
private final SeVirtualCardMapper seVirtualCardMapper;
private final IDLongGenerator idLongGenerator;
- private String rtuResultSendWebUrl = "http://127.0.0.1:8081/remote/comRes/receive" ;
+
+ @Value("${mw.rtuCallbackUrl_rm}")
+ private String rtuCallbackUrl_rm;
/**
* 骞冲彴杩滅▼寮�闃�
@@ -148,7 +151,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if(protocol.equals("p206V1_0_1")) {
@@ -177,7 +180,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -258,7 +261,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else if(protocol.equals("p206V1_0_1")) {
@@ -285,7 +288,7 @@
myParam.setProtocol(protocol);
myParam.setVcId(vcId);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
myParam.setOperator(operator);
return dealWithCommandResult(myParam);
} else {
@@ -381,16 +384,11 @@
myParam.setRtuAddr(rtuAddr);
myParam.setProtocol(protocol);
myParam.setParam(param);
- myParam.setRtuResultSendWebUrl(rtuResultSendWebUrl);
+ myParam.setRtuResultSendWebUrl(rtuCallbackUrl_rm);
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(RemoteResultCode.THE_DEVICE_DOES_NOT_HAVE_THIS_FUNCTION.getMessage());
} else {
return BaseResponseUtils.buildFail("绯荤粺鏆備笉鏀寔璇ュ崗璁�");
}
--
Gitblit v1.8.0