FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:优化机构查询用户速度慢的问题

Browse Source
This commit is contained in:
zyd
2022-09-21 22:59:52 +08:00
parent ca3f48c207
commit 89f6240481
9 changed files with 111 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java
+6
View File
@@ -51,6 +51,12 @@ public interface TsPositionDao extends BaseMapper<TsPosition> {
*/
List<TsRole> getRole(String positionId);
/**
* 根据用户ID获取岗位信息
* @param userId
* @return
*/
List<TsPosition> getPositionDataByUserId(@Param("userId") String userId);
/**
* 查询岗位以及绑定的角色信息
* @param tsPosition：岗位信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/ITsPositionService.java
+6
View File
@@ -40,6 +40,12 @@ public interface ITsPositionService extends IService<TsPosition> {
*/
List<TsRole> getRole(String positionId);
/**
* 根据用户ID获取岗位信息
* @param userId
* @return
*/
List<TsPosition> getPositionDataByUserId(String userId);
/**
* 添加岗位
* @param tsPosition：岗位信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java
+10
View File
@@ -108,6 +108,16 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
return tsPositionDao.getRole(positionId);
}
/**
* 根据用户ID获取岗位信息
* @param userId
* @return
*/
@Override
public List<TsPosition> getPositionDataByUserId(String userId) {
return tsPositionDao.getPositionDataByUserId(userId);
}
/**
* 添加岗位
* @param tsPosition：岗位信息
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/dao/TsUserDao.java
+4
View File
@@ -26,6 +26,10 @@ public interface TsUserDao extends BaseMapper<TsUser> {
@Select("select position_id from ts_user_position where user_id=#{userId}")
List<String> selectPositionIds(String userId);
@Update("UPDATE ts_user SET SYS_POSITION_IDS =#{positionIds} WHERE USID = #{userId}")
void updateUserPositionIds(@Param("userId") String userId,@Param("positionIds")String positionIds);
/**
* 添加岗位
* @param userId：用户ID
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/entity/TsUser.java
+4
View File
@@ -138,6 +138,10 @@ public class TsUser extends BaseEntity {
@TableField("SSO_ID")
private String ssoId;
@ApiModelProperty(value = "系统设置岗位ID集合")
@TableField("SYS_POSITION_IDS")
private String sysPositionIds;
@ApiModelProperty(value = "岗位")
@TableField(exist = false)
private List<TsPosition> positions;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarUser/service/impl/TsUserServiceImpl.java
+66 -42
View File
@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -135,8 +136,16 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
if(tsUser==null){
return Result.error("该用户不存在");
}
//此处更新user表中的岗位字段
List<String> positionIds = userPositionVO.getPositionIds();
positionIds.removeIf(s -> null==s||""==s);
String optionsIdStr = StringUtils.join(positionIds, ",");
if(StringUtils.isBlank(optionsIdStr)){
optionsIdStr = null;
}
tsUserDao.updateUserPositionIds(userPositionVO.getUserId(),optionsIdStr);
List<String> oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId());
Map<String,List<String>> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds);
Map<String,List<String>> ids= ListUtil.difList(positionIds,oldPositionIds);
List<String> insertIds=ids.get("insert");
List<String> deleteIds=ids.get("delete");
if(insertIds!=null&&insertIds.size()>0){
@@ -163,7 +172,13 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
public ResponseMessage<Object> setPositionBatch(UserPositionBatchVO userPositionVO2) {
boolean flag=true;
//此处更新user表中的岗位字段
List<String> positionIds = userPositionVO2.getPositionIds();
positionIds.removeIf(s -> null==s||""==s);
String optionsIdStr = StringUtils.join(positionIds, ",");
if(StringUtils.isBlank(optionsIdStr)){
optionsIdStr = null;
}
for (String s:userPositionVO2.getUserId()) {
UserPositionVO userPositionVO=new UserPositionVO();
userPositionVO.setUserId(s);
@@ -171,9 +186,11 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
TsUser tsUser=tsUserDao.selectById(userPositionVO.getUserId());
if(tsUser==null){
flag=false;
continue;
}
tsUserDao.updateUserPositionIds(userPositionVO.getUserId(),optionsIdStr);
List<String> oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId());
Map<String,List<String>> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds);
Map<String,List<String>> ids= ListUtil.difList(positionIds,oldPositionIds);
List<String> insertIds=ids.get("insert");
List<String> deleteIds=ids.get("delete");
if(insertIds!=null&&insertIds.size()>0){
@@ -210,6 +227,13 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
List<String> middle=new ArrayList<>();
middle.addAll(orgIds);
boolean Orgflag=true;
//此处更新user表中的岗位字段
List<String> positionIds = userPositionVO2.getPositionIds();
positionIds.removeIf(s -> null==s||""==s);
String optionsIdStr = StringUtils.join(positionIds, ",");
if(StringUtils.isBlank(optionsIdStr)){
optionsIdStr = null;
}
while (Orgflag){
QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
queryWrapper.in("parent_id",middle);
@@ -234,25 +258,23 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
for (TsUser user : allUsers) {
String userId = user.getUserId();
UserPositionVO userPositionVO=new UserPositionVO();
userPositionVO.setUserId(userId);
userPositionVO.setPositionIds(userPositionVO2.getPositionIds());
TsUser tsUser=tsUserDao.selectById(userPositionVO.getUserId());
TsUser tsUser=tsUserDao.selectById(userId);
if(tsUser==null){
continue;
}
List<String> oldPositionIds=tsUserDao.selectPositionIds(userPositionVO.getUserId());
Map<String,List<String>> ids= ListUtil.difList(userPositionVO.getPositionIds(),oldPositionIds);
tsUserDao.updateUserPositionIds(userId,optionsIdStr);
List<String> oldPositionIds=tsUserDao.selectPositionIds(userId);
Map<String,List<String>> ids= ListUtil.difList(positionIds,oldPositionIds);
List<String> insertIds=ids.get("insert");
List<String> deleteIds=ids.get("delete");
if(insertIds!=null&&insertIds.size()>0){
for(String positionId:insertIds){
tsUserDao.addPosition(userPositionVO.getUserId(),positionId);
tsUserDao.addPosition(userId,positionId);
}
}
if(deleteIds!=null&&deleteIds.size()>0){
for(String positionId:deleteIds){
tsUserDao.delPosition(userPositionVO.getUserId(),positionId);
tsUserDao.delPosition(userId,positionId);
}
}
}
@@ -459,42 +481,44 @@ public class TsUserServiceImpl extends ServiceImpl<TsUserDao, TsUser> implements
@Override
public IPage<TsUser> getAllUsers(TsUser tsUser) {
List<String> ids=new ArrayList<>();
QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
queryWrapper.like("parent_id",tsUser.getInstitutionId());
List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
if(tsmiddle!=null && !tsmiddle.isEmpty()){
tsmiddle.forEach(tsInstitution -> {
ids.add(tsInstitution.getId());
});
ids.add(tsUser.getInstitutionId());
List<String> middle=new ArrayList<>();
middle.addAll(ids);
boolean flag=true;
while (flag){
QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
queryWrapper.in("parent_id",middle);
List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
if (tsmiddle.size()>0){
tsmiddle.forEach(tsInstitution -> {
middle.add(tsInstitution.getId());
});
middle.removeAll(ids);
ids.addAll(middle);
}else {
tsmiddle.forEach(tsInstitution -> {
middle.add(tsInstitution.getId());
});
middle.removeAll(ids);
ids.addAll(middle);
flag=false;
}
}
// List<String> middle=new ArrayList<>();
// middle.addAll(ids);
// boolean flag=true;
// while (flag){
// QueryWrapper<TsInstitution> queryWrapper=new QueryWrapper<>();
// queryWrapper.in("parent_id",middle);
// List<TsInstitution> tsmiddle=tsInstitutionService.list(queryWrapper);
// if (tsmiddle.size()>0){
// tsmiddle.forEach(tsInstitution -> {
// middle.add(tsInstitution.getId());
// });
// middle.removeAll(ids);
// ids.addAll(middle);
// }else {
// tsmiddle.forEach(tsInstitution -> {
// middle.add(tsInstitution.getId());
// });
// middle.removeAll(ids);
// ids.addAll(middle);
// flag=false;
// }
// }
// ids.removeIf(s -> null==s);
ids.removeIf(s -> null==s);
List<TsUser> tsUsers = tsUserDao.userUnderInstitution((tsUser.getCurrent() - 1) * tsUser.getSize(), tsUser.getSize(), tsUser, ids);
if(tsUsers!=null && !tsUsers.isEmpty()){
for (TsUser user:tsUsers) {
List<TsPosition> positionList = tsPositionService.getPositionDataByUserId(user.getUserId());
user.setPositions(positionList);
}
}
Page<TsUser> tsUserPage = new Page<>();
tsUserPage.setCurrent(tsUser.getCurrent());
tsUserPage.setSize(tsUser.getSize());
tsUserPage.setRecords(tsUserDao.userUnderInstitution((tsUser.getCurrent()-1)*tsUser.getSize(),tsUser.getSize(),tsUser,ids));
tsUserPage.setRecords(tsUsers);
tsUserPage.setTotal(tsUserDao.userUnderInstitutionCount(tsUser,ids));
return tsUserPage;
}