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

物联用户权限分配

Browse Source
This commit is contained in:
xy
2025-11-14 10:00:24 +08:00
parent d48cf09119
commit 9d32ca05df
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
View File

@@ -192,7 +192,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
LambdaQueryWrapper<SysDicTreePO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysDicTreePO::getPid,vo.getId())
.eq(SysDicTreePO::getStatus,0)
.orderByDesc(SysDicTreePO::getSort);
.orderByAsc(SysDicTreePO::getSort);
char lastChar = lineId.charAt(lineId.length() - 1);
//治理APF指标
if (Objects.equals(lastChar,'0')) {

1
pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java
View File

@@ -16,6 +16,7 @@ public enum AppRoleEnum {
APP_VIP_USER("app_vip_user","移动端正式用户"),
MARKET_USER("market_user","营销角色"),
ENGINEERING_USER("engineering_user","工程角色"),
BXS_USER("bxs_user","便携式正式用户"),
ROOT("root","超级管理员"),
OPERATION_MANAGER("operation_manager","运维管理员"),
;

9
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -511,6 +511,15 @@ public class UserController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getFormalUserList")
@ApiOperation("获取移动端、便携式正式用户列表")
public HttpResult<List<UserVO>> getFormalUserList() {
String methodDescribe = getMethodDescribe("getFormalUserList");
List<UserVO> users = userService.getFormalUserList();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
}
/**
* 获取同级部门用户，以及下级部门所有用户

3
pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
View File

@@ -175,13 +175,12 @@ public interface IUserService extends IService<User> {
boolean activateUser(String id);
List<User> getMarketList();
List<UserVO> getFormalUserList();
List<User> getUserListByDeptId(String deptId);
boolean updateAppUser(UserInfoParm userInfoParm);
String uploadImage(MultipartFile issuesFile);

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

@@ -15,12 +15,10 @@ import com.njcn.common.pojo.constant.LogInfo;
import com.njcn.common.pojo.enums.common.DataStateEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.PubUtils;
import com.njcn.common.utils.sm.DesUtils;
import com.njcn.common.utils.sm.Sm4Utils;
import com.njcn.db.constant.DbConstant;
import com.njcn.device.pq.pojo.po.PqsTerminalLogs;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.poi.excel.ExcelUtil;
@@ -28,8 +26,6 @@ import com.njcn.redis.pojo.enums.RedisKeyEnum;
import com.njcn.redis.utils.RedisUtil;
import com.njcn.system.api.AreaFeignClient;
import com.njcn.system.api.DicDataFeignClient;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.enums.AppRoleEnum;
import com.njcn.user.enums.UserResponseEnum;
import com.njcn.user.enums.UserStatusEnum;
@@ -489,6 +485,25 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
return this.listByIds(collect);
}
@Override
public List<UserVO> getFormalUserList() {
List<UserVO> users = new ArrayList<>();
Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode());
Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode());
List<UserRole> userRoles = userRoleMapper.selectUserRole(Stream.of(roleByCode1.getId(),roleByCode2.getCode()).collect(Collectors.toList()));
List<String> collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList());
List<User> users1 = this.listByIds(collect);
if (CollectionUtil.isNotEmpty(users1)) {
users1.forEach(item->{
UserVO userVO = new UserVO();
userVO.setId(item.getId());
userVO.setName(item.getName());
users.add(userVO);
});
}
return users;
}
@Override
public List<User> getUserListByDeptId(String deptId) {
LambdaQueryWrapper<Dept> lambdaQueryWrapper = new LambdaQueryWrapper<>();