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/resources/mapper/app/ArdAppPatrolplanMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 89360c8..19f4175 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -158,9 +158,9 @@
</select>
<select id="planUser" parameterType="String" resultMap="ArdAppPatrolplanResult">
- select s.nick_name nickName, plan.plan_name from ard_app_patrolplan plan
+ select s.nick_name, plan.plan_name from ard_app_patrolplan plan
LEFT JOIN ard_app_patroluser users on users.patrolplan_id = plan."id"
- left join sys_user s on users.app_user_id = s.user_id
+ left join sys_user s on plan.user_id = s.user_id
where users.app_user_id = #{userId} and son is null
and plan.create_time >= #{beforeTime} and plan.create_time <= #{time}
and del_name is null and del_time is null order by plan.create_time desc;
--
Gitblit v1.9.3