From e8d53b7555595df35bd2fe03a5c5cf449c38859c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期四, 14 十二月 2023 13:30:49 +0800 Subject: [PATCH] 增加PTZ引导优先; 井管理增加可见光和热红外ptz设置; 雷达报警引导只需要引导雷达塔上的光电,通道根据日夜切换自动选择; 引导优先按井配置的ptz进行引导,当未配置时按经纬度进行引导; 相机优先级队列排序取消报警次数num比对,仅由优先级和接收时间作为比较器条件; --- ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java index 99ecd6d..987456f 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java +++ b/ard-work/src/main/java/com/ruoyi/sy/controller/OilWallController.java @@ -34,6 +34,9 @@ @Autowired private ArdAccessNumService ardAccessNumService; + @Autowired + private ISysConfigService sysConfigService; + @PostMapping("/add") @ApiOperation("娣诲姞鐢靛瓙鍥存爮") public AjaxResult add(@RequestBody ArdOilWall ardOilWall){ @@ -87,7 +90,8 @@ @GetMapping("/wallCar") @ApiOperation("鎵�鏈夎繘鍏ュ洿鏍忕殑杞﹁締") public AjaxResult wallCar(){ - return AjaxResult.success(ardAccessFenceService.all()); + String url = sysConfigService.selectConfigByKey("minioIn")+"/"; + return AjaxResult.success(ardAccessFenceService.all(url)); } @GetMapping("/rollTime") @@ -99,8 +103,7 @@ @PostMapping("/updTime") @ApiOperation("淇濆瓨鏃堕棿姝ラ暱") public AjaxResult updTime(@RequestBody ArdAccessNum ardAccessNum){ - return AjaxResult.success(ardAccessNumService.add(ardAccessNum)); + return AjaxResult.success(ardAccessNumService.upd(ardAccessNum)); } - } -- Gitblit v1.9.3