Merge remote-tracking branch 'origin/master'

aijinhui

2023-11-10 f4495e2587c0ba7c2085d3db0cbaca0d3fa30489

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

@@ -1,9 +1,13 @@
package com.ruoyi.device.radar.controller;

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

import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.radar.domain.GuideInfo;
import com.ruoyi.utils.forest.RadarClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -36,9 +40,10 @@
@Api(tags = "雷达管理接口")
public class ArdEquipRadarController extends BaseController
{
    @Autowired
    @Resource
    private IArdEquipRadarService ardEquipRadarService;

    @Resource
    private RadarClient radarClient;
    /**
     * 查询radar列表
     */
@@ -112,4 +117,22 @@
    {
        return toAjax(ardEquipRadarService.deleteArdEquipRadarByIds(ids));
    }

    /**
     * 角度引导信息反馈
     */
    @ApiOperation(value = "角度引导信息反馈")
    @PostMapping("/guideInfoBack")
    public AjaxResult guideInfoBack(@RequestBody GuideInfo guideInfo)
    {
        return radarClient.guideInfoBack(guideInfo);
    }

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

}