From 6efa476dad8e425ff71c37cd57437c99928cd405 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 八月 2025 17:42:22 +0800
Subject: [PATCH] 中间件，对于水肥机数据，每条上报数据都进行最新上报数据处理，以备前端界面及时显示水肥机状态。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealManureSdV1.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealManureSdV1.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealManureSdV1.java
index 2c23cd4..6e22db7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealManureSdV1.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkDealManureSdV1.java
@@ -55,7 +55,7 @@
MqttSubMsg msg,
ManureVo stVo) throws Exception {
RmManureHistory hpo = this.saveHistory(sv, stPo, msg, stVo);
- this.saveOrUpdateLast(sv, stPo, msg, stVo, hpo);
+ this.saveOrUpdateLast(sv, stPo, msg, stVo, hpo, true);
}
/**
* 澶勭悊涓婅娑堟伅鏁版嵁
@@ -65,11 +65,12 @@
* @param stVo 涓婅鐨勮澶囨暟鎹�
* @param hpo 鍘嗗彶璁板綍鏈�鏂版暟鎹�
*/
- private void saveOrUpdateLast(DbSv sv,
+ protected void saveOrUpdateLast(DbSv sv,
PrStManure stPo,
MqttSubMsg msg,
ManureVo stVo,
- RmManureHistory hpo) throws Exception {
+ RmManureHistory hpo,
+ boolean sendDingMs) throws Exception {
RmManureLast po = sv.getRmManureLast(stPo.id) ;
if(po == null){
po = new RmManureLast();
@@ -77,7 +78,7 @@
po.manureId = stPo.id ;
po.lastHistoryId = hpo==null?null:hpo.id ;
sv.saveRmManureLast(po) ;
- if(stVo.alarm != null && stVo.alarm == 1){
+ if(stVo.alarm != null && stVo.alarm == 1 && sendDingMs){
this.sendMessage(stPo, msg, stVo);
}
}else{
@@ -85,7 +86,7 @@
po.manureId = stPo.id ;
po.lastHistoryId = hpo==null?null:hpo.id ;
sv.updateRmManureLast(po);
- if(stVo.alarm != null && stVo.alarm == 1){
+ if(stVo.alarm != null && stVo.alarm == 1 && sendDingMs){
this.sendMessage(stPo, msg, stVo);
}
}
--
Gitblit v1.8.0