From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/RemoteUpdateTypeEnum.java | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/RemoteUpdateTypeEnum.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/RemoteUpdateTypeEnum.java
index a6ae43f..91d3ae5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/RemoteUpdateTypeEnum.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/RemoteUpdateTypeEnum.java
@@ -10,46 +10,36 @@
* @author ZZQ
* @date 2022/4/12 11:39
*/
-public enum RemoteUpdateTypeEnum {
+public class RemoteUpdateTypeEnum {
+ //鈥淢QTT涓绘澘鈥濄�佲�淢QTT鏍稿績鏉库�濄�佲�滃崟鐏ā鍧椻�濄�佲�淐3鍏呯數妗╂ā鍧椻�濄�佲�淐at.1涓绘澘鈥濓紝鈥滅伅鏉嗗�炬枩妯″潡鈥濆拰鈥滃ぇ姘旇澶囨ā鍧椻�濊繖7涓被鍨�
// MQTT涓绘澘
- MQTT_MAIN("0"),
+ public static String MQTT_MAIN = "MQTT涓绘澘";
// MQTT鏍稿績鏉�
- MQTT_CORE("1"),
+ public static String MQTT_CORE = "MQTT鏍稿績鏉�";
// 鍗曠伅妯″潡
- LIGHT("2"),
+ public static String LIGHT = "鍗曠伅妯″潡";
// C3鍏呯數妗╂ā鍧�
- C3_CHARGING("3");
-
- private String code;
-
- public String getCode() {
- return code;
- }
-
-
- RemoteUpdateTypeEnum(String code) {
- this.code = code;
- }
+ public static String C3_CHARGING = "C3鍏呯數妗╂ā鍧�";
+ // Cat.1涓绘澘
+ public static String CAT1_MAIN = "Cat.1涓绘澘";
+ // 鐏潌鍊炬枩妯″潡
+ public static String LIGHT_POLE_HELING = "鐏潌鍊炬枩妯″潡";
+ // 澶ф皵璁惧妯″潡
+ public static String AIR_EQUIPMENT = "澶ф皵璁惧妯″潡";
public static List<RemoteUpdateTypeDto> getAllType() {
List<RemoteUpdateTypeDto> list = new ArrayList<>();
- for (RemoteUpdateTypeEnum r : RemoteUpdateTypeEnum.values()) {
- RemoteUpdateTypeDto remoteUpdateTypeEntity = new RemoteUpdateTypeDto();
- remoteUpdateTypeEntity.setVal(r.getCode());
- remoteUpdateTypeEntity.setFileTypeName(map.get(r.getCode()));
- list.add(remoteUpdateTypeEntity);
- }
+ list.add(new RemoteUpdateTypeDto(MQTT_MAIN));
+ list.add(new RemoteUpdateTypeDto(MQTT_CORE));
+ list.add(new RemoteUpdateTypeDto(LIGHT));
+ list.add(new RemoteUpdateTypeDto(C3_CHARGING));
+ list.add(new RemoteUpdateTypeDto(CAT1_MAIN));
+ list.add(new RemoteUpdateTypeDto(LIGHT_POLE_HELING));
+ list.add(new RemoteUpdateTypeDto(AIR_EQUIPMENT));
+
return list;
}
- private static ConcurrentHashMap<String, String> map = new ConcurrentHashMap<String, String>() {
- {
- put("0", "MQTT鏍稿績鏉�");
- put("1", "Cat.1涓绘澘");
- put("2", "C3鍏呯數妗╂ā鍧�");
- put("3", "澶ф皵璁惧妯″潡");
- put("4", "鏉嗕綋鍊炬枩妯″潡");
- }
- };
+
}
--
Gitblit v1.9.3