From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
index 36e30e9..46cfc3d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/monitor/MonitorCtrl.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrRemote.monitor;
import com.dy.common.aop.SsoAop;
+import com.dy.common.mw.protocol.rtuState.RtuStatus;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -41,9 +42,31 @@
QueryResultVo<List<VoOnLineIntake>> res = monitorSv.selectOnLineIntakes(qo);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ log.error("鍛戒护鎵ц寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage());
}
}
+
+ /**
+ * RTU鍦ㄩ�氫俊涓棿浠朵腑鐨勮繍琛岀姸鎬�
+ * @param rtuAddr
+ * @return
+ */
+ @GetMapping(path = "rtuStatus")
+ @SsoAop()
+ public BaseResponse<RtuStatus> rtuStatus(String rtuAddr){
+ try {
+ RtuStatus res = monitorSv.rtuStatus(rtuAddr);
+ if(res != null){
+ return BaseResponseUtils.buildSuccess(res);
+ }else{
+ return BaseResponseUtils.buildErrorMsg("鍚庡彴绯荤粺鍑洪敊锛屼粠閫氫俊涓棿浠舵湭寰楀埌鏌ヨ缁撴灉");
+ }
+ } catch (Exception e) {
+ log.error("鍛戒护鎵ц寮傚父", e);
+ return BaseResponseUtils.buildErrorMsg(e.getMessage());
+ }
+ }
+
}
--
Gitblit v1.8.0