From 4dd54a206d8c08823d640dfbc26dcd3e56b3898b Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 03 八月 2024 11:35:53 +0800
Subject: [PATCH] 1、完善代码； 2、增加查询系统CPU、内存、JVM、系统、磁盘等信息的工具类。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 a29a46a..ccb127c 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
@@ -1,8 +1,12 @@
package com.dy.rtuMw.server.rtuData.p206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
+import com.dy.common.springUtil.SpringContextUtil;
import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.config.DingTalk;
import com.dy.pipIrrGlobal.pojoRm.RmAlarmStateHistory;
+import com.dy.rtuMw.server.ServerProperties;
+import com.dy.rtuMw.server.forMs.SendMsCache;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
@@ -92,8 +96,27 @@
po.intakeId = controller==null?null:controller.getIntakeId() ;
po.rtuAddr = rtuAddr ;
po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
+ if(alarmVo.hasAlarm()){
+ po.sendMsTime = System.currentTimeMillis() ;
+ this.sendMessage(controller, alarmVo);
+ }
sv.saveRmAlarmStateLast(po) ;
}else{
+ if(po.sendMsTime == null){
+ if(alarmVo.hasAlarm()) {
+ po.sendMsTime = System.currentTimeMillis();
+ this.sendMessage(controller, alarmVo);
+ }
+ }else{
+ if(alarmVo.hasAlarm()){
+ 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) ;
sv.updateRmAlarmStateLast(po);
}
@@ -129,7 +152,7 @@
/**
- * 铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ * 铏氭嫙鍗″湪鍙栨按鍙ｄ笂鐨勫崰鐢ㄧ姸鎬佹敼涓洪潪搴旂敤鐘舵��
*/
private void updateVirCardNoUseState(DbSv sv,
PrController controller,
@@ -146,4 +169,18 @@
}
+ /**
+ * 鍚戦拤閽夊彂閫佹秷鎭�
+ * @param controller
+ * @param alarmVo
+ */
+ private void sendMessage(PrController controller, DataAlarmVo alarmVo){
+ String ms = "鍙栨按鍙ｂ��" + controller.getIntakeName() + "鈥濅骇鐢熸姤璀︼細" + alarmVo.alarmContent() ;
+ try{
+ SendMsCache.cacheMs(ms);
+ }catch (Exception e){
+ log.error("缂撳瓨閽夐拤娑堟伅寮傚父锛�", e);
+ }
+ }
+
}
--
Gitblit v1.8.0