From 97f4a9b9621eca21da79df727121f5fac12cc42a Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期一, 22 一月 2024 10:01:41 +0800 Subject: [PATCH] app单兵端发起查看指挥端位置及车辆位置提交 --- ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java index 2b5a858..4bd854e 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java +++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java @@ -29,6 +29,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.codec.digest.DigestUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,7 +44,7 @@ /** * 涓変竴杞﹁締Controller - * + * * @author ard * @date 2023-06-26 */ @@ -75,6 +76,9 @@ private ArdSyCarController ardSyCarController; + @Value("${syCar.enabled}") + private Boolean syCarEnabled; + @PostConstruct public void init(){ ardSyCarController = this; @@ -84,7 +88,8 @@ config.setConfigKey("syCarPT"); List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config); String syURL = ""; - if(sysConfigResult.size() == 0){ + //if(sysConfigResult.size() == 0){ + if(!syCarEnabled){//涓変竴杞﹁締鍔犲叆寮�鍏� return; }else{ syURL = sysConfigResult.get(0).getConfigValue(); @@ -455,7 +460,7 @@ @GetMapping("getThreeOne") @ApiOperation("鑾峰彇涓変竴瑙嗛鍦板潃") public AjaxResult getThreeOne() { - return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.selectConfigByKey("threeOneVideo")); + return AjaxResult.success("鑾峰彇鍦板潃鎴愬姛锛�",sysConfigService.getSYVideo()); } @PreAuthorize("@ss.hasPermi('sy:syCar:getAlarmHPfmCountDetail')") -- Gitblit v1.9.3