Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-10 f4495e2587c0ba7c2085d3db0cbaca0d3fa30489

 ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java

@@ -1,6 +1,7 @@
package com.ruoyi.device.radar.controller;

import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

@@ -127,4 +128,11 @@
        return radarClient.guideInfoBack(guideInfo);
    }

    @GetMapping("/getDeptAndRadar")
    @ApiOperation("获取部门和雷达")
    public AjaxResult getDeptAndCamera() {
        Map deptAndCamera = ardEquipRadarService.getChildDeptAndRadar(true);
        return AjaxResult.success(deptAndCamera);
    }

}