From da1432df263aa1aa4390f54b2635bb70e7f5207b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 11:24:16 +0800
Subject: [PATCH] 优化实体
---
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 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..4e17b31 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml
@@ -13,7 +13,7 @@
<result property="username" column="username"/>
<result property="password" column="password"/>
<result property="gdtype" column="gdtype"/>
- <result property="channel" column="channel"/>
+ <result property="chanNum" column="channel"/>
<result property="longitude" column="longitude"/>
<result property="latitude" column="latitude"/>
<result property="altitude" column="altitude"/>
@@ -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">
@@ -47,6 +49,7 @@
c.altitude,
c.user_id,
c.dept_id,
+ c.login_id,
c.cam_heading,
c.cam_pitch,
c.cam_roll,
@@ -56,7 +59,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
@@ -73,14 +78,10 @@
<if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
<if test="password != null and password != ''">and c.password = #{password}</if>
<if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
- <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="chanNum != null ">and c.channel = #{chanNum}</if>
<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,7 +90,12 @@
<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>
+ <if test="deptId != null ">and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
+ </if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
${params.dataScope}
</where>
@@ -105,7 +111,7 @@
<if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if>
<if test="password != null and password != ''">and c.password = #{password}</if>
<if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if>
- <if test="channel != null ">and c.channel = #{channel}</if>
+ <if test="chanNum != null ">and c.channel = #{chanNum}</if>
<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>
@@ -121,6 +127,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>
@@ -140,7 +148,7 @@
<if test="username != null">username,</if>
<if test="password != null">password,</if>
<if test="gdtype != null">gdtype,</if>
- <if test="channel != null">channel,</if>
+ <if test="chanNum != null">channel,</if>
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="altitude != null">altitude,</if>
@@ -152,6 +160,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>
@@ -169,7 +179,7 @@
<if test="username != null">#{username},</if>
<if test="password != null">#{password},</if>
<if test="gdtype != null">#{gdtype},</if>
- <if test="channel != null">#{channel},</if>
+ <if test="chanNum != null">#{chanNum},</if>
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="altitude != null">#{altitude},</if>
@@ -181,6 +191,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>
@@ -201,7 +213,7 @@
<if test="username != null">username = #{username},</if>
<if test="password != null">password = #{password},</if>
<if test="gdtype != null">gdtype = #{gdtype},</if>
- <if test="channel != null">channel = #{channel},</if>
+ <if test="chanNum != null">channel = #{chanNum},</if>
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="altitude != null">altitude = #{altitude},</if>
@@ -213,6 +225,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 +253,6 @@
</foreach>
</delete>
-
<select id="findOptions" parameterType="String" resultMap="ArdCamerasResult">
<include refid="selectArdCamerasVo"/>
<where>
@@ -247,4 +260,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