From dbf59228a93ac492d6d9f34ed4402c7124f8ad34 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 24 二月 2025 09:59:45 +0800
Subject: [PATCH] 控制器报警与状态相关3个接口查询条件优化

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java |    3 ++-
 1 files changed, 2 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..266078e 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,13 @@
      * @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);
         }
     }

--
Gitblit v1.8.0