灯杆绑定设备，解绑设备

zhanzhiqin

2022-03-01 da6ea6d775461e6d56eb50cbdd79e6ba3b8f41e4

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

@@ -58,59 +58,19 @@
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<MonitorBo> monitorList;
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
        if (monitorParam.getBindingState() == null) {
            //全部
            int bindingState = 2;
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
            monitorParam.setBindingState(2);
        }
        if (monitorParam.getEquipmentState() == null) {
            //全部
            monitorParam.setEquipmentState(2);
        }

        monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());

        return monitorList;
    }


//    /**
//     * 查询全部摄像头
//     */
//    public List<Monitor> listMonitor() {
//        LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
//        List<Monitor> list = list(wrapper);
//
//        return list;
//    }
//
//    /**
//     * 模糊查询
//     */
//    public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
//        //设备状态:在线/离线/全部
//        int equipmentState1;
//        int equipmentState2;
//        if (2 == monitorParam.getEquipmentState()) {
//            //在线
//            equipmentState1 = 1;
//            //离线
//            equipmentState2 = 0;
//        } else {
//            equipmentState1 = monitorParam.getEquipmentState();
//            equipmentState2 = monitorParam.getEquipmentState();
//        }
//
//        //绑定状态：已绑定/未绑定/全部
//        int bindingState1;
//        int bindingState2;
//        if (2 == monitorParam.getBindingState()) {
//            //已绑定
//            bindingState1 = 1;
//            //未绑定
//            bindingState2 = 0;
//        } else {
//            bindingState1 = monitorParam.getBindingState();
//            bindingState2 = monitorParam.getBindingState();
//        }
////        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
//        return monitorMapper.listMonitorByKeyword1(baseConditionVO, monitorParam.getKeyword(), bindingState1, bindingState2);
//    }

    /**
     * 删除摄像头
@@ -147,14 +107,15 @@
     *
     * @param accessToken  授权过程获取的access_token
     * @param deviceSerial 设备序列号,存在英文字母的设备序列号，字母需为大写
     * @param validateCode 设备验证码，设备机身上的六位大写字母
     *                     //     * @param validateCode 设备验证码，设备机身上的六位大写字母
     */
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {

        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
        paramMap.put("validateCode", validateCode);
//        paramMap.put("validateCode", validateCode);
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        System.out.println(s);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);
@@ -261,5 +222,28 @@
        }
    }

    /**
     * 修改设备绑定状态
     *
     * @param flag true为绑定  false 为解绑
     */
    public void updateBingdingState(boolean flag, String deviceCode) {
        if (flag) {//绑定
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
            if (monitor == null) {
                return;
            }
            monitor.setBindingState(1);
            updateById(monitor);
        } else {//解绑
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceCode));
            if (monitor == null) {
                return;
            }
            monitor.setBindingState(0);
            updateById(monitor);
        }
    }


}