From 2ace49012b5f1cc248e01047caa8a67d658b5841 Mon Sep 17 00:00:00 2001 From: yandanyang Date: Tue, 9 Nov 2021 18:45:26 +0800 Subject: [PATCH] =?UTF-8?q?id=E6=9B=BF=E6=8D=A2=E4=BB=A5=E5=8F=8A=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/util/SmartBaseEnumUtil.java | 15 ++++ .../domain/entity/DepartmentEntity.java | 7 +- .../domain/entity/DepartmentThirdEntity.java | 33 ------- .../domain/form/DepartmentUpdateForm.java | 2 +- .../department/domain/vo/DepartmentVO.java | 2 +- .../department/manager/DepartmentManager.java | 15 ---- .../service/DepartmentCacheService.java | 10 ++- .../department/service/DepartmentService.java | 85 +------------------ .../service/DepartmentTreeService.java | 13 +-- .../system/employee/EmployeeController.java | 1 + .../module/system/employee/EmployeeDao.java | 8 +- .../domain/entity/EmployeeEntity.java | 2 +- .../domain/form/EmployeeUpdateForm.java | 2 +- .../system/employee/domain/vo/EmployeeVO.java | 2 +- .../{ => manager}/EmployeeManager.java | 9 +- .../{ => service}/EmployeeCacheService.java | 3 +- .../{ => service}/EmployeeService.java | 28 +++--- .../system/login/service/JwtService.java | 2 +- .../system/login/service/LoginService.java | 10 +-- .../menu/service/MenuEmployeeService.java | 2 +- .../module/system/role/dao/RoleDao.java | 8 +- .../system/role/dao/RoleDataScopeDao.java | 6 -- .../system/role/domain/entity/RoleEntity.java | 13 ++- .../role/domain/form/RoleUpdateForm.java | 2 +- .../module/system/role/domain/vo/RoleVO.java | 2 +- .../role/manager/RoleDataScopeManager.java | 29 +++++++ .../role/service/RoleDataScopeService.java | 22 ++--- .../role/service/RoleEmployeeService.java | 9 +- .../system/role/service/RoleService.java | 32 +++---- .../system/department/DepartmentMapper.xml | 7 +- .../mapper/system/employee/EmployeeMapper.xml | 20 ++--- .../system/role/RoleDataScopeMapper.xml | 12 --- 32 files changed, 152 insertions(+), 261 deletions(-) delete mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentThirdEntity.java rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/{ => manager}/EmployeeManager.java (83%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/{ => service}/EmployeeCacheService.java (95%) rename admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/{ => service}/EmployeeService.java (95%) create mode 100644 admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/manager/RoleDataScopeManager.java diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java index 4ab779a3..e3bb8d6c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/common/util/SmartBaseEnumUtil.java @@ -1,7 +1,10 @@ package net.lab1024.smartadmin.service.common.util; import net.lab1024.smartadmin.service.common.enumeration.BaseEnum; +import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorRuleTypeEnum; +import org.apache.commons.lang3.StringUtils; +import java.lang.reflect.Field; import java.util.List; import java.util.Objects; import java.util.function.BiConsumer; @@ -16,6 +19,8 @@ import java.util.stream.Stream; */ public class SmartBaseEnumUtil { + private Object e; + /** * 校验参数与枚举类比较是否合法 * @@ -98,6 +103,16 @@ public class SmartBaseEnumUtil { .orElse(null); } + + public static T getEnumByName(String name, Class enumClass) { + return Stream.of(enumClass.getEnumConstants()) + .filter(e->StringUtils.equalsIgnoreCase(e.toString(), name)) + .findFirst() + .orElse(null); + } + + + /** * 根据lambda getter/setter 注入 * diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentEntity.java index d3a3a5a4..81c62f9c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentEntity.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentEntity.java @@ -22,7 +22,7 @@ public class DepartmentEntity { * 主键id */ @TableId(type = IdType.AUTO) - private Long id; + private Long departmentId; /** * 部门名称 @@ -56,10 +56,5 @@ public class DepartmentEntity { private LocalDateTime createTime; - /** - * 导入标识 - */ - private Boolean importFlag; - } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentThirdEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentThirdEntity.java deleted file mode 100644 index b3251120..00000000 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/entity/DepartmentThirdEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.lab1024.smartadmin.service.module.system.department.domain.entity; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.time.LocalDateTime; - -/** - * 部门实体类 - * t_department 数据表 - * - * @author listen - * @date 2017/12/19 10:45 - */ -@Data -@TableName(value = "t_department_third") -public class DepartmentThirdEntity { - - private Long departmentId; - /** - * {@link net.lab1024.smartadmin.mq.constant.XmfCrmPlatformEnum} - */ - private Integer platformType; - /** - * 第三方平台部门id - */ - private Long thirdDepartmentId; - - private LocalDateTime updateTime; - - private LocalDateTime createTime; - -} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/form/DepartmentUpdateForm.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/form/DepartmentUpdateForm.java index 41924d4d..37759260 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/form/DepartmentUpdateForm.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/form/DepartmentUpdateForm.java @@ -20,6 +20,6 @@ public class DepartmentUpdateForm extends DepartmentAddForm { @ApiModelProperty("部门id") @NotNull(message = "部门id不能为空") - private Long id; + private Long departmentId; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/vo/DepartmentVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/vo/DepartmentVO.java index af4532f5..586ef6bf 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/vo/DepartmentVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/domain/vo/DepartmentVO.java @@ -11,7 +11,7 @@ import lombok.Data; public class DepartmentVO { @ApiModelProperty("部门id") - private Long id; + private Long departmentId; @ApiModelProperty("部门名称") private String name; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentManager.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentManager.java index 37d54541..3f92fcea 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentManager.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/manager/DepartmentManager.java @@ -19,19 +19,4 @@ import java.util.List; public class DepartmentManager extends ServiceImpl { - /** - * 批量添加 编辑 - * - * @param insertDepartmentList - * @param updateDepartmentList - */ - @Transactional(rollbackFor = Exception.class) - public void batchInsertUpdate(List insertDepartmentList, List updateDepartmentList) { - if(!CollectionUtils.isEmpty(insertDepartmentList)){ - saveBatch(insertDepartmentList); - } - if(!CollectionUtils.isEmpty(updateDepartmentList)){ - updateBatchById(updateDepartmentList); - } - } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java index d127f01f..ec14266f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentCacheService.java @@ -6,6 +6,7 @@ import net.lab1024.smartadmin.service.constant.CacheModuleConst; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; +import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; @@ -129,7 +131,7 @@ public class DepartmentCacheService { * @return */ private DepartmentVO findSchoolDepartmentId(List departmentList, Long departmentId, Long schoolParentDepartmentId) { - Optional findRes = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); + Optional findRes = departmentList.stream().filter(e -> e.getDepartmentId().equals(departmentId)).findFirst(); // 如果查询不到 或者自己本身为最顶级 返回null if (!findRes.isPresent()) { return null; @@ -150,12 +152,12 @@ public class DepartmentCacheService { @Cacheable(CacheModuleConst.Department.DEPARTMENT_ROUTE_CACHE) public Map departmentRouteCache() { List departmentVOList = departmentDao.listAll(); - Map departmentMap = departmentVOList.stream().collect(Collectors.toMap(DepartmentVO::getId, Function.identity())); + Map departmentMap = departmentVOList.stream().collect(Collectors.toMap(DepartmentVO::getDepartmentId, Function.identity())); Map routeNameMap = Maps.newHashMap(); for (DepartmentVO departmentVO : departmentVOList) { String routeName = this.buildRoutePath(departmentVO, departmentMap); - routeNameMap.put(departmentVO.getId(), routeName); + routeNameMap.put(departmentVO.getDepartmentId(), routeName); } return routeNameMap; @@ -168,7 +170,7 @@ public class DepartmentCacheService { * @param departmentMap */ private String buildRoutePath(DepartmentVO departmentVO, Map departmentMap) { - if (departmentVO.getParentId() == DepartmentService.DEFAULT_PARENT_ID) { + if (Objects.equals(departmentVO.getParentId(), NumberUtils.LONG_ZERO)) { return departmentVO.getName(); } //父节点 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java index 7c60d69f..dead0eef 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentService.java @@ -1,6 +1,5 @@ package net.lab1024.smartadmin.service.module.system.department.service; -import com.google.common.collect.Lists; import net.lab1024.smartadmin.service.common.code.UserErrorCode; import net.lab1024.smartadmin.service.common.domain.ResponseDTO; import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; @@ -8,21 +7,13 @@ import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; import net.lab1024.smartadmin.service.module.system.department.domain.form.DepartmentAddForm; import net.lab1024.smartadmin.service.module.system.department.domain.form.DepartmentUpdateForm; -import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentEmployeeTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; -import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.aop.framework.AopContext; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * 部门管理 @@ -32,8 +23,6 @@ import java.util.stream.Collectors; @Service public class DepartmentService { - static final long DEFAULT_PARENT_ID = 0L; - @Autowired private DepartmentDao departmentDao; @@ -65,77 +54,6 @@ public class DepartmentService { } - /** - * 递归构建每部门的员工信息 - * - * @param treeVOList - * @param employeeMap - * @return - */ - private List buildTreeEmployee(List treeVOList, Map> employeeMap) { - List departmentEmployeeTreeVOList = Lists.newArrayList(); - for (DepartmentTreeVO departmentTreeVO : treeVOList) { - DepartmentEmployeeTreeVO departmentEmployeeTreeVO = SmartBeanUtil.copy(departmentTreeVO, DepartmentEmployeeTreeVO.class); - departmentEmployeeTreeVO.setEmployees(employeeMap.getOrDefault(departmentEmployeeTreeVO.getId(), Lists.newArrayList())); - List children = departmentTreeVO.getChildren(); - if (CollectionUtils.isEmpty(children)) { - continue; - } - List childrenList = this.buildTreeEmployee(children, employeeMap); - departmentEmployeeTreeVO.setChildren(childrenList); - departmentEmployeeTreeVOList.add(departmentEmployeeTreeVO); - } - return departmentEmployeeTreeVOList; - } - - - /** - * 过滤部门名称，获取过滤后的结果 - * - * @author lidoudou - * @date 2019/4/28 20:17 - */ - private List filterDepartment(List departmentVOList, String departmentName) { - Map departmentMap = new HashMap<>(departmentVOList.size()); - departmentVOList.forEach(item -> { - if (!item.getName().contains(departmentName)) { - return; - } - // 当前部门包含关键字 - departmentMap.put(item.getId(), item); - Long parentId = item.getParentId(); - if (null != parentId) { - List filterResult = new ArrayList<>(); - getParentDepartment(departmentVOList, parentId, filterResult); - for (DepartmentVO dto : filterResult) { - if (!departmentMap.containsKey(dto.getId())) { - departmentMap.put(dto.getId(), dto); - } - } - } - }); - return new ArrayList<>(departmentMap.values()); - } - - /** - * 递归获取部门的所有上级元素 - * - * @param departmentVOList - * @param parentId - * @param result - * @return - */ - private List getParentDepartment(List departmentVOList, Long parentId, List result) { - List deptList = departmentVOList.stream().filter(e -> e.getId().equals(parentId)).collect(Collectors.toList()); - for (DepartmentVO item : deptList) { - result.add(item); - if (item.getParentId() != DEFAULT_PARENT_ID && item.getParentId() != null) { - result.addAll(getParentDepartment(departmentVOList, item.getParentId(), result)); - } - } - return result; - } - /** * 新增添加部门 * @@ -145,7 +63,6 @@ public class DepartmentService { public ResponseDTO addDepartment(DepartmentAddForm departmentAddForm) { DepartmentEntity departmentEntity = SmartBeanUtil.copy(departmentAddForm, DepartmentEntity.class); - DepartmentService departmentService = (DepartmentService) AopContext.currentProxy(); departmentDao.insert(departmentEntity); this.clearCache(); return ResponseDTO.ok(); @@ -162,7 +79,7 @@ public class DepartmentService { if (updateDTO.getParentId() == null) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "父级部门id不能为空"); } - DepartmentEntity entity = departmentDao.selectById(updateDTO.getId()); + DepartmentEntity entity = departmentDao.selectById(updateDTO.getDepartmentId()); if (entity == null) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentTreeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentTreeService.java index 3094dae3..ff6835e4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentTreeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/department/service/DepartmentTreeService.java @@ -5,6 +5,7 @@ import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentTreeVO; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -27,7 +28,7 @@ public class DepartmentTreeService { if (CollectionUtils.isEmpty(voList)) { return Lists.newArrayList(); } - List rootList = voList.stream().filter(e -> e.getParentId() == null || Objects.equals(e.getParentId(), DepartmentService.DEFAULT_PARENT_ID)).collect(Collectors.toList()); + List rootList = voList.stream().filter(e -> e.getParentId() == null || Objects.equals(e.getParentId(), NumberUtils.LONG_ZERO)).collect(Collectors.toList()); if (CollectionUtils.isEmpty(rootList)) { return Lists.newArrayList(); } @@ -49,10 +50,10 @@ public class DepartmentTreeService { int nextIndex = i + 1; DepartmentTreeVO node = nodeList.get(i); if (preIndex > -1) { - node.setPreId(nodeList.get(preIndex).getId()); + node.setPreId(nodeList.get(preIndex).getDepartmentId()); } if (nextIndex < nodeSize) { - node.setNextId(nodeList.get(nextIndex).getId()); + node.setNextId(nodeList.get(nextIndex).getDepartmentId()); } buildTree(node, voList); } @@ -65,7 +66,7 @@ public class DepartmentTreeService { * @param voList */ private void buildTree(DepartmentTreeVO node, List voList) { - List children = getChildren(node.getId(), voList); + List children = getChildren(node.getDepartmentId(), voList); if (CollectionUtils.isNotEmpty(children)) { node.setChildren(children); this.buildTree(children, voList); @@ -104,7 +105,7 @@ public class DepartmentTreeService { if (CollectionUtils.isEmpty(children)) { return selfAndChildrenIdList; } - List childrenIdList = children.stream().map(DepartmentTreeVO::getId).collect(Collectors.toList()); + List childrenIdList = children.stream().map(DepartmentTreeVO::getDepartmentId).collect(Collectors.toList()); selfAndChildrenIdList.addAll(childrenIdList); for (Long childId : childrenIdList) { this.selfAndChildrenRecursion(selfAndChildrenIdList, childId, voList); @@ -124,7 +125,7 @@ public class DepartmentTreeService { if (CollectionUtils.isEmpty(children)) { return; } - List childrenIdList = children.stream().map(DepartmentTreeVO::getId).collect(Collectors.toList()); + List childrenIdList = children.stream().map(DepartmentTreeVO::getDepartmentId).collect(Collectors.toList()); selfAndChildrenIdList.addAll(childrenIdList); for (Long childId : childrenIdList) { this.selfAndChildrenRecursion(selfAndChildrenIdList, childId, voList); diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java index 328e2fa8..9f3cc929 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeController.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import net.lab1024.smartadmin.service.common.controller.SystemBaseController; import net.lab1024.smartadmin.service.common.domain.PageResult; import net.lab1024.smartadmin.service.common.util.SmartRequestUtil; +import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import net.lab1024.smartadmin.service.common.annoation.NoValidPrivilege; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeDao.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeDao.java index 4d604e40..14f3ebb0 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeDao.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeDao.java @@ -42,10 +42,10 @@ public interface EmployeeDao extends BaseMapper { /** * 更新单个 * - * @param id + * @param employeeId * @param disabledFlag */ - void updateDisableFlag(@Param("id") Long id, @Param("disabledFlag") Boolean disabledFlag); + void updateDisableFlag(@Param("employeeId") Long employeeId, @Param("disabledFlag") Boolean disabledFlag); /** @@ -100,7 +100,7 @@ public interface EmployeeDao extends BaseMapper { * @param employeeIds * @return */ - List getEmployeeByIds(@Param("ids") Collection employeeIds); + List getEmployeeByIds(@Param("employeeIds") Collection employeeIds); /** @@ -109,7 +109,7 @@ public interface EmployeeDao extends BaseMapper { * @param employeeId * @return */ - EmployeeVO getEmployeeById(@Param("id") Long employeeId); + EmployeeVO getEmployeeById(@Param("employeeId") Long employeeId); /** diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java index e3b10ee1..b44e838c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/entity/EmployeeEntity.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; public class EmployeeEntity { @TableId(type = IdType.AUTO) - private Long id; + private Long employeeId; /** * 登录账号 diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/form/EmployeeUpdateForm.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/form/EmployeeUpdateForm.java index 27d37cea..ba58e7a3 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/form/EmployeeUpdateForm.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/form/EmployeeUpdateForm.java @@ -17,5 +17,5 @@ public class EmployeeUpdateForm extends EmployeeAddForm { @ApiModelProperty("员工id") @NotNull(message = "员工id不能为空") - private Long id; + private Long employeeId; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java index eb56c400..1211371f 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/domain/vo/EmployeeVO.java @@ -19,7 +19,7 @@ import java.util.List; public class EmployeeVO { @ApiModelProperty("主键id") - private Long id; + private Long employeeId; @ApiModelProperty("登录账号") private String loginName; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeManager.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeManager.java similarity index 83% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeManager.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeManager.java index a0af048d..ec8bc9ed 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeManager.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/manager/EmployeeManager.java @@ -1,7 +1,8 @@ -package net.lab1024.smartadmin.service.module.system.employee; +package net.lab1024.smartadmin.service.module.system.employee.manager; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,7 +40,7 @@ public class EmployeeManager extends ServiceImpl { employeeDao.insert(employee); if (CollectionUtils.isNotEmpty(roleIdList)) { - List roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getId())).collect(Collectors.toList()); + List roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList()); roleEmployeeManager.saveBatch(roleEmployeeList); } } @@ -55,8 +56,8 @@ public class EmployeeManager extends ServiceImpl { employeeDao.updateById(employee); if (CollectionUtils.isNotEmpty(roleIdList)) { - List roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getId())).collect(Collectors.toList()); - this.updateEmployeeRole(employee.getId(),roleEmployeeList); + List roleEmployeeList = roleIdList.stream().map(e -> new RoleEmployeeEntity(e, employee.getEmployeeId())).collect(Collectors.toList()); + this.updateEmployeeRole(employee.getEmployeeId(),roleEmployeeList); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeCacheService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java similarity index 95% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeCacheService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java index 908ff739..5dba47ce 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeCacheService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeCacheService.java @@ -1,7 +1,8 @@ -package net.lab1024.smartadmin.service.module.system.employee; +package net.lab1024.smartadmin.service.module.system.employee.service; import lombok.extern.slf4j.Slf4j; import net.lab1024.smartadmin.service.constant.CacheModuleConst; +import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.factory.annotation.Autowired; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java similarity index 95% rename from admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java rename to admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java index a115debd..511ac20c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/EmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/employee/service/EmployeeService.java @@ -1,4 +1,4 @@ -package net.lab1024.smartadmin.service.module.system.employee; +package net.lab1024.smartadmin.service.module.system.employee.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; @@ -11,9 +11,11 @@ import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; import net.lab1024.smartadmin.service.module.system.department.domain.vo.DepartmentVO; import net.lab1024.smartadmin.service.module.system.department.service.DepartmentCacheService; +import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity; import net.lab1024.smartadmin.service.module.system.employee.domain.form.*; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; +import net.lab1024.smartadmin.service.module.system.employee.manager.EmployeeManager; import net.lab1024.smartadmin.service.module.system.login.domain.LoginUserDetail; import net.lab1024.smartadmin.service.module.system.login.domain.RequestEmployee; import net.lab1024.smartadmin.service.module.system.menu.service.MenuEmployeeService; @@ -116,7 +118,7 @@ public class EmployeeService { return ResponseDTO.ok(PageResult); } - List employeeIdList = employeeList.stream().map(EmployeeVO::getId).collect(Collectors.toList()); + List employeeIdList = employeeList.stream().map(EmployeeVO::getEmployeeId).collect(Collectors.toList()); // 查询员工角色 List roleEmployeeEntityList = roleEmployeeDao.selectRoleByEmployeeIdList(employeeIdList); Map> employeeRoleIdListMap = roleEmployeeEntityList.stream().collect(Collectors.groupingBy(RoleEmployeeVO::getEmployeeId, Collectors.mapping(RoleEmployeeVO::getRoleId, Collectors.toList()))); @@ -125,8 +127,8 @@ public class EmployeeService { Map departmentNameMap = departmentCacheService.departmentRouteCache(); employeeList.forEach(e -> { - e.setRoleIdList(employeeRoleIdListMap.getOrDefault(e.getId(), Lists.newArrayList())); - e.setRoleNameList(employeeRoleNameListMap.getOrDefault(e.getId(), Lists.newArrayList())); + e.setRoleIdList(employeeRoleIdListMap.getOrDefault(e.getEmployeeId(), Lists.newArrayList())); + e.setRoleNameList(employeeRoleNameListMap.getOrDefault(e.getEmployeeId(), Lists.newArrayList())); e.setDepartmentName(departmentNameMap.getOrDefault(e.getDepartmentId(), "")); }); PageResult PageResult = SmartPageUtil.convert2PageResult(pageParam, employeeList); @@ -181,7 +183,7 @@ public class EmployeeService { */ public synchronized ResponseDTO updateEmployee(EmployeeUpdateForm employeeUpdateForm) { - Long employeeId = employeeUpdateForm.getId(); + Long employeeId = employeeUpdateForm.getEmployeeId(); EmployeeEntity employeeEntity = employeeDao.selectById(employeeId); if (null == employeeEntity) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); @@ -196,12 +198,12 @@ public class EmployeeService { EmployeeEntity existEntity = employeeDao.getByLoginName(employeeUpdateForm.getLoginName(), false); - if (null != existEntity && !Objects.equals(existEntity.getId(), employeeId)) { + if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "登录名重复"); } existEntity = employeeDao.getByPhone(employeeUpdateForm.getPhone(), false); - if (null != existEntity && !Objects.equals(existEntity.getId(), employeeId)) { + if (null != existEntity && !Objects.equals(existEntity.getEmployeeId(), employeeId)) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "手机号已存在"); } @@ -238,7 +240,6 @@ public class EmployeeService { if (null == employeeEntity) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - employeeDao.updateDisableFlag(employeeId, !employeeEntity.getDisabledFlag()); employeeCacheService.clearCacheByEmployeeId(employeeId); @@ -259,11 +260,10 @@ public class EmployeeService { if (employeeIdList.size() != employeeEntityList.size()) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - + // 更新 List updateList = employeeIdList.stream().map(e -> { - // 更新删除 EmployeeEntity updateEmployee = new EmployeeEntity(); - updateEmployee.setId(e); + updateEmployee.setEmployeeId(e); updateEmployee.setDepartmentId(batchUpdateDepartmentForm.getDepartmentId()); return updateEmployee; }).collect(Collectors.toList()); @@ -271,7 +271,7 @@ public class EmployeeService { // 清除缓存 employeeEntityList.forEach(e -> { - employeeCacheService.clearCacheByEmployeeId(e.getId()); + employeeCacheService.clearCacheByEmployeeId(e.getEmployeeId()); employeeCacheService.clearCacheByDepartmentId(e.getDepartmentId()); }); employeeCacheService.clearCacheByDepartmentId(batchUpdateDepartmentForm.getDepartmentId()); @@ -305,7 +305,7 @@ public class EmployeeService { // 更新密码 EmployeeEntity updateEntity = new EmployeeEntity(); - updateEntity.setId(employeeId); + updateEntity.setEmployeeId(employeeId); updateEntity.setLoginPwd(getEncryptPwd(newPassword)); employeeDao.updateById(updateEntity); @@ -325,7 +325,7 @@ public class EmployeeService { } // 获取部门 List departmentList = departmentCacheService.departmentCache(); - Optional departmentVO = departmentList.stream().filter(e -> e.getId().equals(departmentId)).findFirst(); + Optional departmentVO = departmentList.stream().filter(e -> e.getDepartmentId().equals(departmentId)).findFirst(); if (CollectionUtils.isEmpty(employeeEntityList)) { return ResponseDTO.ok(Collections.emptyList()); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/JwtService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/JwtService.java index 63fc7f27..63275cf4 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/JwtService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/JwtService.java @@ -4,7 +4,7 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; import lombok.extern.slf4j.Slf4j; -import net.lab1024.smartadmin.service.module.system.employee.EmployeeService; +import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeService; import net.lab1024.smartadmin.service.module.system.login.domain.LoginUserDetail; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/LoginService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/LoginService.java index b0d172b2..8427c703 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/LoginService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/login/service/LoginService.java @@ -10,7 +10,7 @@ import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaVO; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; import net.lab1024.smartadmin.service.module.system.employee.EmployeeDao; -import net.lab1024.smartadmin.service.module.system.employee.EmployeeService; +import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeService; import net.lab1024.smartadmin.service.module.system.employee.domain.entity.EmployeeEntity; import net.lab1024.smartadmin.service.module.system.login.domain.LoginForm; import net.lab1024.smartadmin.service.module.system.login.domain.LoginResultVO; @@ -90,21 +90,21 @@ public class LoginService { } // 生成 登录token - String token = jwtService.generateJwtToken(employeeEntity.getId()); + String token = jwtService.generateJwtToken(employeeEntity.getEmployeeId()); // 获取前端菜单以及功能权限 - MenuLoginBO menuLoginBORespDTO = menuEmployeeService.queryMenuTreeByEmployeeId(employeeEntity.getId()); + MenuLoginBO menuLoginBORespDTO = menuEmployeeService.queryMenuTreeByEmployeeId(employeeEntity.getEmployeeId()); // 查询部门 DepartmentEntity departmentEntity = departmentDao.selectById(employeeEntity.getDepartmentId()); // 返回登录结果 LoginResultVO loginResultDTO = SmartBeanUtil.copy(employeeEntity, LoginResultVO.class); - loginResultDTO.setEmployeeId(employeeEntity.getId()); + loginResultDTO.setEmployeeId(employeeEntity.getEmployeeId()); loginResultDTO.setMenuTree(menuLoginBORespDTO.getMenuTree()); loginResultDTO.setMenuList(menuLoginBORespDTO.getMenuList()); loginResultDTO.setAllMenuList(menuLoginBORespDTO.getAllMenuList()); loginResultDTO.setPointsList(menuLoginBORespDTO.getPointsList()); loginResultDTO.setDepartmentName(null == departmentEntity ? StringConst.EMPTY_STR : departmentEntity.getName()); loginResultDTO.setToken(token); - loginResultDTO.setIsSuperMan(menuEmployeeService.isSuperman(employeeEntity.getId())); + loginResultDTO.setIsSuperMan(menuEmployeeService.isSuperman(employeeEntity.getEmployeeId())); return ResponseDTO.ok(loginResultDTO); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/service/MenuEmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/service/MenuEmployeeService.java index 12cb4fa8..c3ab099e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/service/MenuEmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/menu/service/MenuEmployeeService.java @@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.menu.service; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import net.lab1024.smartadmin.service.common.util.SmartStringUtil; -import net.lab1024.smartadmin.service.module.system.employee.EmployeeService; +import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeService; import net.lab1024.smartadmin.service.module.system.login.domain.RequestEmployee; import net.lab1024.smartadmin.service.module.system.menu.constant.MenuTypeEnum; import net.lab1024.smartadmin.service.module.system.menu.domain.bo.MenuLoginBO; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDao.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDao.java index bcf08e11..c893876c 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDao.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDao.java @@ -20,7 +20,11 @@ import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleEntit @Component public interface RoleDao extends BaseMapper { - - RoleEntity getByRoleName(@Param("roleName") String name); + /** + * 根据角色名称查询 + * @param roleName + * @return + */ + RoleEntity getByRoleName(@Param("roleName") String roleName); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDataScopeDao.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDataScopeDao.java index d022dbb3..b50bbd1e 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDataScopeDao.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/dao/RoleDataScopeDao.java @@ -43,10 +43,4 @@ public interface RoleDataScopeDao extends BaseMapper { */ void deleteByRoleId(@Param("roleId") Long roleId); - - /** - * 批量添加设置信息 - * @param list - */ - void batchInsert(@Param("list")List list); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleEntity.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleEntity.java index 5a8bee59..c116119d 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleEntity.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/entity/RoleEntity.java @@ -8,14 +8,11 @@ import lombok.Data; import java.time.LocalDateTime; /** + * * [ 角色 ] - * - * @author yandanyang - * @version 1.0 - * @company 1024lab.net - * @copyright (c) 2018 1024lab.netInc. All rights reserved. - * @date 2019/3/27 0027 下午 13:01 - * @since JDK1.8 + * + * @author 罗伊 + * @date */ @Data @TableName("t_role") @@ -24,7 +21,7 @@ public class RoleEntity { * 主键id */ @TableId(type = IdType.AUTO) - private Long id; + private Long roleId; private String roleName; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/form/RoleUpdateForm.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/form/RoleUpdateForm.java index ecc320d1..f7c60d25 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/form/RoleUpdateForm.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/form/RoleUpdateForm.java @@ -18,7 +18,7 @@ public class RoleUpdateForm extends RoleAddForm { */ @ApiModelProperty("角色id") @NotNull(message = "角色id不能为空") - protected Long id; + protected Long roleId; } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/vo/RoleVO.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/vo/RoleVO.java index 0bf30363..dbaef778 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/vo/RoleVO.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/domain/vo/RoleVO.java @@ -17,7 +17,7 @@ import lombok.Data; public class RoleVO { @ApiModelProperty("角色ID") - private Long id; + private Long roleId; @ApiModelProperty("角色名称") private String roleName; diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/manager/RoleDataScopeManager.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/manager/RoleDataScopeManager.java new file mode 100644 index 00000000..95b7655a --- /dev/null +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/manager/RoleDataScopeManager.java @@ -0,0 +1,29 @@ +package net.lab1024.smartadmin.service.module.system.role.manager; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; +import net.lab1024.smartadmin.service.common.code.UserErrorCode; +import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.module.system.role.dao.RoleDataScopeDao; +import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleDataScopeEntity; +import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleDataScopeUpdateForm; +import net.lab1024.smartadmin.service.module.system.role.domain.vo.RoleDataScopeVO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +/** + * + * [ ] + * + * @author yandanyang + * @date + */ +@Service +public class RoleDataScopeManager extends ServiceImpl { + +} diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleDataScopeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleDataScopeService.java index 3236ab82..51641851 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleDataScopeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleDataScopeService.java @@ -1,17 +1,17 @@ package net.lab1024.smartadmin.service.module.system.role.service; import com.google.common.collect.Lists; +import net.lab1024.smartadmin.service.common.code.UserErrorCode; +import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleDataScopeEntity; +import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleDataScopeUpdateForm; +import net.lab1024.smartadmin.service.module.system.role.domain.vo.RoleDataScopeVO; +import net.lab1024.smartadmin.service.module.system.role.manager.RoleDataScopeManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleDataScopeEntity; -import net.lab1024.smartadmin.service.module.system.role.dao.RoleDataScopeDao; -import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleDataScopeUpdateForm; -import net.lab1024.smartadmin.service.module.system.role.domain.vo.RoleDataScopeVO; -import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import java.util.List; @@ -23,7 +23,7 @@ import java.util.List; public class RoleDataScopeService { @Autowired - private RoleDataScopeDao roleDataScopeDao; + private RoleDataScopeManager roleDataScopeManager; /** @@ -33,7 +33,7 @@ public class RoleDataScopeService { * @return */ public ResponseDTO> getRoleDataScopeList(Long roleId) { - List roleDataScopeEntityList = roleDataScopeDao.listByRoleId(roleId); + List roleDataScopeEntityList = roleDataScopeManager.getBaseMapper().listByRoleId(roleId); if (CollectionUtils.isEmpty(roleDataScopeEntityList)) { return ResponseDTO.ok(Lists.newArrayList()); } @@ -55,8 +55,8 @@ public class RoleDataScopeService { } List roleDataScopeEntityList = SmartBeanUtil.copyList(batchSetList, RoleDataScopeEntity.class); roleDataScopeEntityList.forEach(e -> e.setRoleId(roleDataScopeUpdateForm.getRoleId())); - roleDataScopeDao.deleteByRoleId(roleDataScopeUpdateForm.getRoleId()); - roleDataScopeDao.batchInsert(roleDataScopeEntityList); + roleDataScopeManager.getBaseMapper().deleteByRoleId(roleDataScopeUpdateForm.getRoleId()); + roleDataScopeManager.saveBatch(roleDataScopeEntityList); return ResponseDTO.ok(); } } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java index e4530c5a..fef962e5 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleEmployeeService.java @@ -9,7 +9,7 @@ import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import net.lab1024.smartadmin.service.common.util.SmartPageUtil; import net.lab1024.smartadmin.service.module.system.department.dao.DepartmentDao; import net.lab1024.smartadmin.service.module.system.department.domain.entity.DepartmentEntity; -import net.lab1024.smartadmin.service.module.system.employee.EmployeeCacheService; +import net.lab1024.smartadmin.service.module.system.employee.service.EmployeeCacheService; import net.lab1024.smartadmin.service.module.system.employee.domain.vo.EmployeeVO; import net.lab1024.smartadmin.service.module.system.role.dao.RoleDao; import net.lab1024.smartadmin.service.module.system.role.dao.RoleEmployeeDao; @@ -39,13 +39,10 @@ public class RoleEmployeeService { @Autowired private RoleEmployeeDao roleEmployeeDao; - @Autowired private RoleDao roleDao; - @Autowired private DepartmentDao departmentDao; - @Autowired private RoleEmployeeManager roleEmployeeManager; @Autowired @@ -63,7 +60,7 @@ public class RoleEmployeeService { List departmentIdList = employeeDTOS.stream().filter(e -> e.getDepartmentId() != null).map(EmployeeVO::getDepartmentId).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(departmentIdList)) { List departmentEntities = departmentDao.selectBatchIds(departmentIdList); - Map departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getId, DepartmentEntity::getName)); + Map departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getName)); employeeDTOS.forEach(e -> { e.setDepartmentName(departmentIdNameMap.getOrDefault(e.getDepartmentId(), StringConst.EMPTY_STR)); }); @@ -141,7 +138,7 @@ public class RoleEmployeeService { List roleIds = roleEmployeeDao.selectRoleIdByEmployeeId(employeeId); List roleList = roleDao.selectList(null); List result = SmartBeanUtil.copyList(roleList, RoleSelectedVO.class); - result.stream().forEach(item -> item.setSelected(roleIds.contains(item.getId()))); + result.stream().forEach(item -> item.setSelected(roleIds.contains(item.getRoleId()))); return ResponseDTO.ok(result); } diff --git a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleService.java b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleService.java index b95ae9b8..9d541ec7 100644 --- a/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleService.java +++ b/admin-api/java-api/src/main/java/net/lab1024/smartadmin/service/module/system/role/service/RoleService.java @@ -1,18 +1,18 @@ package net.lab1024.smartadmin.service.module.system.role.service; +import net.lab1024.smartadmin.service.common.code.UserErrorCode; +import net.lab1024.smartadmin.service.common.domain.ResponseDTO; +import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; +import net.lab1024.smartadmin.service.module.system.role.dao.RoleDao; +import net.lab1024.smartadmin.service.module.system.role.dao.RoleEmployeeDao; +import net.lab1024.smartadmin.service.module.system.role.dao.RoleMenuDao; +import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleEntity; +import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleAddForm; +import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleUpdateForm; +import net.lab1024.smartadmin.service.module.system.role.domain.vo.RoleVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import net.lab1024.smartadmin.service.common.code.UserErrorCode; -import net.lab1024.smartadmin.service.common.domain.ResponseDTO; -import net.lab1024.smartadmin.service.module.system.role.dao.RoleDao; -import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleAddForm; -import net.lab1024.smartadmin.service.module.system.role.domain.form.RoleUpdateForm; -import net.lab1024.smartadmin.service.module.system.role.domain.entity.RoleEntity; -import net.lab1024.smartadmin.service.module.system.role.domain.vo.RoleVO; -import net.lab1024.smartadmin.service.module.system.role.dao.RoleEmployeeDao; -import net.lab1024.smartadmin.service.module.system.role.dao.RoleMenuDao; -import net.lab1024.smartadmin.service.common.util.SmartBeanUtil; import java.util.List; @@ -41,9 +41,9 @@ public class RoleService { * @return ResponseDTO */ public ResponseDTO addRole(RoleAddForm roleAddForm) { - RoleEntity employeeRoleEntity = roleDao.getByRoleName(roleAddForm.getRoleName()); - if (null != employeeRoleEntity) { - return ResponseDTO.error(UserErrorCode.ALREADY_EXIST, "角色名称重复"); + RoleEntity existRoleEntity = roleDao.getByRoleName(roleAddForm.getRoleName()); + if (null != existRoleEntity) { + return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "角色名称重复"); } RoleEntity roleEntity = SmartBeanUtil.copy(roleAddForm, RoleEntity.class); roleDao.insert(roleEntity); @@ -76,11 +76,11 @@ public class RoleService { */ @Transactional(rollbackFor = Exception.class) public ResponseDTO updateRole(RoleUpdateForm roleUpdateForm) { - if (null == roleDao.selectById(roleUpdateForm.getId())) { + if (null == roleDao.selectById(roleUpdateForm.getRoleId())) { return ResponseDTO.error(UserErrorCode.DATA_NOT_EXIST); } - RoleEntity employeeRoleEntity = roleDao.getByRoleName(roleUpdateForm.getRoleName()); - if (null != employeeRoleEntity && !employeeRoleEntity.getId().equals(roleUpdateForm.getId())) { + RoleEntity existRoleEntity = roleDao.getByRoleName(roleUpdateForm.getRoleName()); + if (null != existRoleEntity && !existRoleEntity.getRoleId().equals(roleUpdateForm.getRoleId())) { return ResponseDTO.error(UserErrorCode.PARAM_ERROR, "角色名称重复"); } RoleEntity roleEntity = SmartBeanUtil.copy(roleUpdateForm, RoleEntity.class); diff --git a/admin-api/java-api/src/main/resources/mapper/system/department/DepartmentMapper.xml b/admin-api/java-api/src/main/resources/mapper/system/department/DepartmentMapper.xml index fba0b90d..dc0a0388 100644 --- a/admin-api/java-api/src/main/resources/mapper/system/department/DepartmentMapper.xml +++ b/admin-api/java-api/src/main/resources/mapper/system/department/DepartmentMapper.xml @@ -2,9 +2,6 @@ - - - diff --git a/admin-api/java-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/admin-api/java-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml index 5878acd7..4ed4ffd9 100644 --- a/admin-api/java-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml +++ b/admin-api/java-api/src/main/resources/mapper/system/employee/EmployeeMapper.xml @@ -7,7 +7,7 @@ e.*, d.name AS departmentName FROM t_employee e - LEFT JOIN t_department d ON d.id = e.department_id + LEFT JOIN t_department d ON d.department_id = e.department_id AND ( @@ -29,7 +29,7 @@ UPDATE t_employee SET disabled_flag = #{disabledFlag} - WHERE id = #{id} + WHERE employee_id = #{employeeId} @@ -113,7 +113,7 @@ - SELECT id + SELECT employee_id FROM t_employee @@ -139,7 +139,7 @@ SELECT * FROM t_employee - where id IN - + where employee_id IN + #{item} ORDER BY create_time DESC @@ -164,14 +164,14 @@ SELECT e.*, d.name AS departmentName FROM t_employee e - LEFT JOIN t_department d ON d.id = e.department_id - where e.id = #{id} + LEFT JOIN t_department d ON d.department_id = e.department_id + where e.employee_id = #{employeeId} UPDATE t_employee SET login_pwd = #{password} - WHERE id = #{employeeId} + WHERE employee_id = #{employeeId} diff --git a/admin-api/java-api/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml b/admin-api/java-api/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml index 1cfc5297..a08bf1a2 100644 --- a/admin-api/java-api/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml +++ b/admin-api/java-api/src/main/resources/mapper/system/role/RoleDataScopeMapper.xml @@ -20,17 +20,5 @@ WHERE role_id = #{roleId} - - INSERT INTO t_role_data_scope (data_scope_type,view_type,role_id,update_time,create_time) VALUES - - ( - #{item.dataScopeType}, - #{item.viewType}, - #{item.roleId}, - now(), - now() - ) - - \ No newline at end of file