BJ_FS / urbanops

Commit b18620514284bbede29ea34cb4af77b576d2bba0

Authored by 王富生
1 parent 478d2940

基础api提供

Inline Side-by-side
Showing 4 changed files with 76 additions and 8 deletions
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/UserController.java
  View file @b186205
... ... @@ -7,6 +7,7 @@ import com.zteits.urbanops.framework.common.pojo.CommonResult;
7 7 import com.zteits.urbanops.framework.common.pojo.PageParam;
8 8 import com.zteits.urbanops.framework.common.pojo.PageResult;
9 9 import com.zteits.urbanops.framework.excel.core.util.ExcelUtils;
  10 +import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
10 11 import com.zteits.urbanops.module.system.controller.admin.user.vo.user.*;
11 12 import com.zteits.urbanops.module.system.convert.user.UserConvert;
12 13 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
... ... @@ -192,4 +193,11 @@ public class UserController {
192 193 return success(userService.importUserList(list, updateSupport));
193 194 }
194 195  
  196 + @GetMapping("/get/busi-line")
  197 + @Operation(summary = "获取用户业务线")
  198 + //@PreAuthorize("@ss.hasPermission('system:user:query')")
  199 + public CommonResult<List<DictDataRespVO> > getUser() {
  200 + return success(userService.getLoginBusiLine());
  201 + }
  202 +
195 203 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/user/vo/user/DictDataRespVO.java 0 → 100644
  View file @b186205
  1 +package com.zteits.urbanops.module.system.controller.admin.user.vo.user;
  2 +
  3 +import com.zteits.urbanops.framework.common.enums.CommonStatusEnum;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +@Schema(description = "管理后台 - 用户信息 Response VO")
  8 +@Data
  9 +public class DictDataRespVO {
  10 +
  11 + /**
  12 + * 字典标签
  13 + */
  14 + private String label;
  15 + /**
  16 + * 字典值
  17 + */
  18 + private String value;
  19 + /**
  20 + * 字典类型
  21 + */
  22 + private String dictType;
  23 + /**
  24 + * 状态
  25 + *
  26 + * 枚举 {@link CommonStatusEnum}
  27 + */
  28 + private Integer status;
  29 +}
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserService.java
  View file @b186205
... ... @@ -6,10 +6,7 @@ import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
6 6 import com.zteits.urbanops.module.system.controller.admin.auth.vo.AuthRegisterReqVO;
7 7 import com.zteits.urbanops.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
8 8 import com.zteits.urbanops.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
9   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserImportExcelVO;
10   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserImportRespVO;
11   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserPageReqVO;
12   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserSaveReqVO;
  9 +import com.zteits.urbanops.module.system.controller.admin.user.vo.user.*;
13 10 import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
14 11 import jakarta.validation.Valid;
15 12  
... ... @@ -214,4 +211,10 @@ public interface AdminUserService {
214 211 */
215 212 boolean isPasswordMatch(String rawPassword, String encodedPassword);
216 213  
  214 + /**
  215 + * 获取登录人业务线列表
  216 + * @return 业务线列表
  217 + */
  218 + List<DictDataRespVO> getLoginBusiLine();
  219 +
217 220 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/user/AdminUserServiceImpl.java
  View file @b186205
... ... @@ -11,21 +11,21 @@ import com.zteits.urbanops.framework.common.util.collection.CollectionUtils;
11 11 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
12 12 import com.zteits.urbanops.framework.common.util.validation.ValidationUtils;
13 13 import com.zteits.urbanops.framework.datapermission.core.util.DataPermissionUtils;
  14 +import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
14 15 import com.zteits.urbanops.module.infra.api.config.ConfigApi;
15 16 import com.zteits.urbanops.module.system.controller.admin.auth.vo.AuthRegisterReqVO;
16 17 import com.zteits.urbanops.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
17 18 import com.zteits.urbanops.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
18   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserImportExcelVO;
19   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserImportRespVO;
20   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserPageReqVO;
21   -import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserSaveReqVO;
  19 +import com.zteits.urbanops.module.system.controller.admin.user.vo.user.*;
22 20 import com.zteits.urbanops.module.system.dal.dataobject.dept.DeptDO;
23 21 import com.zteits.urbanops.module.system.dal.dataobject.dept.UserPostDO;
  22 +import com.zteits.urbanops.module.system.dal.dataobject.dict.DictDataDO;
24 23 import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
25 24 import com.zteits.urbanops.module.system.dal.mysql.dept.UserPostMapper;
26 25 import com.zteits.urbanops.module.system.dal.mysql.user.AdminUserMapper;
27 26 import com.zteits.urbanops.module.system.service.dept.DeptService;
28 27 import com.zteits.urbanops.module.system.service.dept.PostService;
  28 +import com.zteits.urbanops.module.system.service.dict.DictDataService;
29 29 import com.zteits.urbanops.module.system.service.permission.PermissionService;
30 30 import com.zteits.urbanops.module.system.service.tenant.TenantService;
31 31 import com.google.common.annotations.VisibleForTesting;
... ... @@ -83,6 +83,9 @@ public class AdminUserServiceImpl implements AdminUserService {
83 83 @Resource
84 84 private ConfigApi configApi;
85 85  
  86 + @Resource
  87 + private DictDataService dictDataService;
  88 +
86 89 @Override
87 90 @Transactional(rollbackFor = Exception.class)
88 91 @LogRecord(type = SYSTEM_USER_TYPE, subType = SYSTEM_USER_CREATE_SUB_TYPE, bizNo = "{{#user.id}}",
... ... @@ -525,6 +528,31 @@ public class AdminUserServiceImpl implements AdminUserService {
525 528 return passwordEncoder.matches(rawPassword, encodedPassword);
526 529 }
527 530  
  531 + @Override
  532 + public List<DictDataRespVO> getLoginBusiLine() {
  533 + List<DictDataDO> list = dictDataService.getDictDataListByDictType("business_line");
  534 + if (CollUtil.isEmpty(list)) {
  535 + return Collections.emptyList();
  536 + }
  537 + List<DictDataRespVO> respList = BeanUtils.toBean(list, DictDataRespVO.class);
  538 + Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
  539 +
  540 + //超级管理员
  541 + if (loginUserDeptId == null || loginUserDeptId == 100) {
  542 + return respList;
  543 + }
  544 + //其他用户
  545 + String busiLine = SecurityFrameworkUtils.getBusiLine();
  546 + if (StrUtil.isBlank(busiLine)) {
  547 + return respList;
  548 + }
  549 + List<String> busiLineList = Arrays.asList(busiLine.split(","));
  550 +
  551 + return respList.stream()
  552 + .filter(e -> busiLineList.contains(e.getValue()))
  553 + .collect(Collectors.toList());
  554 + }
  555 +
528 556 /**
529 557 * 对密码进行加密
530 558 *
... ...