灯杆解绑fix

zhanzhiqin

2022-09-09 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63

灯杆解绑fix

 dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java

@@ -139,6 +139,7 @@
    UNBIND("解绑设备"),
    GET_STATE_BY_DEVICECODE("批量获取设备状态"),
    CLIENT_BINDING_POLE("灯杆绑定客户"),
    CLIENT_UNBINDING_POLE("灯杆解绑客户"),
    GET_CLIENT_POLE("查看客户的灯杆"),
    GET_POLE_BINDING("查看灯杆绑定的设备"),
    PUSH_AIR_DATA_TO_NOVA("推送大气数据到诺瓦"),

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java

@@ -351,6 +351,14 @@
        return ResponseUtil.success(poleService.ClientBindingPole(param.getClientId(), param.getPoleIds()));
    }

    @PostMapping("/ClientUnBindingPole")
    public ResponseVO<Object> ClientUnBindingPole(@RequestBody PoleBindParam param) {
        if (!permissionConfig.check(MenuEnum.CLIENT_UNBINDING_POLE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(poleService.ClientUnBindingPole(param.getClientId(), param.getPoleIds()));
    }


    /**
     * 查找拥有的灯杆

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -731,6 +731,32 @@
        return r;
    }

    /**
     * 用户解绑灯杆
     *
     * @param clientId
     * @param poleIds
     * @return
     */
    public boolean ClientUnBindingPole(long clientId, int[] poleIds) {
        boolean r = false;
        for (int poleId : poleIds) {
            Pole pole = getById(poleId);
            if (pole == null) {
                throw new BusinessException("灯杆不存在");
            }
            pole.setUserId(-1L);
            pole.setClientId(-1L);
            r = updateById(pole);

            if (!r) {
                throw new BusinessException("灯杆ID为" + poleId + "设置失败,自动停止");
            }

        }
        return r;
    }


    public List<Pole> getOwnerPole(BaseConditionVO baseConditionVO, String keyword, Long cilentId) {
        LambdaQueryWrapper<Pole> eq;