From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
index f3e4261..5b15d8c 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMobilePositionMapper.java
@@ -4,24 +4,31 @@
 
 import com.genersoft.iot.vmp.gb28181.bean.MobilePosition;
 import org.apache.ibatis.annotations.*;
-//import org.springframework.stereotype.Repository;
 
 @Mapper
-//@Repository
 public interface DeviceMobilePositionMapper {
 
-    @Insert("INSERT INTO device_mobile_position (deviceId,channelId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, geodeticSystem, cnLng, cnLat) " +
-            "VALUES ('${deviceId}','${channelId}', '${deviceName}', '${time}', ${longitude}, ${latitude}, ${altitude}, ${speed}, ${direction}, '${reportSource}', '${geodeticSystem}', '${cnLng}', '${cnLat}')")
+    @Insert("INSERT INTO device_mobile_position (deviceId,channelId, deviceName, time, longitude, latitude, altitude, speed, direction, reportSource, longitudeGcj02, latitudeGcj02, longitudeWgs84, latitudeWgs84, createTime) " +
+            "VALUES ('${deviceId}','${channelId}', '${deviceName}', '${time}', ${longitude}, ${latitude}, ${altitude}, ${speed}, ${direction}, '${reportSource}', ${longitudeGcj02}, ${latitudeGcj02}, ${longitudeWgs84}, ${latitudeWgs84}, '${createTime}')")
     int insertNewPosition(MobilePosition mobilePosition);
 
+    /**
+     * 查询设备的历史轨迹
+     * @param deviceId
+     * @param channelId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
     @Select(value = {" <script>" +
     "SELECT * FROM device_mobile_position" +
-    " WHERE deviceId = #{deviceId} " +
+    " WHERE deviceId = #{deviceId}" +
+    "<if test=\"channelId != null\"> and channelId = #{channelId}</if>" +
     "<if test=\"startTime != null\"> AND time&gt;=#{startTime}</if>" +
     "<if test=\"endTime != null\"> AND time&lt;=#{endTime}</if>" +
     " ORDER BY time ASC" +
     " </script>"})
-    List<MobilePosition> queryPositionByDeviceIdAndTime(String deviceId, String startTime, String endTime);
+    List<MobilePosition> queryPositionByDeviceIdAndTime(String deviceId, String channelId, String startTime, String endTime);
 
     @Select("SELECT * FROM device_mobile_position WHERE deviceId = #{deviceId}" +
             " ORDER BY time DESC LIMIT 1")
@@ -30,4 +37,39 @@
     @Delete("DELETE FROM device_mobile_position WHERE deviceId = #{deviceId}")
     int clearMobilePositionsByDeviceId(String deviceId);
 
+    /**
+     * 查询手台的移动轨迹
+     * @param deviceId
+     * @param terminalNumber 终端编号
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Select(value = {" <script>" +
+            "SELECT id,terminal_number as channelId,latitude,longitude,receive_time as time FROM sys_talk_back_equipment_record" +
+            " WHERE 1=1" +
+            "<if test=\"terminalNumber != null and terminalNumber!=''\"> and terminal_number = #{terminalNumber}</if>" +
+            "<if test=\"startTime != null\"> AND receive_time&gt;=#{startTime}</if>" +
+            "<if test=\"endTime != null\"> AND receive_time&lt;=#{endTime}</if>" +
+            " ORDER BY receive_time ASC" +
+            " </script>"})
+    List<MobilePosition> queryTalkBackEquipmentPositionByDeviceIdAndTime(String deviceId, String terminalNumber, String startTime, String endTime);
+
+    /**
+     * 查询执法记录仪的移动轨迹
+     * @param deviceId
+     * @param channelId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @Select(value = {" <script>" +
+            "SELECT * FROM device_mobile_position_police_camera" +
+            " WHERE 1=1" +
+            "<if test=\"channelId != null\"> and channelId = #{channelId}</if>" +
+            "<if test=\"startTime != null\"> AND time&gt;=#{startTime}</if>" +
+            "<if test=\"endTime != null\"> AND time&lt;=#{endTime}</if>" +
+            " ORDER BY time ASC" +
+            " </script>"})
+    List<MobilePosition> queryPoliceCameraPositionByDeviceIdAndTime(String deviceId, String channelId, String startTime, String endTime);
 }

--
Gitblit v1.9.3