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/alarm/filter/controller/ArdAlarmFilterController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
index d053fc8..2208a0e 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
@@ -105,11 +105,10 @@
@ApiOperation("鎭㈠鎶ヨ杩囨护")
@PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
@Log(title = "鎭㈠鎶ヨ杩囨护", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult recovery(@RequestBody ArdAlarmFilter ardAlarmFilter)
+ @PutMapping("/recovery/{ids}")
+ public AjaxResult recovery(@PathVariable String[] ids)
{
- ardAlarmFilter.setEndTime(DateUtils.covertTime(new Date()));
- return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
+ return toAjax(ardAlarmFilterService.RecoveryArdAlarmFilter(ids));
}
/**
* 鍒犻櫎鎶ヨ杩囨护
--
Gitblit v1.9.3