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 | 16 ++++++++++------
1 files changed, 10 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 7907744..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"/>
@@ -49,6 +49,7 @@
c.altitude,
c.user_id,
c.dept_id,
+ c.login_id,
c.cam_heading,
c.cam_pitch,
c.cam_roll,
@@ -77,7 +78,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>
@@ -92,6 +93,9 @@
<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>
@@ -107,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>
@@ -144,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>
@@ -175,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>
@@ -209,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>
--
Gitblit v1.9.3