fix

zhanzhiqin

2022-04-22 f8d5a58c5536b72117c342e5a22bd44aa6320c23

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

@@ -47,16 +47,16 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }

        List<String> list;
        list = monitorMapper.listMonitorDeviceSerial();

        MonitorParam monitorParam1;
        for (String devices_serial : list) {
            monitorParam1 = new MonitorParam();
            monitorParam1.setAccessToken(monitorService.getAccessToken());
            monitorParam1.setDeviceSerial(devices_serial);
            getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
        }
//        List<String> list;
//        list = monitorMapper.listMonitorDeviceSerial();
//
//        MonitorParam monitorParam1;
//        for (String devices_serial : list) {
//            monitorParam1 = new MonitorParam();
//            monitorParam1.setAccessToken(monitorService.getAccessToken());
//            monitorParam1.setDeviceSerial(devices_serial);
//            getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
//        }
        //返回查询的摄像头信息列表
        List<MonitorBo> listresult;
        if (monitorParam == null) {
@@ -114,10 +114,14 @@
     */
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
        if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
            throw new BusinessException("参数不正确！");
        }
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(addMonitorDto.getCode())) {
            getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
            return ResponseUtil.success(addMonitorDto);
        } else if ("20017".equals(addMonitorDto.getCode())) {
            //已经被自己添加的摄像头需要添加到数据库
@@ -142,7 +146,7 @@
     */
    @PostMapping("/deleteYSYMonitor")
    public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(addMonitorDto.getCode())) {
            return ResponseUtil.success(addMonitorDto);
@@ -156,7 +160,7 @@
     */
    @PostMapping("/getYSYMonitorInfo")
    public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
@@ -185,23 +189,8 @@
     */
    @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
//            monitor.setDevicesCode(monitorParam.getValidateCode());
            monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
            monitor.setDeviceType(getMonitorDto.getData().getModel());
            monitor.setEquipmentState(getMonitorDto.getData().getStatus());
            monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
            monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
            monitor.setNetAddress(getMonitorDto.getData().getNetAddress());

            return monitorService.addMonitorInfoToTable(monitor);
        } else {
            throw new BusinessException(getMonitorDto.getMsg());
        }
        Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
        return monitorService.addMonitorInfoToTable(monitor);
    }

    /**
@@ -230,7 +219,7 @@
     */
    @PostMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
        String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
        String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
                monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());

        return ResponseUtil.success(URL);