fix

zhanzhiqin

2022-05-10 2cbbd29d803c46705a06ad723d890b54355a61ef

fix

 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";
}

 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:
                    //删除灯杆的devicescode
                    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;