From 620c3af4bb8c53d5ec4c4d0127c9d92dc8aa4f65 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 03 六月 2024 09:53:49 +0800
Subject: [PATCH] 2024-06-03 朱宝民 平台开关阀及小程序开关阀
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
index 5ffa204..a0fe3bd 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java
@@ -12,15 +12,13 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
-import com.dy.pipIrrGlobal.pojoPr.PrController;
+import com.dy.pipIrrGlobal.command.ComSupport;
import com.dy.pipIrrGlobal.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
-import com.dy.pipIrrRemote.common.ComSupport;
import com.dy.pipIrrRemote.common.CommandSv;
import com.dy.pipIrrRemote.common.dto.Addr;
import com.dy.pipIrrRemote.common.dto.DtoBase;
import com.dy.pipIrrRemote.common.qo.OnLineIntakesQO;
-import com.dy.pipIrrRemote.result.RemoteResultCode;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -126,12 +124,12 @@
Long comId = idLongGenerator.generate();
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
- PrController prController = commandSv.getControllerByIntakeId(intakeId);
- if(prController == null) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
- }
- String rtuAddr = prController.getRtuAddr();
- String protocol = prController.getProtocol();
+ //PrController prController = commandSv.getControllerByIntakeId(intakeId);
+ //if(prController == null) {
+ // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ //}
+ //String rtuAddr = prController.getRtuAddr();
+ //String protocol = prController.getProtocol();
// 鍒涘缓瑙嗗浘
ComCd10Vo param = new ComCd10Vo() ;
@@ -140,13 +138,13 @@
param.rtuNewAddr = newRtuAddr;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
- comId = commandSv.insert(rmCommandHistory);
- System.out.println(comId);
+ //RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ //comId = commandSv.insert(rmCommandHistory);
+ //System.out.println(comId);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, param);
- sendCom2Mw(com);
+ //Command com = command(comId, commandCode, rtuAddr, protocol, param);
+ //sendCom2Mw(com);
CompletableFuture<Data> featureObject = new CompletableFuture<>();
features.put(comId, featureObject);
@@ -193,12 +191,14 @@
Long comId = idLongGenerator.generate();
// 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃鍙婇�氳鍗忚
- PrController prController = commandSv.getControllerByIntakeId(intakeId);
- if(prController == null) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
- }
- String rtuAddr = prController.getRtuAddr();
- String protocol = prController.getProtocol();
+ //PrController prController = commandSv.getControllerByIntakeId(intakeId);
+ //if(prController == null) {
+ // return BaseResponseUtils.buildError(RemoteResultCode.RTU_NOT_EXIST.getMessage());
+ //}
+ //String rtuAddr = prController.getRtuAddr();
+ //String protocol = prController.getProtocol();
+ String rtuAddr = "";
+ String protocol = "";
// 鍒涘缓瑙嗗浘
ComCdXyVo param = new ComCdXyVo();
@@ -206,11 +206,11 @@
param.projectNo = projectNo;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, "",intakeId, rtuAddr, protocol, param, operator);
comId = commandSv.insert(rmCommandHistory);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, protocol, param);
+ Command com = command(comId, commandCode,"", rtuAddr, protocol, param);
return sendCom2Mw(com);
}
}
--
Gitblit v1.8.0