格式化代码

src/main/java/com/persagy/cache/AlarmInfoCache.java

@@ -30,6 +30,11 @@ import java.util.stream.Collectors;
 public class AlarmInfoCache {
     public static List<String> isolationSystemList = new ArrayList<>();
     /**
+     * 报警定义  <报警定义标识，报警时间状态>
+     * 报警定义标识默认为：报警编码-报警对象id
+     */
+    private final ConcurrentHashMap<String, AlarmState> alarmStateMap = new ConcurrentHashMap<>();
+    /**
      * 报警定义  <报警定义标识，报警定义详情>
      * 报警定义标识默认为：报警编码-报警对象id
      */
@@ -39,13 +44,6 @@ public class AlarmInfoCache {
      */
     private ConcurrentHashMap<String, List<AlarmDefine>> infoAlarmMap = new ConcurrentHashMap<>();
 
-
-    /**
-     * 报警定义  <报警定义标识，报警时间状态>
-     * 报警定义标识默认为：报警编码-报警对象id
-     */
-    private final ConcurrentHashMap<String, AlarmState> alarmStateMap = new ConcurrentHashMap<>();
-
     /**
      * @param alarmDefine:
      * @description:获取报警定义id, 中台报警定义ID没有实际意义，根据itemCode-objId-targetId拼接作为唯一标识

src/main/java/com/persagy/entity/NettyMessage.java

@@ -1,8 +1,8 @@
 package com.persagy.entity;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.annotation.JSONField;
 import com.persagy.constant.CommonConst;
+import com.persagy.netty.client.NettyClient;
 import com.persagy.netty.domain.protocol.Command;
 import com.persagy.netty.domain.protocol.Packet;
 import lombok.AllArgsConstructor;
@@ -56,7 +56,7 @@ public class NettyMessage<T> extends Packet implements Serializable {
 
 
     public NettyMessage(int opCode) {
-        this.channelId = CommonConst.projectId;
+        this.channelId = NettyClient.channel.id().toString();
         this.projectId = CommonConst.projectId;
         this.groupCode = CommonConst.groupCode;
         this.opCode = opCode;

src/main/java/com/persagy/job/AlarmExpireJob.java

@@ -30,6 +30,7 @@ import static org.quartz.SimpleScheduleBuilder.simpleSchedule;
 @Slf4j
 public class AlarmExpireJob extends QuartzJobBean {
 
+    private final AtomicLong nums = new AtomicLong(1L);
     @Autowired
     AlarmRecordRepository alarmRecordRepository;
     @Autowired
@@ -64,7 +65,6 @@ public class AlarmExpireJob extends QuartzJobBean {
      * 恢复时刻信息
      */
     private String endInfo;
-    private final AtomicLong nums = new AtomicLong(1L);
 
     public String getState() {
         return state;