From 7c1e2217d0e4aad7498a5c136710c33cb55d00d0 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期三, 17 七月 2024 15:11:00 +0800 Subject: [PATCH] 三一车辆模型bug修改提交 --- ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java b/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java index ccbbc0a..3d561ff 100644 --- a/ard-work/src/main/java/com/ruoyi/device/radar/controller/ArdEquipRadarController.java +++ b/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鍒楄〃 */ @@ -51,7 +56,17 @@ List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar); return getDataTable(list); } - + /** + * 鏌ヨradar鍒楄〃锛堜笉鏍¢獙鏉冮檺锛� + */ + @GetMapping("/list/noPerm") + @ApiOperation(value = "鏌ヨ闆疯揪绠$悊鍒楄〃") + public TableDataInfo listNoPerm(ArdEquipRadar ardEquipRadar) + { + startPage(); + List<ArdEquipRadar> list = ardEquipRadarService.selectArdEquipRadarList(ardEquipRadar); + return getDataTable(list); + } /** * 瀵煎嚭radar鍒楄〃 */ @@ -112,4 +127,23 @@ { 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); + } } -- Gitblit v1.9.3