From e9c5dd944c69854b0156c321014f307c064a69bc Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 03 六月 2024 09:58:36 +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 | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 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 e86e811..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
@@ -8,17 +8,17 @@
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.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;
@@ -49,9 +49,10 @@
private final CommandSv commandSv;
protected static String controllerType = "57";
+ private final IDLongGenerator idLongGenerator;
/**
- * 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌
+ * 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌锛堜粎娴嬭瘯鐢級
* @return
*/
@GetMapping(path = "get_online")
@@ -86,6 +87,23 @@
}
/**
+ * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛
+ * @param operator
+ * @return
+ */
+ @GetMapping(path = "used_intakes")
+ @SsoAop()
+ public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
+ try {
+ List<VoOnLineIntake> res = commandSv.getUsedIntakes(operator);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+
+ /**
* 璁剧疆璁惧缁堢鍦板潃
* @param addr 璁剧疆璁惧缁堢鍦板潃浼犲叆瀵硅薄
* @param bindingResult
@@ -103,12 +121,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() ;
@@ -117,13 +138,13 @@
param.rtuNewAddr = newRtuAddr;
// 鍒涘缓鍛戒护鏃ュ織瀵硅薄骞舵坊鍔犲埌鏁版嵁搴撲腑
- RmCommandHistory rmCommandHistory = getComHistory(commandCode, rtuAddr, param, operator);
- String 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, param);
- sendCom2Mw(com);
+ //Command com = command(comId, commandCode, rtuAddr, protocol, param);
+ //sendCom2Mw(com);
CompletableFuture<Data> featureObject = new CompletableFuture<>();
features.put(comId, featureObject);
@@ -167,12 +188,17 @@
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();
+ String rtuAddr = "";
+ String protocol = "";
// 鍒涘缓瑙嗗浘
ComCdXyVo param = new ComCdXyVo();
@@ -180,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