From b3b17b231e2f2840332ce6eb96f791865fdec6d5 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 14 四月 2025 16:38:16 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
index d11588e..a419054 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
@@ -114,12 +114,23 @@
* @param stateVo 鐘舵�佸璞�
*/
private void toMsCenter(PrController controller, String rtuAddr, DataV1 dV1, DataAlarmVo alarmVo, DataStateVo stateVo){
- if(alarmVo != null && controller != null){
+ if(alarmVo != null && controller != null && alarmVo.hasAlarm()){
MsObj msObj = new MsObj() ;
msObj.put("name", "鎶ヨ");
msObj.put("rtuAddr", rtuAddr);
msObj.put("intakeId", controller.getIntakeId());
msObj.put("alarm", alarmVo.alarmContent());
+ msObj.put("dt", dV1.dt);
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
+ if(stateVo != null && controller != null && stateVo.valveState != null){
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "闃�鎬�");
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", controller.getIntakeId());
+ msObj.put("state", stateVo.valveState);
+ msObj.put("stateName", stateVo.valveState==0?"寮�":"鍏�");
+ msObj.put("dt", dV1.dt);
MsCenterUnit.getInstance().pushMs(msObj);
}
}
--
Gitblit v1.8.0