From ca8c7b4e9c4762acb2fc2c793d79ae58e05dcf36 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 21 二月 2024 14:01:38 +0800
Subject: [PATCH] 查看在线单兵端及车辆提交
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 79ee9f1..a014700 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,7 @@
<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"/>
@@ -49,6 +50,31 @@
<result property="status" column="role_status"/>
</resultMap>
+ <resultMap type="SysUser" id="SysUserOnlyResult">
+ <id property="userId" column="user_id"/>
+ <result property="deptId" column="dept_id"/>
+ <result property="userName" column="user_name"/>
+ <result property="nickName" column="nick_name"/>
+ <result property="email" column="email"/>
+ <result property="phonenumber" column="phonenumber"/>
+ <result property="sex" column="sex"/>
+ <result property="avatar" column="avatar"/>
+ <result property="password" column="password"/>
+ <result property="status" column="status"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="loginIp" column="login_ip"/>
+ <result property="loginDate" column="login_date"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="updateBy" column="update_by"/>
+ <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"/>
+ </resultMap>
+
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
@@ -68,6 +94,7 @@
u.camera_priority,
u.rong_cloud_token,
u.app_user_type,
+ u.app_online_state,
u.remark,
d.dept_id,
d.parent_id,
@@ -110,14 +137,18 @@
AND u.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD')
</if>
<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')
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <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
@@ -241,6 +272,7 @@
<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}
@@ -284,4 +316,59 @@
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="SysUserOnlyResult">
+ 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="SysUserOnlyResult">
+ 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>
+
+ <select id="getOwnAndChildrenOnlineSoilderList" resultMap="SysUserOnlyResult">
+ select distinct su.user_id,su.dept_id,su.user_name,
+ concat(su.nick_name,'(',sd.dept_name,')') as nick_name from sys_user su
+ inner join sys_user_role sur on su.user_id = sur.user_id
+ inner join sys_role sr on sur.role_id = sr.role_id
+ inner join sys_dept sd on su.dept_id = sd.dept_id
+ where sr.role_key = 'appUser' and su.dept_id in
+ <foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
+ #{deptId}
+ </foreach>
+ and su.app_online_state = '1' and su.status = '0' and su.del_flag = '0'
+ order by su.dept_id asc
+ </select>
+
+ <select id="getOwnAndChildrenSoilderListAll" resultMap="SysUserOnlyResult">
+ select distinct su.user_id,su.dept_id,su.user_name,
+ concat(su.nick_name,'(',sd.dept_name,')') as nick_name,
+ su.app_online_state from sys_user su
+ inner join sys_user_role sur on su.user_id = sur.user_id
+ inner join sys_role sr on sur.role_id = sr.role_id
+ inner join sys_dept sd on su.dept_id = sd.dept_id
+ where sr.role_key = 'appUser' and su.dept_id in
+ <foreach collection="deptIdList" item="deptId" open="(" close=")" separator=",">
+ #{deptId}
+ </foreach>
+ and su.status = '0' and su.del_flag = '0'
+ order by su.dept_id asc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3