From 7c3418c45926b5288b22044d60dbb12fa2c982d0 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 27 Sep 2024 18:02:40 +0800
Subject: [PATCH] 大厅登记接口优化
---
dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java | 164 ++++++++++++++++++------------------------------------
1 files changed, 56 insertions(+), 108 deletions(-)
diff --git a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
index 888c322..25e28f1 100644
--- a/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
+++ b/dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtUserService.java
@@ -10,7 +10,6 @@
import cn.huge.module.client.api.impl.UtilsClientImpl;
import cn.huge.module.constant.BaseConsts;
import cn.huge.module.ctrole.domain.po.CtRole;
-import cn.huge.module.ctrole.service.CtRoleService;
import cn.huge.module.ctuser.dao.mapper.CtUserMapper;
import cn.huge.module.ctuser.domain.po.*;
import cn.huge.module.ctuser.dto.CtUserSaveDTO;
@@ -18,6 +17,8 @@
import cn.huge.module.cust.constant.UserBaseConsts;
import cn.huge.module.cust.dto.CtUserDTO;
import cn.huge.module.redis.constant.RedisKeyConsts;
+import cn.huge.module.rsoper.domain.po.RsRole;
+import cn.huge.module.rsoper.service.RsRoleService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -65,11 +66,11 @@
@Autowired
private CtUseroleService ctUseroleService;
@Autowired
- private CtRoleService ctRoleService;
- @Autowired
private CtUsepostService ctUsepostService;
@Autowired
private CtDeptService ctDeptService;
+ @Autowired
+ private RsRoleService rsRoleService;
@Autowired
private UtilsClientImpl utilsClient;
@@ -214,6 +215,10 @@
return mapper.selectById(loginUserId);
}
+ public CtUser getByIdCard(String idCard) {
+ return mapper.selectByIdCard(idCard);
+ }
+
/**
* web端-获取人员信息列表查询条件
* @param userId 当前登录用户编号
@@ -253,23 +258,13 @@
}
result.put("units", SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId()));
- // 角色条件
- QueryWrapper<CtRole> ctRoleQueryWrapper = new QueryWrapper<>();
- ctRoleQueryWrapper.eq("unit_id", loginUser.getUnitId());
- //判断是否为村居（村居不应该有调委会管理员角色）
- QueryWrapper<CtUnit> ctUnitQueryWrapper1 = new QueryWrapper<>();
- ctUnitQueryWrapper1.eq("id", loginUser.getUnitId()).eq("cust_id", loginUser.getCustId())
- .select("unit_type");
- CtUnit ctUnit = ctUnitService.getOne(ctUnitQueryWrapper1);
- if (ctUnit.getUnitType() == UserBaseConsts.UNIT_TYPE_4) {
- ctRoleQueryWrapper.ne("role_code", RoleBaseEnum.ROLE_9.getIndex());
- }
- List<CtRole> ctRoleList = ctRoleService.list(ctRoleQueryWrapper);
+ // 查询可选角色
List<SelectTermDTO> roleSelectTerms = new ArrayList<>();
- for (CtRole ctRole : ctRoleList) {
+ List<RsRole> rsRoleList = rsRoleService.list();
+ for (RsRole rsRole : rsRoleList) {
SelectTermDTO selectTerm = new SelectTermDTO();
- selectTerm.setValue(ctRole.getRoleCode());
- selectTerm.setLabel(ctRole.getName());
+ selectTerm.setValue(rsRole.getId());
+ selectTerm.setLabel(rsRole.getName());
roleSelectTerms.add(selectTerm);
}
result.put("roles", roleSelectTerms);
@@ -391,9 +386,9 @@
for (CtUserole ctUserole : ctUseroleList) {
ctUserole.setId(utilsClient.getNewTimeId());
ctUserole.setUserId(ctUser.getId());
- CtRole ctRole = ctRoleService.getByUnitIdAndRoleId(ctUser.getUnitId(), ctUserole.getRoleId());
- ctUserole.setRoleId(ctRole.getId());
- ctUserole.setRoleCode(ctRole.getRoleCode());
+ RsRole rsRole = rsRoleService.getById(ctUserole.getRoleId());
+ ctUserole.setRoleId(rsRole.getId());
+ ctUserole.setRoleCode(rsRole.getId());
ctUserole.setCustId(ctUser.getCustId());
ctUserole.setCreateTime(nowDate);
ctUserole.setUpdateTime(nowDate);
@@ -442,9 +437,9 @@
ctUserole.setId(utilsClient.getNewTimeId());
ctUserole.setUserId(ctUser.getId());
ctUserole.setCustId(ctUser.getCustId());
- CtRole ctRole = ctRoleService.getByUnitIdAndRoleId(ctUser.getUnitId(), ctUserole.getRoleId());
- ctUserole.setRoleId(ctRole.getId());
- ctUserole.setRoleCode(ctRole.getRoleCode());
+ RsRole rsRole = rsRoleService.getById(ctUserole.getRoleId());
+ ctUserole.setRoleId(rsRole.getId());
+ ctUserole.setRoleCode(rsRole.getId());
ctUserole.setCreateTime(nowDate);
ctUserole.setUpdateTime(nowDate);
ctUseroleService.save(ctUserole);
@@ -603,99 +598,52 @@
/**
* 根据部门和角色查询
- * @param deptIdList 部门编号
+ * @param unitId 组织编号
* @param roleCode 角色代码
* @return List<SelectTermDTO>
*/
- public List<CtUser> listUserByDeptRoleList(List<String> deptIdList, String roleCode){
- return mapper.listUserByDeptRoleList(deptIdList, roleCode);
+ public List<CtUser> listUserByDeptRoleList(String unitId, String roleCode){
+ return mapper.listUserByUnitRoleList(unitId, roleCode);
}
/**
- * 按条件分页查询
- *
- * @param userId 分页对象
- * @param roleCode 条件
- * @return Page
+ * 选择人员
+ * @param userId
+ * @param roleCode
+ * @return
*/
public List<SelectTermDTO> userChoose(String userId, String roleCode) {
- // 获取当前登录用户
- CtUserDTO loginUser = clientGetUserAll(userId);
- // 组织条件
- QueryWrapper<CtUnit> ctUnitQueryWrapper = new QueryWrapper<>();
- if (RoleBaseEnum.checkAdminPower(loginUser)){
- ctUnitQueryWrapper.eq("cust_id", loginUser.getCustId()).select("id", "unit_name", "parent_id");
- }else {
- ctUnitQueryWrapper.eq("id", loginUser.getUnitId()).select("id", "unit_name", "parent_id");
- }
- List<CtUnit> ctUnitList = ctUnitService.list(ctUnitQueryWrapper);
- List<SelectTermDTO> unitSelectTerms = new ArrayList<>();
-
- List<String> unitIdList= ctUnitList.stream().map(CtUnit::getId).collect(Collectors.toList());
- // 部门条件
- QueryWrapper<CtDept> ctDeptQueryWrapper = new QueryWrapper<>();
- ctDeptQueryWrapper.in("unit_id", unitIdList).select("id", "unit_id", "name", "parent_id");
- List<CtDept> ctDeptList = ctDeptService.list(ctDeptQueryWrapper);
- List<String> deptIdList = ctDeptList.stream().map(CtDept::getId).collect(Collectors.toList());
-
- // 人员条件
- List<CtUser> ctUsers = null;
- if (StringUtils.isNotEmpty(roleCode)){
- ctUsers = listUserByDeptRoleList(deptIdList, roleCode);
- }else {
- QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>();
- ctUserQueryWrapper.in("dept_id", deptIdList).select("id", "true_name", "dept_id");
- ctUsers = this.list(ctUserQueryWrapper);
- }
- List<String> userIdList = ctUsers.stream().map(CtUser::getId).collect(Collectors.toList());
- QueryWrapper<CtUserole> ctUserQueryWrapper = new QueryWrapper<>();
- ctUserQueryWrapper.in("user_id", userIdList).select("user_id", "role_name");
- List<CtUserole> roleList = ctUseroleService.list(ctUserQueryWrapper);
-
- for(CtUnit ctUnit: ctUnitList){
- SelectTermDTO unitSelectTerm = new SelectTermDTO();
- unitSelectTerm.setValue(ctUnit.getId());
- unitSelectTerm.setLabel(ctUnit.getUnitName());
- unitSelectTerm.setParentId(ctUnit.getParentId());
- unitSelectTerm.setCheckable(false);
- List<SelectTermDTO> deptSelectTerms = new ArrayList<>();
- for(CtDept ctDept : ctDeptList){
- if(ctUnit.getId().equals(ctDept.getUnitId())){
- SelectTermDTO deptSelectTerm = new SelectTermDTO();
- deptSelectTerm.setValue(ctDept.getId());
- deptSelectTerm.setLabel(ctDept.getName());
- deptSelectTerm.setParentId(ctDept.getParentId());
- deptSelectTerm.setCheckable(false);
-
- if (CollectionUtils.isNotEmpty(ctUsers)) {
- List<SelectTermDTO> userSelectTerms = new ArrayList<>();
-
- for(CtUser ctUser : ctUsers){
- if(ctUser.getDeptId().equals(ctDept.getId())){
- List<CtUserole> ctUseroleList = new ArrayList<>();
- for(CtUserole ctUserole: roleList){
- if(ctUser.getId().equals(ctUserole.getUserId())){
- ctUseroleList.add(ctUserole);
- }
- }
- SelectTermDTO userSelectTerm = new SelectTermDTO();
- userSelectTerm.setValue(ctUser.getId());
- userSelectTerm.setCheckable(true);
- String roleName = ctUseroleList.stream().map(CtUserole::getRoleName).collect(Collectors.joining(","));
- userSelectTerm.setLabel(ctUser.getTrueName()+"（"+roleName+"）");
- userSelectTerms.add(userSelectTerm);
- }
- }
- List<SelectTermDTO> users = SelectTermUtils.createTreeByRoot(userSelectTerms);
- deptSelectTerm.setChildren(users);
- }
- deptSelectTerms.add(deptSelectTerm);
- }
- List<SelectTermDTO> depts = SelectTermUtils.createTreeByRoot(deptSelectTerms);
- unitSelectTerm.setChildren(depts);
+ try {
+ // 获取当前登录用户
+ CtUserDTO loginUser = clientGetUserAll(userId);
+ List<SelectTermDTO> result = new ArrayList<>();
+ // 人员条件
+ List<CtUser> ctUsers = null;
+ if (StringUtils.isNotEmpty(roleCode)){
+ ctUsers = listUserByDeptRoleList(loginUser.getUnitId(), roleCode);
+ }else {
+ QueryWrapper<CtUser> ctUserQueryWrapper = new QueryWrapper<>();
+ ctUserQueryWrapper.in("unit_id", loginUser.getUnitId()).select("id", "true_name");
+ ctUsers = this.list(ctUserQueryWrapper);
}
- unitSelectTerms.add(unitSelectTerm);
+ SelectTermDTO unitSelectTerm = new SelectTermDTO();
+ unitSelectTerm.setValue(loginUser.getUnitId());
+ unitSelectTerm.setLabel(loginUser.getUnitName());
+ unitSelectTerm.setCheckable(false);
+ List<SelectTermDTO> userSelectTerms = new ArrayList<>();
+ for(CtUser ctUser : ctUsers){
+ SelectTermDTO userSelectTerm = new SelectTermDTO();
+ userSelectTerm.setValue(ctUser.getId());
+ userSelectTerm.setCheckable(true);
+ userSelectTerm.setLabel(ctUser.getTrueName());
+ userSelectTerms.add(userSelectTerm);
+ }
+ unitSelectTerm.setChildren(userSelectTerms);
+ result.add(unitSelectTerm);
+ return result;
+ }catch (Exception e) {
+ log.error("[CtUserService.userChoose]调用失败，异常信息：" + e, e);
+ throw new ServiceException("CtUserService.userChoose", e);
}
- return SelectTermUtils.createTreeByFirst(unitSelectTerms, loginUser.getUnitId());
}
}
--
Gitblit v1.8.0