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/rtuData/p206V202404/TkDealAlarmStatusV202404.java | 123 +++++++++++++------
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java | 104 +++++++++++-----
pipIrr-platform/pom.xml | 2
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java | 128 ++++++++++++++-------
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java | 2
5 files changed, 240 insertions(+), 119 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
index a419054..0498b50 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
@@ -1,6 +1,7 @@
package com.dy.rtuMw.server.rtuData.p206V1;
import com.dy.common.mw.protocol.p206V1.upVos.*;
+import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.forMs.SendMsCache;
@@ -15,6 +16,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @Author liurunyu
* @Date 2024/6/11 17:19
@@ -26,6 +30,10 @@
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealAlarmStatus" ;
+
+ //鏄惁鍦ㄦ煇涓椂鍒伙紙骞存湀鏃ユ椂锛変繚瀛樹簡鎶ヨ鐘舵�佹暟鎹�
+ private static final Map<String, Long> onceSaveAlarmData4Rtus = new HashMap<>();
+
/**
* 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -46,16 +54,20 @@
//闅忔満鑷姤鎶�
DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
+ if(this.needSave2Db( d.getRtuAddr())){
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
}
}
}
@@ -63,34 +75,42 @@
//闃�寮�宸ヤ綔鎶�
DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
- if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
- }
- }*/
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
+ if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
+ }*/
+ }
}
} else if (cdObj instanceof DataCdC0Vo) {
//鏁寸偣鎶�
DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
}
}
}
@@ -105,6 +125,24 @@
}
}
+ private boolean needSave2Db(String rtuAddr){
+ if(!onceSaveAlarmData4Rtus.containsKey(rtuAddr)){
+ return true ;
+ }else{
+ Long time = onceSaveAlarmData4Rtus.get(rtuAddr) ;
+ Long ymdh = Long.parseLong(DateTime.yyyyMMddHH()) ;
+ if(ymdh.longValue() == time.longValue()){
+ //鍚屼竴涓皬鏃跺唴
+ return false ;
+ }else{
+ return true ;
+ }
+ }
+ }
+ private void cacheSaveTime(String rtuAddr){
+ onceSaveAlarmData4Rtus.put(rtuAddr, Long.parseLong(DateTime.yyyyMMddHH()));
+ }
+
/**
* 鎶ヨ鐘舵�佹暟鎹瓨鍏ユ秷鎭腑蹇�
* @param controller 鎺у埗鍣ㄥ璞�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
index 44566dd..c5036e5 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkRtuDealCommandResponse.java
@@ -54,7 +54,7 @@
}
public RmCommandHistory updateCommandLogPo(RmCommandHistory po, String code, DataV1 dV1, Object obj) throws Exception{
- po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt)) ;
+ po.setResultTime(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dV1.dt==null?DateTime.yyyy_MM_dd_HH_mm_ss():dV1.dt));
if(obj instanceof DataCd97Vo){
DataCd97Vo vo = (DataCd97Vo)obj ;
po.setResult(vo.success?(byte)1:(byte)0);
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
index aadb5ec..24e0c4b 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
@@ -16,6 +16,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @Author liurunyu
* @Date 2024/6/11 17:19
@@ -27,6 +30,9 @@
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealAlarmStatusV2" ;
+
+ //鏄惁鍦ㄦ煇涓椂鍒伙紙骞存湀鏃ユ椂锛変繚瀛樹簡鎶ヨ鐘舵�佹暟鎹�
+ private static final Map<String, Long> onceSaveAlarmData4Rtus = new HashMap<>();
/**
* 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -47,18 +53,22 @@
//蹇冭烦鏁版嵁锛屾牴鎹换鍔kDealHearBeatV2,杩欓噷鏀跺埌鐨勫績璺虫椂锛屼竴瀹氭槸鎶ヨ鎴栫姸鎬佸彂鐢熶簡鏀瑰彉
DataCd02Vo dataCd02Vo = (DataCd02Vo)cdObj ;
if (dataCd02Vo.alarmVo != null || dataCd02Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- //蹇冭烦娌℃湁鏃堕挓锛屽苟涓擱TU閽堝蹇冭烦鏁版嵁鐨勬満鍒舵槸涓婃姤涓嶆垚鍔熶笉閲嶅彂锛屾墍浠ユ椂闂撮噰鐢ㄦ湰鍦版椂闂�
- String now = DateTime.yyyy_MM_dd_HH_mm_ss() ;
- this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
- if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
+ if(this.needSave2Db( d.getRtuAddr())){
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ //蹇冭烦娌℃湁鏃堕挓锛屽苟涓擱TU閽堝蹇冭烦鏁版嵁鐨勬満鍒舵槸涓婃姤涓嶆垚鍔熶笉閲嶅彂锛屾墍浠ユ椂闂撮噰鐢ㄦ湰鍦版椂闂�
+ String now = DateTime.yyyy_MM_dd_HH_mm_ss() ;
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), now, dV2, dataCd02Vo.alarmVo, dataCd02Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
}
}
}
@@ -66,16 +76,20 @@
//闅忔満鑷姤鎶�
DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV2, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
}
}
}
@@ -83,33 +97,41 @@
//闃�寮�宸ヤ綔鎶�
DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
- if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- }
- }*/
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV2, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
+ if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ }
+ }*/
+ }
}
} else if (cdObj instanceof DataCdC0Vo) {
//鏁寸偣鎶�
DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
- Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
- this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
- if(controller != null && controller.getIntakeId() != null){
- this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
- toNext = true ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ this.toMsCenter(controller, d.getRtuAddr(), dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV2, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
+ this.cacheSaveTime(d.getRtuAddr());
+ if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
+ if(controller != null && controller.getIntakeId() != null){
+ this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
+ }
}
}
}
@@ -124,6 +146,24 @@
}
}
+ private boolean needSave2Db(String rtuAddr){
+ if(!onceSaveAlarmData4Rtus.containsKey(rtuAddr)){
+ return true ;
+ }else{
+ Long time = onceSaveAlarmData4Rtus.get(rtuAddr) ;
+ Long ymdh = Long.parseLong(DateTime.yyyyMMddHH()) ;
+ if(ymdh.longValue() == time.longValue()){
+ //鍚屼竴涓皬鏃跺唴
+ return false ;
+ }else{
+ return true ;
+ }
+ }
+ }
+ private void cacheSaveTime(String rtuAddr){
+ onceSaveAlarmData4Rtus.put(rtuAddr, Long.parseLong(DateTime.yyyyMMddHH()));
+ }
+
/**
* 鎶ヨ鐘舵�佹暟鎹瓨鍏ユ秷鎭腑蹇�
* @param controller 鎺у埗鍣ㄥ璞�
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 f6570d2..c9d63e0 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
@@ -14,6 +14,9 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @Author liurunyu
* @Date 2024/5/8 14:18
@@ -24,6 +27,9 @@
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
public static final String taskId = "TkDealAlarmStatusV202404" ;
+
+ //鏄惁鍦ㄦ煇涓椂鍒伙紙骞存湀鏃ユ椂锛変繚瀛樹簡鎶ヨ鐘舵�佹暟鎹�
+ private static final Map<String, Long> onceSaveAlarmData4Rtus = new HashMap<>();
/**
* 鎵ц鑺傜偣浠诲姟锛氭姤璀﹀強鐘舵��
@@ -42,62 +48,82 @@
PrController controller = (PrController)objs[1] ;
if(cdObj instanceof DataCd81Vo){
//璁惧缁堢闅忔満鑷姤
- 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) ;
- 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 ;
+ 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 ;
+ }
}
}
}else if(cdObj instanceof DataCd80_5BVo){
//璁惧缁堢宸ヤ綔涓婃姤 + 鏌ヨ璁惧缁堢瀹炴椂鍊�
- DataCd80_5BVo cdData = (DataCd80_5BVo)(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) ;
- 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 ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ DataCd80_5BVo cdData = (DataCd80_5BVo)(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 DataCd93_A3Vo){
//骞冲彴/APP杩滅▼鍏抽棴姘存车/闃�闂� + 鍒峰崱鍏虫车/闃�涓婃姤
- DataCd93_A3Vo cdData = (DataCd93_A3Vo)(cdObj) ;
- this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
- 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 ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ DataCd93_A3Vo cdData = (DataCd93_A3Vo)(cdObj) ;
+ this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.endDt, cdData, dV202404.dt) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.endDt, 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 DataCd84Vo){
//璁惧缁堢鍒峰崱寮�娉�/闃�涓婃姤
- DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
- this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
- this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
- this.saveHistory(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
- 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 ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ DataCd84Vo cdData = (DataCd84Vo)(cdObj) ;
+ this.toMsCenter(controller, d.getRtuAddr(), dV202404, cdData, dV202404.dt);
+ this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), cdData.openDt, cdData, dV202404.dt) ;
+ this.saveHistory(sv, controller, d.getRtuAddr(), cdData.openDt, 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 DataCdC2Vo){
//璁惧缁堢寮�鍏虫按娉�/闃�闂ㄦ垚鍔�/澶辫触涓婃姤
- DataCdC2Vo cdData = (DataCdC2Vo)(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) ;
- 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 ;
+ if(this.needSave2Db( d.getRtuAddr())) {
+ //鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
+ DataCdC2Vo cdData = (DataCdC2Vo)(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 ;
+ }
}
}
}
@@ -109,6 +135,23 @@
}
}
+ private boolean needSave2Db(String rtuAddr){
+ if(!onceSaveAlarmData4Rtus.containsKey(rtuAddr)){
+ return true ;
+ }else{
+ Long time = onceSaveAlarmData4Rtus.get(rtuAddr) ;
+ Long ymdh = Long.parseLong(DateTime.yyyyMMddHH()) ;
+ if(ymdh.longValue() == time.longValue()){
+ //鍚屼竴涓皬鏃跺唴
+ return false ;
+ }else{
+ return true ;
+ }
+ }
+ }
+ private void cacheSaveTime(String rtuAddr){
+ onceSaveAlarmData4Rtus.put(rtuAddr, Long.parseLong(DateTime.yyyyMMddHH()));
+ }
/**
* 鎶ヨ鐘舵�佹暟鎹瓨鍏ユ秷鎭腑蹇�
* @param controller 鎺у埗鍣ㄥ璞�
diff --git a/pipIrr-platform/pom.xml b/pipIrr-platform/pom.xml
index 0f86264..b022e0a 100644
--- a/pipIrr-platform/pom.xml
+++ b/pipIrr-platform/pom.xml
@@ -22,8 +22,8 @@
<modules>
<module>pipIrr-common</module>
<module>pipIrr-global</module>
- <module>pipIrr-web</module>
<module>pipIrr-mw</module>
+ <module>pipIrr-web</module>
</modules>
<properties>
--
Gitblit v1.8.0