fix

zhanzhiqin

2021-12-28 7abc2e222ce399ffc724c485142e5c42ff3da3b2

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

@@ -41,6 +41,9 @@
    //获取萤石云摄像头播放地址URL
    private static final String GET_VEDIO_URL = "/v2/live/address/get";


    private final PoleBindingService poleBindingService;

    /**
     * 查询全部摄像头
     */
@@ -80,7 +83,8 @@
            bindingState1 = monitorParam.getBindingState();
            bindingState2 = monitorParam.getBindingState();
        }
        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
//        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
        return monitorMapper.listMonitorByKeyword1(monitorParam.getKeyword(), bindingState1, bindingState2);
    }

    /**
@@ -94,6 +98,9 @@
        if (monitor == null) {
            throw new BusinessException("找不到摄像头");
        }

        //删除摄像头设备前需要先解绑
        poleBindingService.unBindPole(monitor.getDeviceSerial());
        return removeById(Id);
    }