From 9d32ca05df1f67b3609e96ab1567f13ee397096b Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 14 Nov 2025 10:00:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=88=86=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDicTreePOServiceImpl.java | 2 +- .../java/com/njcn/user/enums/AppRoleEnum.java | 1 + .../njcn/user/controller/UserController.java | 9 ++++++++ .../com/njcn/user/service/IUserService.java | 3 +-- .../user/service/impl/UserServiceImpl.java | 23 +++++++++++++++---- 5 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java index 2c80e034f..40a8ed9c2 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java @@ -192,7 +192,7 @@ public class SysDicTreePOServiceImpl extends ServiceImpl 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')) { diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java b/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java index 6fb7dbfba..1ec0f50d1 100644 --- a/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java +++ b/pqs-user/user-api/src/main/java/com/njcn/user/enums/AppRoleEnum.java @@ -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","运维管理员"), ; diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java index f470b0631..0d3c453d1 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java @@ -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> getFormalUserList() { + String methodDescribe = getMethodDescribe("getFormalUserList"); + List users = userService.getFormalUserList(); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe); + } + /** * 获取同级部门用户，以及下级部门所有用户 diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java index e94288857..053f43f4b 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java @@ -175,13 +175,12 @@ public interface IUserService extends IService { boolean activateUser(String id); - List getMarketList(); + List getFormalUserList(); List getUserListByDeptId(String deptId); - boolean updateAppUser(UserInfoParm userInfoParm); String uploadImage(MultipartFile issuesFile); diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java index 5d47b086b..a3c3216fe 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java @@ -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 implements IU return this.listByIds(collect); } + @Override + public List getFormalUserList() { + List users = new ArrayList<>(); + Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode()); + Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode()); + List userRoles = userRoleMapper.selectUserRole(Stream.of(roleByCode1.getId(),roleByCode2.getCode()).collect(Collectors.toList())); + List collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList()); + List 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 getUserListByDeptId(String deptId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();