From baff68fa55ed3212f618330e18cc5735b1caf57f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 10:06:37 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 b782f60..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
@@ -109,19 +109,19 @@
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){
- if(alarmVo.hasAlarm()) {
+ if(alarmVo.hasAlarmExcludeLoss()) {
po.sendMsTime = System.currentTimeMillis();
this.sendMessage(controller, alarmVo);
}
}else{
- if(alarmVo.hasAlarm()){
+ if(alarmVo.hasAlarmExcludeLoss()){
Long now = System.currentTimeMillis() ;
if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
//澶т簬瑙勫畾鐨勯棿闅旀椂闂�
@@ -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