优化

‘liusuyi’

2023-06-15 4aa86f1386d20c9ad811e2d18b7e56f00b06e25c

 ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java

@@ -8,6 +8,8 @@
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -46,6 +48,8 @@
    private HikClientServiceImpl sdk;
    @Resource
    private IArdCamerasService ardCamerasService;
    @Resource
    private IArdVideoInspectTaskService ardVideoInspectTaskService;

    /**
     * 查询相机设备列表
@@ -93,16 +97,7 @@
        //注销
        sdk.loginOut(camera.getId());
        //登录
        camera = sdk.login(camera);
        if (camera.getLoginId() >= 0) {
            log.info("相机" + camera.getIp() + ":" + camera.getPort() + "登录成功：" + camera.getLoginId());
            camera.setUpdateBy(SecurityUtils.getUsername());
            ardCamerasService.updateArdCameras(camera);
        }
        else
        {
            log.info("相机" + camera.getIp() + ":" + camera.getPort() + "登录失败：" + camera.getLoginId());
        }
        sdk.login(camera);
        return toAjax(ardCamerasService.insertArdCameras(camera));
    }

@@ -115,19 +110,10 @@
    @PutMapping
    public AjaxResult edit(@RequestBody ArdCameras camera) {
        int i = ardCamerasService.updateArdCameras(camera);
        if(i>0)
        {
        if (i > 0) {
            ArdCameras cameras = ardCamerasService.selectArdCamerasById(camera.getId());
            sdk.loginOut(cameras.getId());
            camera = sdk.login(cameras);
            if (camera.getLoginId() >= 0) {
                log.info("相机" + camera.getIp() + ":" + camera.getPort() + "登录成功：" + camera.getLoginId());
                ardCamerasService.updateArdCameras(camera);
            }
            else
            {
                log.info("相机" + camera.getIp() + ":" + camera.getPort() + "登录失败：" + camera.getLoginId());
            }
            sdk.login(cameras);
        }
        return toAjax(i);
    }
@@ -141,10 +127,11 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable String[] ids) {
        for (String id : ids) {
               sdk.loginOut(id);
            }
            sdk.loginOut(id);
        }
        return toAjax(ardCamerasService.deleteArdCamerasByIds(ids));
    }

    @GetMapping("/options")
    @ApiOperation("选择相机数据")
    public List options(ArdCameras ardCameras) {
@@ -155,10 +142,17 @@
            option.put("value", item.getId());
            option.put("label", item.getName());
            option.put("channel", item.getChannel());
           // option.put("description", item.getOilProduction());
            List timeList = ardVideoInspectTaskService.getCameraIdleTimeList(item.getId());
            option.put("idleTimeList", timeList);//空闲时间段
            options.add(option);
        }
        return options;
    }

    @GetMapping("/getDeptAndCamera")
    @ApiOperation("获取部门和相机")
    public AjaxResult getDeptAndCamera()
    {
        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
        return AjaxResult.success(deptAndCamera);
    }
}