From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 19 八月 2025 17:24:35 +0800 Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/rtuState/RtuStatus.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/rtuState/RtuStatus.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/rtuState/RtuStatus.java index b45d66e..ad31ca6 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/rtuState/RtuStatus.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/rtuState/RtuStatus.java @@ -1,5 +1,6 @@ package com.dy.common.mw.protocol.rtuState; +import com.alibaba.fastjson2.annotation.JSONField; import com.dy.common.util.DateTime; import lombok.Data; @@ -21,20 +22,25 @@ public Boolean valveOpenTrueCloseFalse ;//闃�闂ㄧ姸鎬侊紙true涓哄紑鍚姸鎬侊紝false涓哄叧闂�侊級 public String valveOpenLastDt ;//鏈�鍚庤缃榾闂ㄥ紑鍚姸鎬佹椂鍒� public String valveCloseLastDt ;//鏈�鍚庤缃榾闂ㄥ叧闂姸鎬佹椂鍒� + @JSONField(serialize = false) public Long valveStatusLastTimeStamp ;//鏈�鍚庤缃榾闂ㄧ姸鎬佹椂鍒� + @JSONField(serialize = false) public String lastUpCode ;//鏈�杩戜竴娆′笂琛屾暟鎹殑鍔熻兘鐮� public String lastUpCodeName ;//鏈�杩戜竴娆′笂琛屾暟鎹殑鍔熻兘鐮佸悕绉� public String lastUpDt ;//鏈�杩戜竴娆′笂琛屾暟鎹殑鏃跺埢 + @JSONField(serialize = false) public String lastDownCode ;//鏈�杩戜竴娆′笅琛屾暟鎹殑鍔熻兘鐮� public String lastDownCodeName ;//鏈�杩戜竴娆′笅琛屾暟鎹殑鍔熻兘鐮佸悕绉� public String lastDownDt ;//鏈�杩戜竴娆′笅琛屾暟鎹殑鏃跺埢 + @JSONField(serialize = false) public String lastSuccessCommandCode ;//鏈�杩戜竴娆℃垚鍔熷懡浠ょ殑鍔熻兘鐮� public String lastSuccessCommandCodeName ;//鏈�杩戜竴娆℃垚鍔熷懡浠ょ殑鍔熻兘鐮佸悕绉� public String lastSuccessCommandDt ;//鏈�杩戜竴娆℃垚鍔熷懡浠ょ殑鏃跺埢 + @JSONField(serialize = false) public String lastFailureCommandCode ;//鏈�杩戜竴娆″け璐ュ懡浠ょ殑鍔熻兘鐮� public String lastFailureCommandCodeName ;//鏈�杩戜竴娆″け璐ュ懡浠ょ殑鍔熻兘鐮佸悕绉� public String lastFailureCommandDt ;//鏈�杩戜竴娆″け璐ュ懡浠ょ殑鏃跺埢 -- Gitblit v1.8.0