From 21de9eefe1a98ba0f154febf268d551600deff04 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 23 六月 2025 17:25:16 +0800 Subject: [PATCH] 1、配置文件增加MQTT远程命令结果回调URL; 2、MQTT远程命令bug修改; 3、增加两说明文档; 4、配置文件规范。 --- pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java index 51cb12d..b0e1d2e 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java @@ -4,11 +4,9 @@ import com.dy.common.mw.protocol.Command; import com.dy.common.mw.protocol.CommandBackParam; import com.dy.common.webUtil.BaseResponse; -import com.dy.common.webUtil.QueryResultVo; -import com.dy.pipIrrGlobal.VoAllRound.VoArIntakeRemote; +import com.dy.pipIrrGlobal.voAllRound.VoArIntakeRemote; import com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper; import com.dy.pipIrrGlobal.daoAllRound.Ar4RemoteMapper; -import com.dy.pipIrrGlobal.daoAllRound.Ar4StatisticsMapper; import com.dy.pipIrrGlobal.rtuMw.CodeLocal; import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw; import lombok.extern.slf4j.Slf4j; @@ -114,6 +112,9 @@ if(list != null && list.size() > 0){ VoArIntakeRemote vo = list.get(0) ; rVo.alarm = vo.alarm ; + if(rVo.alarm == null || rVo.alarm.trim().equals("")){ + rVo.alarm = "鏃犳姤璀�" ; + } rVo.alarmDt = vo.alarmDt ; } } -- Gitblit v1.8.0