From c44b691d8ed2898c1b2680fc4b8644157da287b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=95?= <huangxin@cmhi.chinamobile.com>
Date: Thu, 9 Nov 2023 17:43:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0NB=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=202.=20=E6=8E=A7=E5=88=B6=E5=99=A8=E9=80=9A?=
 =?UTF-8?q?=E4=BF=A1=E5=8D=8F=E8=AE=AE=E6=9B=B4=E6=96=B02.0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=203.=20=E5=A2=9E=E5=8A=A0=E7=9C=81ID=EF=BC=8C?=
 =?UTF-8?q?=E5=8C=97=E6=96=97=E9=80=9A=E6=92=ADID=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/impl/AlarmTypeName.java            | 24 +++++++++----------
 .../beidouservice/service/DeviceService.java  |  5 ----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java
index ec1e8be..6963ba6 100644
--- a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java
+++ b/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;
-    }
 }
diff --git a/src/main/java/com/zjyr/beidouservice/service/DeviceService.java b/src/main/java/com/zjyr/beidouservice/service/DeviceService.java
index 2dd8e6f..bc77dd5 100644
--- a/src/main/java/com/zjyr/beidouservice/service/DeviceService.java
+++ b/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);