Преглед на файлове

创建报警时,默认处理状态为1

lixing преди 3 години
родител
ревизия
7427c1129f

+ 1 - 1
src/main/java/com/persagy/init/InitRunner.java

@@ -41,7 +41,7 @@ public class InitRunner implements CommandLineRunner {
 		AviatorEvaluator.getInstance().useLRUExpressionCache(10000);
 		//启动netty客户端,接受云端数据
 		groupNettyClient.start();
-		//启动websocket,接受IOT采集数据
+		//启动websocket,接受IOT采集数据
 		webSocketClientFactory.retryOutCallWebSocketClient();
 		alarmQuartzService.initAlarmMessagehandler();
 	}

+ 0 - 1
src/main/java/com/persagy/job/AlarmContinueJob.java

@@ -1,7 +1,6 @@
 package com.persagy.job;
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import com.persagy.cache.AlarmLastTimeCache;

+ 2 - 1
src/main/java/com/persagy/service/impl/AlarmHandleServiceImpl.java

@@ -211,7 +211,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                 }
                 log.info("triggerResult:[{}],endResult:[{}]", triggerResult, endResult);
                 if (triggerResult && endResult) {
-                    log.error("报警触发条件和报警恢复条件同时满足,请检查,报警定义详情【{}】", alarmDefine.toString());
+                    log.error("报警触发条件和报警恢复条件同时满足,请检查,报警定义详情【{}】", alarmDefine);
                 }
                 synchronized (defineId.intern()) {
                     //报警产生值满足(这里的满足不考虑报警持续时间)
@@ -800,6 +800,7 @@ public class AlarmHandleServiceImpl implements AlarmHandleService {
                 .objId(alarmDefine.getObjId())
                 .classCode(alarmDefine.getClassCode())
                 .createUser(systemId)
+                .treatState(1)
                 .build();
         NettyMessage<AlarmRecord> nettyMessage = new NettyMessage<>(5, alarmDefine.getProjectId());
         nettyMessage.setContent(Collections.singletonList(alarmRecord));