fix

zhanzhiqin

2022-02-28 ae455820d8b96accda128907abe47fcd359ad4af

 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);
//    }

    /**
     * 删除摄像头