ycl-common/src/main/java/com/ycl/dto/user/AdminDepartDTO.java
@@ -11,7 +11,7 @@ */ public class AdminDepartDTO { @Data @ApiModel @ApiModel("负责人信息") public static class UserInfoDTO { @ApiModelProperty(value = "用户Id") private Long userId; ycl-common/src/main/java/com/ycl/entity/depart/SccgDepart.java
@@ -3,14 +3,12 @@ import com.baomidou.mybatisplus.annotation.*; import com.ycl.api.BaseEntity; import com.ycl.dto.user.AdminDepartDTO; import com.ycl.entity.user.UmsAdminDepart; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import java.io.Serializable; import java.util.Date; import java.util.List; /** ycl-common/src/main/java/com/ycl/entity/user/UmsDepartManage.java
File was renamed from ycl-common/src/main/java/com/ycl/entity/user/UmsAdminDepart.java @@ -6,10 +6,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import org.apache.catalina.LifecycleState; import java.io.Serializable; import java.util.Date; /** * <p> @@ -21,9 +19,9 @@ */ @Getter @Setter @TableName("ums_admin_depart") @ApiModel(value = "UmsAdminDepart对象", description = "") public class UmsAdminDepart extends BaseEntity implements Serializable { @TableName("ums_depart_manager") @ApiModel(value = "UmsDepartManager对象", description = "") public class UmsDepartManage extends BaseEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -35,7 +33,4 @@ @ApiModelProperty("部门id") private Long departId; @ApiModelProperty("是否是管理员，0->false,1->true，默认0") private Boolean isManager; } ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminDepartMapper.java
File was deleted ycl-common/src/main/java/com/ycl/mapper/user/UmsDepartManageMapper.java
New file @@ -0,0 +1,23 @@ package com.ycl.mapper.user; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ycl.entity.user.UmsDepartManage; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> * Mapper 接口 * </p> * * @author lyq * @since 2022-09-09 */ public interface UmsDepartManageMapper extends BaseMapper<UmsDepartManage> { void deletedByDepartId(@Param("departId") long departId); List<UmsDepartManage> selectPageByUserId(@Param("userId") long userId, @Param("current") int current, @Param("pageSize") int pageSize); } ycl-common/src/main/java/com/ycl/service/depart/impl/SccgDepartServiceImpl.java
@@ -5,17 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.api.BasePageDTO; import com.ycl.api.CommonResult; import com.ycl.dto.user.AdminDepartDTO; import com.ycl.entity.depart.SccgDepart; import com.ycl.entity.user.UmsAdminDepart; import com.ycl.entity.user.UmsDepartManage; import com.ycl.enums.common.ResultCode; import com.ycl.exception.ApiException; import com.ycl.mapper.depart.SccgDepartMapper; import com.ycl.mapper.user.UmsAdminDepartMapper; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsAdminDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminService; import com.ycl.utils.common.PojoUtils; import com.ycl.vo.depart.DepartVO; @@ -25,7 +22,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.xml.transform.Result; import java.util.List; import java.util.stream.Collectors; @@ -42,7 +38,7 @@ @Resource private SccgDepartMapper sccgDepartMapper; @Resource private UmsAdminDepartService umsAdminDepartService; private UmsDepartManageService umsAdminDepartService; @Resource private UmsAdminService umsAdminService; @@ -76,22 +72,23 @@ if (null != sccgDepart && sccgDepart.getId() != updateDepartVO.getId()) { throw new ApiException(ResultCode.RECORD_ALREADY_EXISTS); } BeanUtils.copyProperties(updateDepartVO, sccgDepart); SccgDepart depart = this.getById(updateDepartVO.getId()); BeanUtils.copyProperties(updateDepartVO, depart); List<Long> userIds = updateDepartVO.getUserIds(); if (CollUtil.isNotEmpty(userIds)) { Long departId = updateDepartVO.getId(); List<UmsAdminDepart> departList = umsAdminDepartService.queryByDepartId(departId); List<UmsDepartManage> departList = umsAdminDepartService.queryByDepartId(departId); if (CollUtil.isNotEmpty(departList)) { umsAdminDepartService.deletedByDepartId(departId); } userIds.forEach(e -> { UmsAdminDepart adminDepart = new UmsAdminDepart(); UmsDepartManage adminDepart = new UmsDepartManage(); adminDepart.setDepartId(departId); adminDepart.setUserId(e); umsAdminDepartService.save(adminDepart); }); } if (sccgDepartMapper.updateById(sccgDepart) <= 0) { if (sccgDepartMapper.updateById(depart) <= 0) { throw new ApiException(ResultCode.RECORD_UPDATE_FAIL); } } @@ -140,7 +137,7 @@ //负责人 if (CollUtil.isNotEmpty(records)) { for (SccgDepart record : records) { List<UmsAdminDepart> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId()); List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId()); if (CollUtil.isNotEmpty(umsAdminDeparts)) { List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> { AdminDepartDTO.UserInfoDTO userInfoDTO = new AdminDepartDTO.UserInfoDTO(); ycl-common/src/main/java/com/ycl/service/user/UmsAdminDepartService.java
File was deleted ycl-common/src/main/java/com/ycl/service/user/UmsDepartManageService.java
New file @@ -0,0 +1,26 @@ package com.ycl.service.user; import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.api.BasePageDTO; import com.ycl.entity.user.UmsDepartManage; import java.util.List; /** * <p> * 服务类 * </p> * * @author lyq * @since 2022-09-09 */ public interface UmsDepartManageService extends IService<UmsDepartManage> { List<UmsDepartManage> queryByDepartId(Long departId); List<UmsDepartManage> queryByUserId(long userId); void deletedByDepartId(long departId); BasePageDTO belongDepart(long userId, int current, int pageSize); } ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -20,7 +20,7 @@ import com.ycl.service.depart.SccgDepartService; import com.ycl.service.redis.RedisService; import com.ycl.service.user.UmsAdminCacheService; import com.ycl.service.user.UmsAdminDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminRoleRelationService; import com.ycl.service.user.UmsAdminService; import com.ycl.utils.JwtTokenUtil; @@ -76,7 +76,7 @@ @Resource private SccgDepartService sccgDepartService; @Resource private UmsAdminDepartService umsAdminDepartService; private UmsDepartManageService umsAdminDepartService; @Resource private RedisService redisService;
File was renamed from ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminDepartServiceImpl.java @@ -2,18 +2,14 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.api.BasePageDTO; import com.ycl.api.CommonPage; import com.ycl.dto.user.AdminDepartInfoDTO; import com.ycl.entity.depart.SccgDepart; import com.ycl.entity.user.UmsAdmin; import com.ycl.entity.user.UmsAdminDepart; import com.ycl.mapper.user.UmsAdminDepartMapper; import com.ycl.entity.user.UmsDepartManage; import com.ycl.mapper.user.UmsDepartManageMapper; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsAdminDepartService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminService; import com.ycl.vo.depart.DepartVO; import org.springframework.stereotype.Service; @@ -31,20 +27,19 @@ * @since 2022-09-09 */ @Service public class UmsAdminDepartServiceImpl extends ServiceImpl<UmsAdminDepartMapper, UmsAdminDepart> implements UmsAdminDepartService { public class UmsDepartManageServiceImpl extends ServiceImpl<UmsDepartManageMapper, UmsDepartManage> implements UmsDepartManageService { @Resource private UmsAdminDepartMapper umsAdminDepartMapper; private UmsDepartManageMapper umsDepartManageMapper; @Resource private SccgDepartService sccgDepartService; @Resource private UmsAdminService umsAdminService; @Override public List<UmsAdminDepart> queryByDepartId(Long departId) { List<UmsAdminDepart> umsAdminDeparts = umsAdminDepartMapper.selectList(new LambdaQueryWrapper<UmsAdminDepart>() .eq(UmsAdminDepart::getDepartId, departId) .eq(UmsAdminDepart::getIsManager, 1)); public List<UmsDepartManage> queryByDepartId(Long departId) { List<UmsDepartManage> umsAdminDeparts = umsDepartManageMapper.selectList(new LambdaQueryWrapper<UmsDepartManage>() .eq(UmsDepartManage::getDepartId, departId)); if (CollUtil.isNotEmpty(umsAdminDeparts)) { return umsAdminDeparts; } @@ -52,8 +47,8 @@ } @Override public List<UmsAdminDepart> queryByUserId(long userId) { List<UmsAdminDepart> umsAdminDeparts = umsAdminDepartMapper.selectList(new LambdaQueryWrapper<UmsAdminDepart>().eq(UmsAdminDepart::getUserId, userId)); public List<UmsDepartManage> queryByUserId(long userId) { List<UmsDepartManage> umsAdminDeparts = umsDepartManageMapper.selectList(new LambdaQueryWrapper<UmsDepartManage>().eq(UmsDepartManage::getUserId, userId)); if (CollUtil.isNotEmpty(umsAdminDeparts)) { return umsAdminDeparts; } @@ -62,20 +57,20 @@ @Override public void deletedByDepartId(long departId) { umsAdminDepartMapper.deletedByDepartId(departId); umsDepartManageMapper.deletedByDepartId(departId); } @Override public BasePageDTO belongDepart(long userId, int current, int pageSize) { BasePageDTO basePageDTO = new BasePageDTO(); Long count = umsAdminDepartMapper.selectCount(new LambdaQueryWrapper<UmsAdminDepart>().eq(UmsAdminDepart::getUserId, userId)); Long count = umsDepartManageMapper.selectCount(new LambdaQueryWrapper<UmsDepartManage>().eq(UmsDepartManage::getUserId, userId)); basePageDTO.setTotal(count); if (count > 0) { current = (current - 1) * pageSize; List<UmsAdminDepart> departList = umsAdminDepartMapper.selectPageByUserId(userId, current, pageSize); List<UmsDepartManage> departList = umsDepartManageMapper.selectPageByUserId(userId, current, pageSize); List<DepartVO.AdminDepartInfoVO> adminDepartInfoVOS = new ArrayList<>(); DepartVO.AdminDepartInfoVO adminDepartInfoVO = null; for (UmsAdminDepart umsAdminDepart : departList) { for (UmsDepartManage umsAdminDepart : departList) { adminDepartInfoVO = new DepartVO.AdminDepartInfoVO(); SccgDepart sccgDepart = sccgDepartService.loadDepartById(umsAdminDepart.getDepartId()); UmsAdmin umsAdmin = umsAdminService.getById(userId); ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java
@@ -71,7 +71,7 @@ @ApiModelProperty("父级id,默认0") private Long parentId; @ApiModelProperty("用户Id集合") @ApiModelProperty("负责人Id集合") private List<Long> userIds; // @ApiModelProperty("停用状态，0->false,1->true,默认停用") ycl-common/src/main/resources/mapper/depart/SccgDepartMapper.xml
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.depart.mapper.SccgDepartMapper"> <mapper namespace="com.ycl.mapper.depart.SccgDepartMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.depart.SccgDepart"> ycl-common/src/main/resources/mapper/user/UmsDepartManageMapper.xml
File was renamed from ycl-common/src/main/resources/mapper/user/UmsAdminDepartMapper.xml @@ -1,32 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ycl.mapper.user.UmsAdminDepartMapper"> <mapper namespace="com.ycl.mapper.user.UmsDepartManageMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsAdminDepart"> <resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsDepartManage"> <id column="id" property="id"/> <result column="user_id" property="userId"/> <result column="depart_id" property="departId"/> <result column="is_manager" property="isManager"/> <result column="create_time" property="createTime"/> <result column="update_time" property="updateTime"/> </resultMap> <!-- 通用查询结果列 --> <sql id="Base_Column_List"> id , user_id,depart_id,is_manager,create_time,update_time , user_id,depart_id,create_time,update_time </sql> <delete id="deletedByDepartId"> delete from ums_admin_depart from ums_depart_manager where depart_id = #{departId} </delete> <select id="selectPageByUserId" resultMap="BaseResultMap"> select <include refid="Base_Column_List"/> from ums_admin_depart from ums_depart_manager where user_id=#{userId} limit #{current},#{pageSize} </select> ycl-platform/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -2,20 +2,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ycl.api.BasePageDTO; import com.ycl.api.BasePageVO; import com.ycl.api.CommonPage; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; import com.ycl.dto.user.AdminDepartInfoDTO; import com.ycl.entity.auth.Operator; import com.ycl.entity.depart.SccgDepart; import com.ycl.entity.user.UmsAdminDepart; import com.ycl.entity.user.UmsMenu; import com.ycl.service.depart.SccgDepartService; import com.ycl.service.user.UmsAdminDepartService; import com.ycl.service.user.UmsMenuService; import com.ycl.service.user.UmsDepartManageService; import com.ycl.vo.depart.DepartVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -42,7 +35,7 @@ @Autowired private SccgDepartService departService; @Resource private UmsAdminDepartService umsAdminDepartService; private UmsDepartManageService umsAdminDepartService; @ApiOperation("添加部门") @PostMapping(value = "/create")
