From cebf0cafac47189c48f49ad9dd13cb5894341b4f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 02 六月 2024 20:26:35 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtu/RtuCtrl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 c0fd553..5ffa204 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
@@ -8,9 +8,11 @@
import com.dy.common.mw.protocol.p206V202404.CodeV202404;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCd10Vo;
import com.dy.common.mw.protocol.p206V202404.downVos.ComCdXyVo;
+import com.dy.common.util.IDLongGenerator;
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.pojoRm.RmCommandHistory;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrRemote.common.ComSupport;
@@ -49,6 +51,7 @@
private final CommandSv commandSv;
protected static String controllerType = "57";
+ private final IDLongGenerator idLongGenerator;
/**
* 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌锛堜粎娴嬭瘯鐢級
@@ -120,12 +123,15 @@
String newRtuAddr = addr.getNewRtuAddr();
Long operator = addr.getOperator();
String commandCode = CodeV202404.cd_10;
+ Long comId = idLongGenerator.generate();
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃
- String rtuAddr = commandSv.getRtuAddrByIntakeId(intakeId);
- if(rtuAddr == null || rtuAddr.length() == 0) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_ADDR_CANNOT_BE_NULL.getMessage());
+ // 鍙栨按鍙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();
// 鍒涘缓瑙嗗浘
ComCd10Vo param = new ComCd10Vo() ;
@@ -134,12 +140,12 @@
param.rtuNewAddr = newRtuAddr;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, param, operator);
- String comId = commandSv.insert(rmCommandHistory);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ comId = commandSv.insert(rmCommandHistory);
System.out.println(comId);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, param);
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
sendCom2Mw(com);
CompletableFuture<Data> featureObject = new CompletableFuture<>();
@@ -184,12 +190,15 @@
String commandCode = CodeV202404.cd_97;
Long intakeId = po.getIntakeId();
Long operator = po.getOperator();
+ Long comId = idLongGenerator.generate();
- // 鍙栨按鍙D鎹㈤榾鎺у櫒鍦板潃
- String rtuAddr = commandSv.getRtuAddrByIntakeId(intakeId);
- if(rtuAddr == null || rtuAddr.length() == 0) {
- return BaseResponseUtils.buildError(RemoteResultCode.RTU_ADDR_CANNOT_BE_NULL.getMessage());
+ // 鍙栨按鍙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();
// 鍒涘缓瑙嗗浘
ComCdXyVo param = new ComCdXyVo();
@@ -197,11 +206,11 @@
param.projectNo = projectNo;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, param, operator);
- String comId = commandSv.insert(rmCommandHistory);
+ RmCommandHistory rmCommandHistory = getComHistory(comId, commandCode, intakeId, rtuAddr, protocol, param, operator);
+ comId = commandSv.insert(rmCommandHistory);
// 鏋勯�犲懡浠�
- Command com = command(comId, commandCode, rtuAddr, param);
+ Command com = command(comId, commandCode, rtuAddr, protocol, param);
return sendCom2Mw(com);
}
}
--
Gitblit v1.8.0