From 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 21 六月 2025 11:47:09 +0800
Subject: [PATCH] 1、通信中间件重构MQTT相关下行命令的逻辑； 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类；
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
index c9d63e0..9062205 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
@@ -48,18 +48,16 @@
PrController controller = (PrController)objs[1] ;
if(cdObj instanceof DataCd81Vo){
//璁惧缁堢闅忔満鑷姤
- if(this.needSave2Db( d.getRtuAddr())) {
- //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
- DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
- this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
- this.cacheSaveTime(d.getRtuAddr());
- if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), AlarmVo.DevCloseState} ;
- toNext = true ;
- }
+ //81鍔熻兘鐮佹暟鎹紝涓嶈繘琛屸�滃湪涓�涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁鈥濈殑鎺у埗
+ DataCd81Vo cdData = (DataCd81Vo)(cdObj) ;
+ this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.rtuDt, cdData, dV202404.dt) ;
+ this.cacheSaveTime(d.getRtuAddr());
+ if(cdData.statePump != null && cdData.statePump.byteValue() == AlarmVo.DevCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), AlarmVo.DevCloseState} ;
+ toNext = true ;
}
}
}else if(cdObj instanceof DataCd80_5BVo){
@@ -78,7 +76,9 @@
}
}
}
- }else if(cdObj instanceof DataCd93_A3Vo){
+ }
+ /* 2025-06-11 鐜嬫睙娴疯锛氫互涓嬫暟鎹腑鐨勭姸鎬佷笉鍑嗙‘锛屽挨鍏堕榾闂ㄧ姸鎬侊紝鎵�浠ヤ笉鍐嶉噰绾�
+ else if(cdObj instanceof DataCd93_A3Vo){
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� + 鍒峰崱鍏虫车/闃�涓婃姤
if(this.needSave2Db( d.getRtuAddr())) {
//鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
@@ -127,6 +127,7 @@
}
}
}
+ */
}catch (Exception e){
log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
}
--
Gitblit v1.8.0