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/alarmpoints/tube/controller/ArdTubesDetailsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
index c44e3b9..d979117 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
@@ -45,11 +45,11 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:tubesDetails:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ绠＄嚎璇︽儏鍒楄〃")
- public TableDataInfo list(ArdTubesDetails ardTubesDetails)
+ public AjaxResult list(ArdTubesDetails ardTubesDetails)
{
- startPage();
+ //startPage();
List<ArdTubesDetails> list = ardTubesDetailsService.selectArdTubesDetailsList(ardTubesDetails);
- return getDataTable(list);
+ return AjaxResult.success(list);
}
/**
@@ -120,6 +120,7 @@
String message = ardTubesDetailsService.importArdTubesDetails(tubesDetailsList, updateSupport, operName,tubeId);
return success(message);
}
+
@PostMapping("/importTemplate")
@ApiOperation(value = "绠＄嚎璇︽儏妯℃澘涓嬭浇鎺ュ彛")
public void importTemplate(HttpServletResponse response)
--
Gitblit v1.9.3