oneos-03/yudao-asset-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门模块的迁移

Browse Source
This commit is contained in:
YunaiV
2020-07-14 19:31:27 +08:00
parent 244f248ad5
commit 846510c309
47 changed files with 1203 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.http Normal file
View File

@@ -0,0 +1,38 @@
### /department/create 成功
POST {{baseUrl}}/department/create
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
name=测试部门&pid=0&sort=0
### /department/update 成功
POST {{baseUrl}}/department/update
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
id=1&name=测试部门&pid=0&sort=0
### /resource/delete 成功
POST {{baseUrl}}/department/delete
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
id=1
### /department/get 成功
GET {{baseUrl}}/department/get?departmentId=1
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
### /department/list 成功
GET {{baseUrl}}/department/list?departmentIds=1,13
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
### /department/tree 成功
GET {{baseUrl}}/department/tree
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
###

81
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/DepartmentController.java Normal file
View File

@@ -0,0 +1,81 @@
package cn.iocoder.mall.managementweb.controller.admin;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentCreateDTO;
import cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentUpdateDTO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentTreeNodeVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentVO;
import cn.iocoder.mall.managementweb.manager.admin.DepartmentManager;
import cn.iocoder.security.annotations.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
import static cn.iocoder.common.framework.vo.CommonResult.success;
/**
* 部门 Controller
*/
@RestController
@RequestMapping("/department")
@Api(tags = "部门")
@Validated
public class DepartmentController {
@Autowired
private DepartmentManager departmentManager;
@PostMapping("/create")
@ApiOperation("创建部门")
@RequiresPermissions("system:department:create")
public CommonResult<Integer> createDepartment(@Valid DepartmentCreateDTO createDTO) {
return success(departmentManager.createDepartment(createDTO));
}
@PostMapping("/update")
@ApiOperation("更新部门")
@RequiresPermissions("system:department:update")
public CommonResult<Boolean> updateDepartment(@Valid DepartmentUpdateDTO updateDTO) {
departmentManager.updateDepartment(updateDTO);
return success(true);
}
@PostMapping("/delete")
@ApiOperation("删除部门")
@ApiImplicitParam(name = "departmentId", value = "部门编号", required = true)
@RequiresPermissions("system:department:delete")
public CommonResult<Boolean> deleteDepartment(@RequestParam("departmentId") Integer departmentId) {
departmentManager.deleteDepartment(departmentId);
return success(true);
}
@GetMapping("/get")
@ApiOperation("获得部门")
@ApiImplicitParam(name = "departmentId", value = "部门编号", required = true)
@RequiresPermissions("system:department:tree")
public CommonResult<DepartmentVO> getDepartment(@RequestParam("departmentId") Integer departmentId) {
return success(departmentManager.getDepartment(departmentId));
}
@GetMapping("/list")
@ApiOperation("获得部门列表")
@ApiImplicitParam(name = "departmentIds", value = "部门编号列表", required = true)
@RequiresPermissions("system:department:tree")
public CommonResult<List<DepartmentVO>> listDepartments(@RequestParam("departmentIds") List<Integer> departmentIds) {
return success(departmentManager.listDepartments(departmentIds));
}
@GetMapping("/tree")
@ApiOperation("获得部门树")
@RequiresPermissions("system:department:tree")
public CommonResult<List<DepartmentTreeNodeVO>> treeDepartment() {
return success(departmentManager.treeDepartment());
}
}

24
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/dto/DepartmentCreateDTO.java Normal file
View File

@@ -0,0 +1,24 @@
package cn.iocoder.mall.managementweb.controller.admin.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@ApiModel("部门创建 DTO")
@Data
public class DepartmentCreateDTO {
@ApiModelProperty(value = "部门名称", required = true, example = "技术部")
@NotEmpty(message = "部门名称不能为空")
private String name;
@ApiModelProperty(value = "排序字段", required = true, example = "1024")
@NotNull(message = "排序字段不能为空")
private Integer sort;
@ApiModelProperty(value = "父级部门编号", required = true, example = "2048")
@NotNull(message = "父级部门编号不能为空")
private Integer pid;
}

27
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/dto/DepartmentUpdateDTO.java Normal file
View File

@@ -0,0 +1,27 @@
package cn.iocoder.mall.managementweb.controller.admin.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
@ApiModel("部门更新 DTO")
@Data
public class DepartmentUpdateDTO {
@ApiModelProperty(value = "部门编号", required = true, example = "1")
@NotNull(message = "部门编号不能为空")
private Integer id;
@ApiModelProperty(value = "部门名称", required = true, example = "技术部")
@NotEmpty(message = "部门名称不能为空")
private String name;
@ApiModelProperty(value = "排序字段", required = true, example = "1024")
@NotNull(message = "排序字段不能为空")
private Integer sort;
@ApiModelProperty(value = "父级部门编号", required = true, example = "2048")
@NotNull(message = "父级部门编号不能为空")
private Integer pid;
}

30
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/vo/DepartmentTreeNodeVO.java Normal file
View File

@@ -0,0 +1,30 @@
package cn.iocoder.mall.managementweb.controller.admin.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
@ApiModel("部门树节点 VO")
@Data
public class DepartmentTreeNodeVO {
@ApiModelProperty(value = "部门编号", required = true, example = "1")
private Integer id;
@ApiModelProperty(value = "部门名称", required = true, example = "技术部")
private String name;
@ApiModelProperty(value = "排序字段", required = true, example = "1024")
private Integer sort;
@ApiModelProperty(value = "父级部门编号", required = true, example = "2048")
private Integer pid;
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
/**
* 子节点
*/
private List<DepartmentTreeNodeVO> children;
}

22
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/admin/vo/DepartmentVO.java Normal file
View File

@@ -0,0 +1,22 @@
package cn.iocoder.mall.managementweb.controller.admin.vo;
import lombok.*;
import io.swagger.annotations.*;
import java.util.*;
@ApiModel("部门 VO")
@Data
public class DepartmentVO {
@ApiModelProperty(value = "部门编号", required = true, example = "1")
private Integer id;
@ApiModelProperty(value = "部门名称", required = true, example = "技术部")
private String name;
@ApiModelProperty(value = "排序字段", required = true, example = "1024")
private Integer sort;
@ApiModelProperty(value = "父级部门编号", required = true, example = "2048")
private Integer pid;
@ApiModelProperty(value = "创建时间", required = true)
private Date createTime;
}

3
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/passport/PassportController.http
View File

@@ -22,6 +22,7 @@ Authorization: Bearer {{accessToken}}
### /passport/list-admin-permission 成功
GET {{baseUrl}}/passport/list-admin-permission
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
#Authorization: Bearer {{accessToken}}
Authorization: Bearer 36dce986276b4d6c8f9f4f3b89b22810
###

1
management-web-app/src/main/java/cn/iocoder/mall/managementweb/controller/permission/RoleController.http
View File

@@ -2,6 +2,7 @@
POST {{baseUrl}}/role/create
Content-Type: application/x-www-form-urlencoded
Authorization: Bearer {{accessToken}}
#Authorization: Bearer 9d250d9b6c034a6c88bf4034cdf1d4cc
name=测试角色

8
management-web-app/src/main/java/cn/iocoder/mall/managementweb/convert/admin/AdminConvert.java
View File

@@ -8,9 +8,13 @@ import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminCreateDTO;
import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminPageDTO;
import cn.iocoder.mall.systemservice.rpc.admin.dto.AdminUpdateDTO;
import cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO;
import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO;
import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface AdminConvert {
@@ -28,4 +32,8 @@ public interface AdminConvert {
cn.iocoder.mall.managementweb.controller.admin.vo.AdminVO convert(AdminVO bean);
AdminPageItemVO convert02(AdminVO adminVO);
AdminPageItemVO.Department convert(DepartmentVO bean);
List<AdminPageItemVO.Role> convert(List<RoleVO> list);
}

27
management-web-app/src/main/java/cn/iocoder/mall/managementweb/convert/admin/DepartmentConvert.java Normal file
View File

@@ -0,0 +1,27 @@
package cn.iocoder.mall.managementweb.convert.admin;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentTreeNodeVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentVO;
import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentCreateDTO;
import cn.iocoder.mall.systemservice.rpc.admin.dto.DepartmentUpdateDTO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import java.util.List;
@Mapper
public interface DepartmentConvert {
DepartmentConvert INSTANCE = Mappers.getMapper(DepartmentConvert.class);
DepartmentCreateDTO convert(cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentCreateDTO bean);
DepartmentUpdateDTO convert(cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentUpdateDTO bean);
List<DepartmentVO> convertList(List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO> list);
DepartmentVO convert(cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO bean);
DepartmentTreeNodeVO convertTreeNode(cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO bean);
}

79
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/AdminManager.java
View File

@@ -1,5 +1,6 @@
package cn.iocoder.mall.managementweb.manager.admin;
import cn.iocoder.common.framework.util.CollectionUtils;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.common.framework.vo.PageResult;
import cn.iocoder.mall.managementweb.controller.admin.dto.AdminCreateDTO;
@@ -10,39 +11,87 @@ import cn.iocoder.mall.managementweb.controller.admin.vo.AdminPageItemVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.AdminVO;
import cn.iocoder.mall.managementweb.convert.admin.AdminConvert;
import cn.iocoder.mall.systemservice.rpc.admin.AdminRpc;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentRpc;
import cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO;
import cn.iocoder.mall.systemservice.rpc.permission.PermissionRpc;
import cn.iocoder.mall.systemservice.rpc.permission.RoleRpc;
import cn.iocoder.mall.systemservice.rpc.permission.vo.RoleVO;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Service;
import java.util.*;
@Service
public class AdminManager {
@Reference(version = "${dubbo.consumer.AdminRpc.version}", validation = "false")
private AdminRpc adminRpc;
@Reference(version = "${dubbo.consumer.RoleRpc.version}", validation = "false")
private RoleRpc roleRpc;
@Reference(version = "${dubbo.consumer.DepartmentRpc.version}", validation = "false")
private DepartmentRpc departmentRpc;
@Reference(version = "${dubbo.consumer.PermissionRpc.version}", validation = "false")
private PermissionRpc permissionRpc;
public PageResult<AdminPageItemVO> pageAdmin(AdminPageDTO pageDTO) {
CommonResult<PageResult<cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO>> pageResult =
adminRpc.pageAdmin(AdminConvert.INSTANCE.convert(pageDTO));
pageResult.checkError();
// 转换结果
PageResult<AdminPageItemVO> adminPageVO = AdminConvert.INSTANCE.convert(pageResult.getData());
PageResult<AdminPageItemVO> adminPageVO = new PageResult<>();
adminPageVO.setTotal(pageResult.getData().getTotal());
adminPageVO.setList(new ArrayList<>(pageResult.getData().getList().size()));
// 拼接结果
// if (!resultPage.getList().isEmpty()) {
// // 查询角色数组
// Map<Integer, Collection<RoleBO>> roleMap = adminService.getAdminRolesMap(CollectionUtil.convertList(resultPage.getList(), AdminBO::getId));
// resultPage.getList().forEach(admin -> admin.setRoles(AdminConvert.INSTANCE.convertAdminVORoleList(roleMap.get(admin.getId()))));
//
// // 查询对应部门
// List<DeptmentBO> deptmentBOS = deptmentService.getAllDeptments();
// Map<Integer, String> deptNameMap = deptmentBOS.stream().collect(Collectors.toMap(d->d.getId(), d->d.getName()));
// //管理员所在部门被删后，变成未分配状态
// deptNameMap.put(0, "未分配");
// resultPage.getList().forEach(admin->{
// admin.setDeptment(new AdminVO.Deptment(admin.getDeptmentId(), deptNameMap.get(admin.getDeptmentId())));
// });
// }
if (!pageResult.getData().getList().isEmpty()) {
// 查询角色数组
Map<Integer, List<RoleVO>> adminRoleMap = this.listAdminRoles(CollectionUtils.convertList(pageResult.getData().getList(),
cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO::getId));
// 查询部门
CommonResult<List<DepartmentVO>> listDepartmentsResult = departmentRpc.listDepartments(
CollectionUtils.convertSet(pageResult.getData().getList(),
cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO::getDepartmentId));
listDepartmentsResult.checkError();
Map<Integer, DepartmentVO> departmentMap = CollectionUtils.convertMap(listDepartmentsResult.getData(), DepartmentVO::getId);
// 拼接数据
for (cn.iocoder.mall.systemservice.rpc.admin.vo.AdminVO adminVO : pageResult.getData().getList()) {
AdminPageItemVO adminPageItemVO = AdminConvert.INSTANCE.convert02(adminVO);
adminPageVO.getList().add(adminPageItemVO);
// 拼接部门
adminPageItemVO.setDepartment(AdminConvert.INSTANCE.convert(departmentMap.get(adminVO.getDepartmentId())));
// 拼接角色
adminPageItemVO.setRoles( AdminConvert.INSTANCE.convert(adminRoleMap.get(adminVO.getId())));
}
} else {
adminPageVO.setList(Collections.emptyList());
}
return adminPageVO;
}
private Map<Integer, List<RoleVO>> listAdminRoles(List<Integer> adminIds) {
// 获得管理员拥有的角色
CommonResult<Map<Integer, Set<Integer>>> mapAdminRoleIdsResult = permissionRpc.mapAdminRoleIds(adminIds);
mapAdminRoleIdsResult.checkError();
// 获得角色列表
Set<Integer> roleIds = new HashSet<>();
mapAdminRoleIdsResult.getData().values().forEach(roleIds::addAll);
CommonResult<List<RoleVO>> listRolesResult = roleRpc.listRoles(roleIds);
listRolesResult.checkError();
Map<Integer, RoleVO> roleVOMap = CollectionUtils.convertMap(listRolesResult.getData(), RoleVO::getId);
// 拼接结果
Map<Integer, List<RoleVO>> adminRoleVOMap = new HashMap<>();
mapAdminRoleIdsResult.getData().forEach((adminId, adminRoleIds) -> {
List<RoleVO> roleVOs = new ArrayList<>(adminRoleIds.size());
adminRoleIds.forEach(roleId -> {
RoleVO roleVO = roleVOMap.get(roleId);
if (roleVO != null) {
roleVOs.add(roleVO);
}
});
adminRoleVOMap.put(adminId, roleVOs);
});
return adminRoleVOMap;
}
public Integer createAdmin(AdminCreateDTO createDTO, Integer createAdminId, String createIp) {
CommonResult<Integer> createAdminResult = adminRpc.createAdmin(AdminConvert.INSTANCE.convert(createDTO)
.setCreateAdminId(createAdminId).setCreateIp(createIp));

128
management-web-app/src/main/java/cn/iocoder/mall/managementweb/manager/admin/DepartmentManager.java Normal file
View File

@@ -0,0 +1,128 @@
package cn.iocoder.mall.managementweb.manager.admin;
import cn.iocoder.common.framework.vo.CommonResult;
import cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentCreateDTO;
import cn.iocoder.mall.managementweb.controller.admin.dto.DepartmentUpdateDTO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentTreeNodeVO;
import cn.iocoder.mall.managementweb.controller.admin.vo.DepartmentVO;
import cn.iocoder.mall.managementweb.convert.admin.DepartmentConvert;
import cn.iocoder.mall.systemservice.enums.admin.DepartmentIdEnum;
import cn.iocoder.mall.systemservice.rpc.admin.DepartmentRpc;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.stereotype.Service;
import java.util.*;
import java.util.stream.Collectors;
/**
* 部门 Manager
*/
@Service
@Slf4j
public class DepartmentManager {
@Reference(version = "${dubbo.consumer.DepartmentRpc.version}", validation = "false")
private DepartmentRpc departmentRpc;
/**
* 创建部门
*
* @param createDTO 创建部门 DTO
* @return 部门
*/
public Integer createDepartment(DepartmentCreateDTO createDTO) {
CommonResult<Integer> createDepartmentResult = departmentRpc.createDepartment(DepartmentConvert.INSTANCE.convert(createDTO));
createDepartmentResult.checkError();
return createDepartmentResult.getData();
}
/**
* 更新部门
*
* @param updateDTO 更新部门 DTO
*/
public void updateDepartment(DepartmentUpdateDTO updateDTO) {
CommonResult<Boolean> updateDepartmentResult = departmentRpc.updateDepartment(DepartmentConvert.INSTANCE.convert(updateDTO));
updateDepartmentResult.checkError();
}
/**
* 删除部门
*
* @param departmentId 部门编号
*/
public void deleteDepartment(Integer departmentId) {
CommonResult<Boolean> deleteDepartmentResult = departmentRpc.deleteDepartment(departmentId);
deleteDepartmentResult.checkError();
}
/**
* 获得部门
*
* @param departmentId 部门编号
* @return 部门
*/
public DepartmentVO getDepartment(Integer departmentId) {
CommonResult<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO> getDepartmentResult = departmentRpc.getDepartment(departmentId);
getDepartmentResult.checkError();
return DepartmentConvert.INSTANCE.convert(getDepartmentResult.getData());
}
/**
* 获得部门列表
*
* @param departmentIds 部门编号列表
* @return 部门列表
*/
public List<DepartmentVO> listDepartments(List<Integer> departmentIds) {
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentRpc.listDepartments(departmentIds);
listDepartmentResult.checkError();
return DepartmentConvert.INSTANCE.convertList(listDepartmentResult.getData());
}
/**
* 获得部门树结构
*
* @return 部门树结构
*/
public List<DepartmentTreeNodeVO> treeDepartment() {
// 获得资源全列表
CommonResult<List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO>> listDepartmentResult = departmentRpc.listDepartments();
listDepartmentResult.checkError();
// 构建菜单树
return buildDepartmentTree(listDepartmentResult.getData());
}
/**
* 构建部门树
*
* @param departmentVOs 部门列表
* @return 部门树
*/
public static List<DepartmentTreeNodeVO> buildDepartmentTree(List<cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO> departmentVOs) {
// 排序，保证菜单的有序性
departmentVOs.sort(Comparator.comparing(cn.iocoder.mall.systemservice.rpc.admin.vo.DepartmentVO::getSort));
// 构建菜单树
// 使用 LinkedHashMap 的原因，是为了排序 。实际也可以用 Stream API ，就是太丑了。
Map<Integer, DepartmentTreeNodeVO> treeNodeMap = new LinkedHashMap<>();
departmentVOs.forEach(departmentVO -> treeNodeMap.put(departmentVO.getId(), DepartmentConvert.INSTANCE.convertTreeNode(departmentVO)));
// 处理父子关系
treeNodeMap.values().stream().filter(node -> !node.getPid().equals(DepartmentIdEnum.ROOT.getId())).forEach((childNode) -> {
// 获得父节点
DepartmentTreeNodeVO parentNode = treeNodeMap.get(childNode.getPid());
if (parentNode == null) {
log.error("[buildDepartmentTree][department({}) 找不到父部门({})]", childNode.getId(), childNode.getPid());
return;
}
// 将自己添加到父节点中
if (parentNode.getChildren() == null) {
parentNode.setChildren(new ArrayList<>());
}
parentNode.getChildren().add(childNode);
});
// 获得到所有的根节点
return treeNodeMap.values().stream().filter(node -> node.getPid().equals(DepartmentIdEnum.ROOT.getId())).collect(Collectors.toList());
}
}