From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 二月 2025 17:42:45 +0800
Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。

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

--
Gitblit v1.8.0