From 83ef78640c563640ad97220d88e9aa00dd520eb0 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 20 一月 2024 13:47:44 +0800
Subject: [PATCH] 查询本部门在线PC端及指挥端提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index e41ea2c..11e6b31 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -24,6 +24,8 @@
<result property="updateTime" column="update_time"/>
<result property="cameraPriority" column="camera_priority"/>
<result property="rongCloudToken" column="rong_cloud_token"/>
+ <result property="appUserType" column="app_user_type"/>
+ <result property="appOnlineState" column="app_online_state"/>
<result property="remark" column="remark"/>
<association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
<collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
@@ -66,6 +68,8 @@
u.create_time,
u.camera_priority,
u.rong_cloud_token,
+ u.app_user_type,
+ u.app_online_state,
u.remark,
d.dept_id,
d.parent_id,
@@ -87,9 +91,6 @@
</sql>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
--- select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
--- u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.camera_priority,u.rong_cloud_token, d.dept_name, d.leader from sys_user u
--- left join sys_dept d on u.dept_id = d.dept_id
<include refid="selectUserVo"/>
where u.del_flag = '0'
<if test="userId != null and userId != ''">
@@ -110,14 +111,20 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
AND u.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD')
</if>
- <if test="deptId != null and deptId != 0">
- AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as
- varchar) = any(string_to_array(ancestors,',')) ))
+ <if test="appUserType!=null and appUserType!=''"> AND u.app_user_type = #{appUserType}</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}
</select>
-
+ <select id="selectAllAppUserList" parameterType="SysUser" resultMap="SysUserResult">
+ <include refid="selectUserVo"/>
+ where u.del_flag = '0' and u.app_user_type in('0','1')
+ <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>
+ </select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
from sys_user u
@@ -200,6 +207,7 @@
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="cameraPriority != null">camera_priority,</if>
+ <if test="appUserType != null and appUserType != ''">app_user_type,</if>
create_time
)values(
<if test="userId != null and userId != ''">#{userId},</if>
@@ -215,6 +223,7 @@
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="cameraPriority != null">#{cameraPriority},</if>
+ <if test="appUserType != null">#{appUserType},</if>
now()
)
</insert>
@@ -237,6 +246,8 @@
<if test="remark != null">remark = #{remark},</if>
<if test="cameraPriority != null">camera_priority = #{cameraPriority},</if>
<if test="rongCloudToken != null">rong_cloud_token = #{rongCloudToken},</if>
+ <if test="appUserType != null">app_user_type = #{appUserType},</if>
+ <if test="appOnlineState != null">app_online_state = #{appOnlineState},</if>
update_time = now()
</set>
where user_id = #{userId}
@@ -273,4 +284,37 @@
</foreach>
</delete>
+ <select id="getSysUserByCarId" parameterType="java.lang.String" resultMap="SysUserResult">
+ select * from sys_user su where su.dept_id in (
+ select cast(unnest(array_append(string_to_array(sd.ancestors,','),
+ cast(sd.dept_id as text))) as int) from ard_sy_car asy
+ inner join sys_dept sd on asy.dept_id = sd.dept_id
+ where asy.car_id = #{carId})
+ </select>
+
+ <select id="userByPlanId" parameterType="String" resultMap="SysUserResult">
+ select user_id,nick_name from sys_user where user_id in (select app_user_id from ard_app_patroluser where patrolplan_id = #{id})
+ </select>
+
+ <select id="getOnlineCommander" parameterType="String" resultMap="SysUserResult">
+ select distinct su0.* from sys_user su
+ inner join sys_user su0 on su.dept_id = su0.dept_id
+ inner join sys_user_role aur on su0.user_id = aur.user_id
+ inner join sys_role sr on aur.role_id = sr.role_id
+ where su.user_id = #{usersId} and su0.user_id != #{usersId}
+ and sr.role_key = 'appLeader' and su0.app_online_state = '1'
+ </select>
+
+ <select id="getOnlinePC" resultMap="SysUserResult">
+ select distinct su0.* from sys_user su
+ inner join sys_user su0 on su.dept_id = su0.dept_id
+ inner join sys_user_role aur on su0.user_id = aur.user_id
+ inner join sys_role sr on aur.role_id = sr.role_id
+ where su.user_id = #{usersId} and su0.user_id != #{usersId}
+ and sr.role_key != 'appLeader' and sr.role_key != 'appUser'
+ and su0.user_id in
+ <foreach collection="onLinePCIdList" item="userId" open="(" close=")" separator=",">
+ #{userId}
+ </foreach>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3