1. 增加NB通道支持

2. 控制器通信协议更新2.0版本
3. 增加省ID，北斗通播ID配置文件

src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java

@@ -1,7 +1,6 @@
 package com.zjyr.beidouservice.common.impl;
 
 import com.zjyr.beidouservice.common.EnumerationBase;
-import com.zjyr.beidouservice.constenum.AlarmTypeEnum;
 
 public enum AlarmTypeName implements EnumerationBase {
 
@@ -17,13 +16,23 @@ public enum AlarmTypeName implements EnumerationBase {
     ALARM_TYPE_VOICE_PLAY(7, "语音播报");
 
     private final Integer code;
-    private final String desc;
+    private final String  desc;
 
     AlarmTypeName(int val, String desc) {
         this.code = val;
         this.desc = desc;
     }
 
+    public static String getByCode(Integer code) {
+        AlarmTypeName[] values = AlarmTypeName.values();
+        for (AlarmTypeName v : values) {
+            if (code.equals(v.getValue())) {
+                return v.getDescription();
+            }
+        }
+        return null;
+    }
+
     @Override
     public Integer getValue() {
         return this.code;
@@ -33,15 +42,4 @@ public enum AlarmTypeName implements EnumerationBase {
     public String getDescription() {
         return this.desc;
     }
-
-
-    public static String getByCode(Integer code) {
-        AlarmTypeName[] values = AlarmTypeName.values();
-        for (AlarmTypeName v : values) {
-            if (code.equals(v.getValue())) {
-                return v.getDescription();
-            }
-        }
-        return null;
-    }
 }

src/main/java/com/zjyr/beidouservice/service/DeviceService.java

@@ -25,11 +25,6 @@ public interface DeviceService {
      */
     DeviceByIdRespDTO getDeviceByDeviceId(DeviceSearchDTO deviceSearchDTO);
 
-    /**
-     * 根据设备任务更新设备告警状态
-     *
-     * @param deviceTaskDOS
-     */
     void refreshDeviceAlarmStatus(List<AlarmDeviceTaskDO> deviceTaskDOS);
 
     Integer getDeviceBeidouIdBySeqId(Integer seqId);