From e51bb1b4311312cc18227db9c1a86eb6af444d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=98=95?= Date: Mon, 28 Aug 2023 10:37:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E8=AD=A6=E6=8A=A5?= =?UTF-8?q?=E5=8F=91=E6=94=BE=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beidouservice/common/impl/AlarmControlTypeName.java | 8 ++++---- .../com/zjyr/beidouservice/common/impl/AlarmTypeName.java | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmControlTypeName.java b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmControlTypeName.java index 067d77f..da18de5 100644 --- a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmControlTypeName.java +++ b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmControlTypeName.java @@ -3,17 +3,17 @@ package com.zjyr.beidouservice.common.impl; import com.zjyr.beidouservice.common.EnumerationBase; public enum AlarmControlTypeName implements EnumerationBase { - ALARM_CONTROL_TYPE_STOP(0, "ALARM_CONTROL_TYPE_STOP"), + ALARM_CONTROL_TYPE_NORMAL_LOUD(0, "ALARM_CONTROL_TYPE_NORMAL_LOUD"), ALARM_CONTROL_TYPE_TEST_QUITE(1, "ALARM_CONTROL_TYPE_TEST_QUITE"), ALARM_CONTROL_TYPE_TEST_SHORT(2, "ALARM_CONTROL_TYPE_TEST_SHORT"), - ALARM_CONTROL_TYPE_NORMAL(2, "ALARM_CONTROL_TYPE_NORMAL"), + ALARM_CONTROL_TYPE_TEST_LOUD(3, "ALARM_CONTROL_TYPE_TEST_LOUD"), - ALARM_CONTROL_TYPE_VOICE(2, "ALARM_CONTROL_TYPE_VOICE"), + ALARM_CONTROL_TYPE_VOICE(4, "ALARM_CONTROL_TYPE_VOICE"), ; private final Integer code; - private final String desc; + private final String desc; AlarmControlTypeName(int val, String desc) { this.code = val; 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 a58c206..1cd0e6d 100644 --- a/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java +++ b/src/main/java/com/zjyr/beidouservice/common/impl/AlarmTypeName.java @@ -6,9 +6,11 @@ public enum AlarmTypeName implements EnumerationBase { ALARM_TYPE_PREPARE(1, "ALARM_TYPE_PREPARE"), ALARM_TYPE_AIRATTACK(2, "ALARM_TYPE_AIRATTACK"), - ALARM_TYPE_RELIEVE_AIRATTACK(3, "ALARM_TYPE_RELIEVE_AIRATTACK"), - ALARM_TYPE_RELIEVE_DISASTER(4, "ALARM_TYPE_RELIEVE_DISASTER"), - ALARM_TYPE_DISASTER(5, "ALARM_TYPE_DISASTER"), + ALARM_TYPE_DISASTER(3, "ALARM_TYPE_DISASTER"), + + ALARM_TYPE_RELIEVE_AIRATTACK(4, "ALARM_TYPE_RELIEVE_AIRATTACK"), + ALARM_TYPE_RELIEVE_DISASTER(5, "ALARM_TYPE_RELIEVE_DISASTER"), + ALARM_TYPE_INTERRUPT(6, "ALARM_TYPE_INTERRUPT"); private final Integer code; private final String desc;