From 1d6d1ac56a02a884af47d584ed5f9ceffd9936ba Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 25 七月 2023 13:25:07 +0800
Subject: [PATCH] 获取所有app用户pc接口增加最后位置信息 app任务详情增加完成状态和打卡图片 修复app用户任务列表分页total不正确的问题
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
index 2b3c5fe..7907744 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -30,6 +30,8 @@
<result property="loginId" column="login_id"/>
<result property="operatorId" column="operator_id"/>
<result property="operatorExpired" column="operator_expired"/>
+ <result property="camMaxVisibleDistance" column="cam_max_visible_distance"/>
+ <result property="camAlarmGuideEnable" column="cam_alarm_guide_enable"/>
</resultMap>
<sql id="selectArdCamerasVo">
@@ -56,7 +58,9 @@
c.cam_depth,
c.cam_fov,
c.operator_id,
- c.operator_expired
+ c.operator_expired,
+ c.cam_max_visible_distance,
+ c.cam_alarm_guide_enable
from ard_cameras c
left join sys_dept d on d.dept_id = c.dept_id
left join sys_user u on u.user_id = c.user_id
@@ -77,10 +81,6 @@
<if test="longitude != null ">and c.longitude = #{longitude}</if>
<if test="latitude != null ">and c.latitude = #{latitude}</if>
<if test="altitude != null ">and c.altitude = #{altitude}</if>
- <if test="userId != null and userId != ''">and c.user_id = #{userId}</if>
- <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
- WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
- </if>
<if test="camHeading != null ">and c.cam_heading = #{camHeading}</if>
<if test="camPitch != null ">and c.cam_pitch = #{camPitch}</if>
<if test="camRoll != null ">and c.cam_roll = #{camRoll}</if>
@@ -89,6 +89,8 @@
<if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
<if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
<if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="camMaxVisibleDistance != null ">and c.cam_max_visible_distance = #{camMaxVisibleDistance}</if>
+ <if test="camAlarmGuideEnable != null ">and c.cam_alarm_guide_enable = #{camAlarmGuideEnable}</if>
<if test="loginId != null ">and c.login_id = #{loginId}</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
@@ -121,6 +123,8 @@
<if test="camAspectratio != null ">and c.cam_aspectratio = #{camAspectratio}</if>
<if test="camDepth != null ">and c.cam_depth = #{camDepth}</if>
<if test="camFov != null ">and c.cam_fov = #{camFov}</if>
+ <if test="camMaxVisibleDistance != null ">and c.cam_max_visible_distance = #{camMaxVisibleDistance}</if>
+ <if test="camAlarmGuideEnable != null ">and c.cam_alarm_guide_enable = #{camAlarmGuideEnable}</if>
<if test="loginId != null ">and c.login_id = #{loginId}</if>
</where>
</select>
@@ -152,6 +156,8 @@
<if test="camAspectratio != null">cam_aspectratio,</if>
<if test="camDepth != null">cam_depth,</if>
<if test="camFov != null">cam_fov,</if>
+ <if test="camMaxVisibleDistance != null ">cam_max_visible_distance,</if>
+ <if test="camAlarmGuideEnable != null">cam_alarm_guide_enable,</if>
<if test="loginId != null">login_id,</if>
<if test="deptId != null">dept_id,</if>
<if test="userId != null">user_id,</if>
@@ -181,6 +187,8 @@
<if test="camAspectratio != null">#{camAspectratio},</if>
<if test="camDepth != null">#{camDepth},</if>
<if test="camFov != null">#{camFov},</if>
+ <if test="camMaxVisibleDistance != null ">#{camMaxVisibleDistance},</if>
+ <if test="camAlarmGuideEnable != null">#{camAlarmGuideEnable},</if>
<if test="loginId != null">#{loginId},</if>
<if test="deptId != null">#{deptId},</if>
<if test="userId != null">#{userId},</if>
@@ -213,6 +221,8 @@
<if test="camAspectratio != null">cam_aspectratio = #{camAspectratio},</if>
<if test="camDepth != null">cam_depth = #{camDepth},</if>
<if test="camFov != null">cam_fov = #{camFov},</if>
+ <if test="camMaxVisibleDistance != null ">cam_max_visible_distance = #{camMaxVisibleDistance},</if>
+ <if test="camAlarmGuideEnable != null">cam_alarm_guide_enable = #{camAlarmGuideEnable},</if>
<if test="loginId != null">login_id = #{loginId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
@@ -239,7 +249,6 @@
</foreach>
</delete>
-
<select id="findOptions" parameterType="String" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
@@ -247,4 +256,9 @@
<if test="name != null and name != ''">and c.name like '%'||#{name}||'%'</if>
</where>
</select>
+ <select id="selectArdCamerasByDeptId" parameterType="Long" resultMap="ArdCamerasResult">
+ select *
+ from ard_cameras
+ where dept_id = #{deptId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3