From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 四月 2025 15:33:09 +0800
Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据，这样数据库保存设备报警与状态数据可能很多，为此修改逻辑，当前实现为一设备一个小时内只保存一条报警与状态数据。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
index d2b8947..3abc7b6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/upgrade/UpgradeUnit.java
@@ -39,7 +39,7 @@
}
/**
- * 鍒濆鍖栦笂琛屾暟鎹鐞嗕换鍔℃睜
+ * 鍒濆鍖�
*/
@Override
public void start(UnitCallbackInterface callback) throws Exception {
@@ -56,7 +56,7 @@
@Override
public void stop(UnitCallbackInterface callback) throws Exception {
- overUpgradeTask() ;
+ forceOverUpgradeTask() ;
}
@@ -73,12 +73,15 @@
}
/**
- * 鍋滄褰撳墠鍗囩骇浠诲姟
+ * 缁撴潫褰撳墠鍗囩骇浠诲姟
* @throws Exception
+ * @return null锛氱粨鏉熶换鍔℃垚鍔燂紝鍚﹀垯杩斿洖澶辫触鍘熷洜
*/
- public void overUpgradeTask() throws Exception {
+ public String forceOverUpgradeTask() throws Exception {
if(manager != null ){
- manager.forceOverUpgradeTask() ;
+ return manager.forceOverUpgradeTask() ;
+ }else{
+ return "閫氫俊涓棿浠跺唴閮ㄩ敊璇�" ;
}
}
@@ -88,9 +91,9 @@
* @param code
* @param callback
*/
- public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback){
+ public void trigger(String rtuAddr, String code, String protocolName, Short protocolVersion, Callback callback, Object ...objects){
if(manager != null ){
- manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback);
+ manager.trigger(rtuAddr, code, protocolName, protocolVersion, callback, objects);
}
}
--
Gitblit v1.8.0