From 49ca0cffd43f1ceb119d84232ecc92186d5abb63 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 03 Jun 2024 16:28:26 +0800
Subject: [PATCH] 修复雷达强制引导只获取大光电
---
ard-work/src/main/resources/templates/test.html | 6 +++++-
bin/clean.bat | 2 +-
bin/run.bat | 2 +-
ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
index 48fb8f9..f7e7cb2 100644
--- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml
@@ -207,7 +207,7 @@
select ac.* from ard_equip_radar aer
INNER JOIN ard_towers at on aer.tower_id= at.id
INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id
- where aer.id=#{radarId} limit 1
+ where aer.id=#{radarId} and gdtype='1' limit 1
</select>
<select id="selectArdRadarsByDeptId" parameterType="Long" resultMap="ArdEquipRadarResult">
select * from ard_equip_radar where dept_id = #{deptId}
diff --git a/ard-work/src/main/resources/templates/test.html b/ard-work/src/main/resources/templates/test.html
index 6c967e0..5623b4b 100644
--- a/ard-work/src/main/resources/templates/test.html
+++ b/ard-work/src/main/resources/templates/test.html
@@ -127,6 +127,7 @@
<div class="row">
<div class="row top-buffer">
<button id="preview" type="button" class="btn btn-primary">预览</button>
+ <button id="previewStop" type="button" class="btn btn-primary">停止</button>
</div>
<div class="row top-buffer">
<video id="video" muted autoplay loop controls
@@ -263,7 +264,10 @@
}
})
});
-
+ //停止
+ $('#previewStop').click(() => {
+ webrtcClient.stop();
+ });
//云台上下左右
$("#up").mousedown(function () {
var url = "../cameraSdk/PTZControlWithSpeed";
diff --git a/bin/clean.bat b/bin/clean.bat
index f2854e9..578e77d 100644
--- a/bin/clean.bat
+++ b/bin/clean.bat
@@ -1,6 +1,6 @@
@echo off
echo.
-echo [��Ϣ] ������target����·����
+echo [信息] 清理工程target生成路径。
echo.
%~d0
diff --git a/bin/run.bat b/bin/run.bat
index d4dc587..3409717 100644
--- a/bin/run.bat
+++ b/bin/run.bat
@@ -1,6 +1,6 @@
@echo off
echo.
-echo [��Ϣ] ʹ��Jar��������Web���̡�
+echo [信息] 使用Jar命令运行Web工程。
echo.
cd %~dp0
--
Gitblit v1.9.3