From 277ec59299c5909dafecbe6e5afa85dd3278ade7 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 16 十月 2024 09:13:23 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
index 03f1eeb..49a8faa 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java
@@ -50,7 +50,11 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1_0_1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
- this.updateVirCardNoUseState(sv, controller, 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} ;
+ }
+ }
}
} else if (cdObj instanceof DataCd84Vo) {
DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
@@ -60,7 +64,12 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1_0_1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
- this.updateVirCardNoUseState(sv, controller, 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} ;
+ }
+ }*/
}
} else if (cdObj instanceof DataCdC0Vo) {
DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
@@ -70,7 +79,11 @@
PrController controller = (PrController) objs[1];
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1_0_1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
- this.updateVirCardNoUseState(sv, controller, 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} ;
+ }
+ }
}
}
} catch (Exception e) {
@@ -96,21 +109,25 @@
po.intakeId = controller==null?null:controller.getIntakeId() ;
po.rtuAddr = rtuAddr ;
po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
- if(alarmVo.hasAlarm()){
+ if(alarmVo.hasAlarmExcludeLoss()){
po.sendMsTime = System.currentTimeMillis() ;
this.sendMessage(controller, alarmVo);
}
sv.saveRmAlarmStateLast(po) ;
}else{
if(po.sendMsTime == null){
- po.sendMsTime = System.currentTimeMillis() ;
- this.sendMessage(controller, alarmVo);
- }else{
- Long now = System.currentTimeMillis() ;
- if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
- //澶т簬瑙勫畾鐨勯棿闅旀椂闂�
- po.sendMsTime = System.currentTimeMillis() ;
+ if(alarmVo.hasAlarmExcludeLoss()) {
+ po.sendMsTime = System.currentTimeMillis();
this.sendMessage(controller, alarmVo);
+ }
+ }else{
+ if(alarmVo.hasAlarmExcludeLoss()){
+ Long now = System.currentTimeMillis() ;
+ if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
+ //澶т簬瑙勫畾鐨勯棿闅旀椂闂�
+ po.sendMsTime = System.currentTimeMillis() ;
+ this.sendMessage(controller, alarmVo);
+ }
}
}
po = this.update(controller, po, rtuDt, dV1_0_1, alarmVo, stateVo) ;
@@ -147,23 +164,6 @@
}
- /**
- * 铏氭嫙鍗″湪鍙栨按鍙ｄ笂鐨勫崰鐢ㄧ姸鎬佹敼涓洪潪搴旂敤鐘舵��
- */
- private void updateVirCardNoUseState(DbSv sv,
- PrController controller,
- DataStateVo stateVo){
- if(stateVo != null){
- if(stateVo.valveState != null && stateVo.valveState.byteValue() == 0){
- //闃�闂ㄥ叧闂姸鎬�
- if(controller != null && controller.getIntakeId() != null){
- //铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
- sv.updateVirCardNoUseState(controller.getIntakeId());
- }
- }
- }
-
- }
/**
* 鍚戦拤閽夊彂閫佹秷鎭�
@@ -171,7 +171,7 @@
* @param alarmVo
*/
private void sendMessage(PrController controller, DataAlarmVo alarmVo){
- String ms = "鍙栨按鍙ｂ��" + controller.getIntakeName() + "鈥濅骇鐢熸姤璀︼細" + alarmVo.alarmContent() ;
+ String ms = "鍙栨按鍙ｂ��" + controller.getIntakeName() + "鈥濅骇鐢熸姤璀︼細" + alarmVo.alarmContentExcludeLoss() ;
try{
SendMsCache.cacheMs(ms);
}catch (Exception e){
--
Gitblit v1.8.0