From a13dc532aa93bfa9ce5c3c01323e00869f4f0b76 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 27 二月 2024 14:01:23 +0800
Subject: [PATCH] 大华setPTZ1调用普通方法

---
 ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml |   43 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml
index b4b4f6e..0517147 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPositionMapper.xml
@@ -2,18 +2,20 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.app.mapper.ArdAppPositionMapper">
+<mapper namespace="com.ruoyi.app.position.mapper.ArdAppPositionMapper">
     <resultMap type="ArdAppPosition" id="ArdAppPositionResult">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>
         <result property="altitude" column="altitude"/>
+        <result property="speed" column="speed"/>
+        <result property="bearing" column="bearing"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
 
     <sql id="selectArdAppPositionVo">
-        select id, user_id, longitude, latitude, altitude, create_time
+        select id, user_id, longitude, latitude, altitude,speed, bearing, create_time
         from ard_app_position
     </sql>
 
@@ -27,7 +29,12 @@
         <include refid="selectArdAppPositionVo"/>
         where id = #{id}
     </select>
-
+    <select id="selectLastArdAppPositionByUserId" parameterType="String" resultMap="ArdAppPositionResult">
+        <include refid="selectArdAppPositionVo"/>
+        where user_id = #{userId}
+        order by create_time desc
+        limit 1
+    </select>
     <insert id="insertArdAppPosition" parameterType="ArdAppPosition">
         insert into ard_app_position
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -36,6 +43,8 @@
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
             <if test="altitude != null">altitude,</if>
+            <if test="speed != null">speed,</if>
+            <if test="bearing != null">bearing,</if>
             <if test="createTime != null">create_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -44,6 +53,8 @@
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="altitude != null">#{altitude},</if>
+            <if test="speed != null">#{speed},</if>
+            <if test="bearing != null">#{bearing},</if>
             <if test="createTime != null">#{createTime},</if>
         </trim>
     </insert>
@@ -55,6 +66,8 @@
             <if test="longitude != null">longitude = #{longitude},</if>
             <if test="latitude != null">latitude = #{latitude},</if>
             <if test="altitude != null">altitude = #{altitude},</if>
+            <if test="speed != null">speed = #{speed},</if>
+            <if test="bearing != null">bearing = #{bearing},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where id = #{id}
@@ -72,4 +85,28 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="getOnlineCommanderPosition" parameterType="java.lang.String" resultType="java.util.Map">
+        select su.user_name as "userName",su.nick_name as "nickName",
+        aap.user_id as "userId",aap.longitude,aap.latitude,aap.altitude,
+        aap.speed,aap.bearing,aap.create_time as "createTime"
+        from ard_app_application aaa
+        inner join sys_user su on aaa.commander_id = su.user_id
+        inner join ard_app_position aap on su.user_id = aap.user_id
+        where aaa.soilder_id = #{soilderId} and aaa.application_type = 'Commander'
+        and aaa.state = '1' and su.app_online_state = '1'
+        order by aap.create_time desc limit 1 offset 0
+    </select>
+
+    <select id="getAPPPositionByUserIdAndTime" parameterType="java.lang.String" resultMap="ArdAppPositionResult">
+        select * from ard_app_position aap
+        where aap.user_id = #{userId} and aap.create_time &gt;= #{beginTime}
+        and aap.create_time &lt;= #{endTime} order by aap.create_time asc
+    </select>
+
+    <select id="getLastAPPPositionByUserId" parameterType="java.lang.String" resultMap="ArdAppPositionResult">
+        select * from ard_app_position aap
+        where aap.user_id = #{userId}
+        order by aap.create_time desc limit 1 offset 0
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3