修改app位置推送数据按部门过滤

liusuyi

2023-07-27 e60d40e122f3d35104354c316d36be16b723d07d

修改app位置推送数据按部门过滤

 ard-work/src/main/java/com/ruoyi/app/position/service/IArdAppPositionService.java

@@ -65,5 +65,4 @@
     * @return 结果
     */
    public int deleteArdAppPositionById(String id);

}

 ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java

@@ -6,12 +6,14 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.service.ISysUserService;
import org.springframework.stereotype.Service;

import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -105,6 +107,5 @@
    public int deleteArdAppPositionById(String id) {
        return ardAppPositionMapper.deleteArdAppPositionById(id);
    }


}

 ard-work/src/main/java/com/ruoyi/utils/websocket/service/ChatServerEndpoint.java

@@ -4,7 +4,9 @@
import com.ruoyi.app.position.domain.ArdAppPosition;
import com.ruoyi.app.position.service.IArdAppPositionService;
import com.ruoyi.app.position.service.impl.AppPositionPush;
import com.ruoyi.app.position.service.impl.ArdAppPositionServiceImpl;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import lombok.extern.slf4j.Slf4j;
@@ -42,9 +44,7 @@
        log.info("用户登录：" + message);
        WebSocketUtils.sendMessage(session, message);
        //每个用户连接时，启动初始所有app用户位置发送

        List<ArdAppPosition> positionList = AppPositionPush.initDataMap.get(userId);
        AppPositionPush.initDataMap.put(userId,positionList);
        AppPositionPush.initDataMap.put(userId,AppPositionPush.getAppPositionList());
        AppPositionPush.initPushTask(userId,session,3000);
    }


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -26,7 +26,6 @@
     * @return 用户信息集合信息
     */
    public List<SysUser> selectAllAppUserList(SysUser user);

    /**
     * 根据条件分页查询已分配用户角色列表
     *

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -143,7 +143,7 @@
     * @return 用户信息集合信息
     */
    @Override
    //@DataScope(deptAlias = "d", userAlias = "u")
//    @DataScope(deptAlias = "d", userAlias = "u")
    public List<SysUser> selectAllAppUserList(SysUser user) {
        return userMapper.selectAllAppUserList(user);
    }

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -116,8 +116,9 @@
    <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