增加获取部门和相机(开启复选框)接口

‘liusuyi’

2023-07-04 d4a6cfef40c1518019b97857d7d423188eef0fab

增加获取部门和相机(开启复选框)接口

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

@@ -148,7 +148,14 @@
    @ApiOperation("获取部门和相机")
    public AjaxResult getDeptAndCamera()
    {
        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera();
        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(false);
        return AjaxResult.success(deptAndCamera);
    }
    @GetMapping("/getDeptAndCameraWithCheckBox")
    @ApiOperation("获取部门和相机(开启复选框)")
    public AjaxResult getDeptAndCameraWithCheckBox()
    {
        Map deptAndCamera = ardCamerasService.getChildDeptAndCamera(true);
        return AjaxResult.success(deptAndCamera);
    }
    @PostMapping("/getNearCamerasBycoordinate")

 ard-work/src/main/java/com/ruoyi/device/camera/service/IArdCamerasService.java

@@ -73,13 +73,13 @@
    public List findOptions(ArdCameras ardCameras);
    /**
     * @描述 获取本部门以下的所有相机和部门
     * @参数 []
     * @参数 [disabled] 复选框状态
     * @返回值 java.util.Map
     * @创建人 刘苏义
     * @创建时间 2023/6/2 10:58
     * @修改人和其它信息
     */
    public Map getChildDeptAndCamera();
    public Map getChildDeptAndCamera(Boolean disabled);


    public TreeMap getNearCamerasBycoordinate(CameraCmd cmd);

 ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java

@@ -136,10 +136,10 @@
     */

    @Override
    public Map getChildDeptAndCamera() {
    public Map getChildDeptAndCamera(Boolean disabled) {
        Long deptId = SecurityUtils.getDeptId();
        SysDept sysDept = sysDeptMapper.selectDeptById(deptId);
        Map<String, Object> map = fetchChildDepartments(sysDept);
        Map<String, Object> map = fetchChildDepartments(sysDept,disabled);
        return map;
    }

@@ -151,11 +151,11 @@
     * @创建时间 2023/6/2 14:38
     * @修改人和其它信息
     */
    public Map<String, Object> fetchChildDepartments(SysDept sysDept) {
    public Map<String, Object> fetchChildDepartments(SysDept sysDept,Boolean disabled) {
        Map<String, Object> map = new HashMap<>();
        map.put("name", sysDept.getDeptName());
        map.put("deptId", sysDept.getDeptId());
        map.put("disabled", true);
        map.put("disabled", disabled);
        List<SysDept> sysDepts = sysDeptMapper.selectNextChildrenDeptById(sysDept.getDeptId());
        List<ArdCameras> ardCameras = ardCamerasMapper.selectArdCamerasByDeptId(sysDept.getDeptId());
        List<Object> childList = new ArrayList<>();
@@ -163,8 +163,8 @@
            Map<String, Object> childMap = new HashMap<>();
            childMap.put("name", childDept.getDeptName());
            childMap.put("deptId", childDept.getDeptId());
            childMap.put("disabled", true);
            Map<String, Object> map1 = fetchChildDepartments(childDept);
            childMap.put("disabled", disabled);
            Map<String, Object> map1 = fetchChildDepartments(childDept,disabled);
            childMap.putAll(map1);
            childList.add(childMap);
        }