From 2cbbd29d803c46705a06ad723d890b54355a61ef Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 10 五月 2022 10:19:20 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 53 +++++++++++++-------------
dao/src/main/java/com/sandu/ximon/dao/enums/PoleBindingEnums.java | 47 ++++++++++-------------
2 files changed, 47 insertions(+), 53 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/PoleBindingEnums.java b/dao/src/main/java/com/sandu/ximon/dao/enums/PoleBindingEnums.java
index b4a89c0..f571bfb 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/PoleBindingEnums.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/PoleBindingEnums.java
@@ -5,70 +5,63 @@
*
* @author chenjiantian
*/
-public enum PoleBindingEnums {
+public class PoleBindingEnums {
/**
* 璺伅
*/
- LIGHT(0),
+ public static final String LIGHT = "0";
/**
* VONNOX
*/
- VONNOX(1),
+ public static final String VONNOX = "1";
+
/**
* 鍏呯數妗�
*/
- CHARGING_PILE(2),
+ public static final String CHARGING_PILE = "2";
+
/**
* 澶ф皵
*/
- ATMOSPHERIC(3),
+ public static final String ATMOSPHERIC = "3";
+
/**
* 姘磋川
*/
- WATER(4),
+ public static final String WATER = "4";
+
/**
* IP闊虫煴
*/
- IPVOLUME(5),
+ public static final String IPVOLUME = "5";
+
/**
* LCD骞垮憡鏈�
*/
- LCD_ADVERTISING(6),
+ public static final String LCD_ADVERTISING = "6";
/**
* 鎽勫儚澶�
*/
- MONITOR(7),
+ public static final String MONITOR = "7";
+
/**
* 鏉嗕綋鍊句晶
*/
- LIGHTPOLEHEELING(8),
+ public static final String LIGHTPOLEHEELING = "8";
+
/**
* 涓�閿晳鎻�
*/
- FOR_HELP(9),
+ public static final String FOR_HELP = "9";
/**
* 鐔欐睕
*/
- XIXUN(10),
+ public static final String XIXUN = "10";
/**
* 鍐滆��
*/
- ATMOSPHERIC_NONG_GENG(11),
- ;
-
- private final Integer code;
-
- PoleBindingEnums(Integer code) {
- this.code = code;
- }
-
-
- public Integer getCode() {
- return code;
- }
-
-
+ public static final String ATMOSPHERIC_NONG_GENG = "11";
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 43fd2ce..a7665aa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -21,6 +21,7 @@
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.MenuEnum;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -141,8 +142,8 @@
boolean result = poleService.bindPole(poleId, param);
if (result) {
//璁惧绫诲瀷锛�0璺伅锛�1nove锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�, 10鐔欒, 11鍐滆��
- switch (param.getDeviceType()) {
- case 0:
+ switch (param.getDeviceType().toString()) {
+ case PoleBindingEnums.LIGHT:
Pole pole = poleService.getById(poleId);
if (pole != null) {
pole.setPoleName(param.getDeviceName());
@@ -150,29 +151,29 @@
poleService.updateById(pole);
}
break;
- case 1:
+ case PoleBindingEnums.VONNOX:
break;
- case 2:
+ case PoleBindingEnums.CHARGING_PILE:
break;
- case 3:
+ case PoleBindingEnums.ATMOSPHERIC:
break;
- case 4:
+ case PoleBindingEnums.WATER:
break;
- case 5:
+ case PoleBindingEnums.IPVOLUME:
broadcastTerminalV2Service.updateBingdingState(true, Integer.valueOf(param.getDeviceCode()).intValue());
break;
- case 6:
+ case PoleBindingEnums.LCD_ADVERTISING:
break;
- case 7:
+ case PoleBindingEnums.MONITOR:
monitorService.updateBingdingState(true, param.getDeviceCode());
break;
- case 8:
+ case PoleBindingEnums.LIGHTPOLEHEELING:
break;
- case 9:
+ case PoleBindingEnums.FOR_HELP:
break;
- case 10:
+ case PoleBindingEnums.XIXUN:
break;
- case 11:
+ case PoleBindingEnums.ATMOSPHERIC_NONG_GENG:
break;
default:
break;
@@ -195,37 +196,37 @@
boolean result = poleService.unBindPole(poleId, param.getDeviceCode());
if (result) {
//璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�, 10鐔欒, 11鍐滆��
- switch (param.getDeviceType()) {
- case 0:
+ switch (param.getDeviceType().toString()) {
+ case PoleBindingEnums.LIGHT:
//鍒犻櫎鐏潌鐨刣evicescode
Pole pole = poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, poleId));
if (pole != null) {
poleService.updateDeviceCode(pole.getId());
}
break;
- case 1:
+ case PoleBindingEnums.VONNOX:
break;
- case 2:
+ case PoleBindingEnums.CHARGING_PILE:
break;
- case 3:
+ case PoleBindingEnums.ATMOSPHERIC:
break;
- case 4:
+ case PoleBindingEnums.WATER:
break;
- case 5:
+ case PoleBindingEnums.IPVOLUME:
broadcastTerminalV2Service.updateBingdingState(false, Integer.valueOf(param.getDeviceCode()).intValue());
break;
- case 6:
+ case PoleBindingEnums.LCD_ADVERTISING:
break;
- case 7:
+ case PoleBindingEnums.MONITOR:
monitorService.updateBingdingState(false, param.getDeviceCode());
break;
- case 8:
+ case PoleBindingEnums.LIGHTPOLEHEELING:
break;
- case 9:
+ case PoleBindingEnums.FOR_HELP:
break;
- case 10:
+ case PoleBindingEnums.XIXUN:
break;
- case 11:
+ case PoleBindingEnums.ATMOSPHERIC_NONG_GENG:
break;
default:
break;
--
Gitblit v1.9.3