Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

接口调整

Browse Source
This commit is contained in:
xuyang
2023-04-21 10:22:40 +08:00
parent 85eaddda3f
commit 4776060043
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/UserVO.java
View File

@@ -37,6 +37,12 @@ public class UserVO extends UserParam implements Serializable {
@ApiModelProperty("部门名称") @ApiModelProperty("部门名称")
private String deptName; private String deptName;
@ApiModelProperty("区域id")
private String areaId;
@ApiModelProperty("区域名称")
private String areaName;
@ApiModelProperty("角色id") @ApiModelProperty("角色id")
private List<String> roleList; private List<String> roleList;

13
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -23,6 +23,7 @@ import com.njcn.device.pq.api.PqsTerminalLogsClient;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs; import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
import com.njcn.poi.excel.ExcelUtil; import com.njcn.poi.excel.ExcelUtil;
import com.njcn.poi.pojo.bo.BaseLineProExcelBody; import com.njcn.poi.pojo.bo.BaseLineProExcelBody;
import com.njcn.system.api.AreaFeignClient;
import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.DictData;
@@ -35,6 +36,7 @@ import com.njcn.user.pojo.constant.UserType;
import com.njcn.user.pojo.dto.UserDTO; import com.njcn.user.pojo.dto.UserDTO;
import com.njcn.user.pojo.dto.excel.UserExcel; import com.njcn.user.pojo.dto.excel.UserExcel;
import com.njcn.user.pojo.param.UserParam; import com.njcn.user.pojo.param.UserParam;
import com.njcn.user.pojo.po.Dept;
import com.njcn.user.pojo.po.User; import com.njcn.user.pojo.po.User;
import com.njcn.user.pojo.po.UserSet; import com.njcn.user.pojo.po.UserSet;
import com.njcn.user.pojo.po.UserStrategy; import com.njcn.user.pojo.po.UserStrategy;
@@ -83,6 +85,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
private final PqsTerminalLogsClient pqsTerminalLogsClient; private final PqsTerminalLogsClient pqsTerminalLogsClient;
private final AreaFeignClient areaFeignClient;
@Override @Override
public UserDTO getUserByName(String loginName) { public UserDTO getUserByName(String loginName) {
User user = getUserByLoginName(loginName); User user = getUserByLoginName(loginName);
@@ -236,6 +240,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
return null; return null;
} }
BeanUtil.copyProperties(user, userVO); BeanUtil.copyProperties(user, userVO);
Dept dept = deptService.getDeptById(user.getDeptId());
//非自定义部门
if (Objects.equals(dept.getType(),0)){
String areaId = deptService.getAreaIdByDeptId(user.getDeptId());
userVO.setAreaId(areaId);
userVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
} else {
userVO.setAreaName(deptService.getNameByDeptId(user.getDeptId()));
}
userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId())); userVO.setDeptName(deptService.getNameByDeptId(user.getDeptId()));
userVO.setRoleList(roleService.getIdByUserId(id)); userVO.setRoleList(roleService.getIdByUserId(id));
userVO.setRole(roleService.getNameByUserId(id)); userVO.setRole(roleService.getNameByUserId(id));