From 836ec39fdad422b1a148699a4c5fb8c5b4d395f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 11:04:33 +0800
Subject: [PATCH] feat(card): 添加管理类型卡写卡功能并优化卡片相关逻辑- 在 OperateTypeENUM 中添加 SUPPLEMENT 和 MANAGEMENT_CARD_WRITE 枚举值 - 在 SeManagementCard 中添加 cancelTime 和 state 字段 - 更新相关 mapper 和 XML 文件以支持新增字段 - 修改 CardSv 中的回调处理逻辑，支持管理类型卡写卡 - 优化 CreateManagementCardDto 中识别码的示例值
---
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