From 0a71b2c8ea2e8ca9969111187e66260ce518b7b5 Mon Sep 17 00:00:00 2001 From: wl <173@qq.com> Date: 星期日, 09 十月 2022 15:02:45 +0800 Subject: [PATCH] 类型查询 部门添加修改 查询修改 --- ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java | 44 +++++- ycl-common/src/main/java/com/ycl/service/depart/impl/DepartManagerServiceImpl.java | 20 ++ ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java | 15 ++ ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java | 2 ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java | 65 +++++++++ ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java | 3 ycl-common/src/main/java/com/ycl/entity/dict/DataDictionary.java | 92 +++++++++++++ ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 5 ycl-common/src/main/java/com/ycl/service/depart/IDepartManagerService.java | 16 ++ ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java | 39 +++++ ycl-common/src/main/java/com/ycl/mapper/depart/DepartManagerMapper.java | 16 ++ ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java | 5 ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java | 53 +++++++ ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml | 20 ++ 14 files changed, 380 insertions(+), 15 deletions(-) diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java index bcd0613..0a7d69e 100644 --- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java +++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java @@ -11,6 +11,7 @@ import com.ycl.service.user.UmsDepartManageService; import com.ycl.utils.auth.UserAuthUtil; import com.ycl.vo.depart.DepartVO; +import com.ycl.vo.depart.UmsDepartVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -99,8 +100,8 @@ @ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬") @GetMapping(value = "/page") - public CommonResult<IPage<UmsDepart>> page(DepartVO.PageDepartVO params) { - IPage<UmsDepart> page = departService.pageDepart(params); + public CommonResult<IPage<UmsDepartVO>> page(DepartVO.PageDepartVO params) { + IPage<UmsDepartVO> page = departService.pageDepart(params); return CommonResult.success(page); } diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java b/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java new file mode 100644 index 0000000..acbf209 --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/entity/depart/DepartManager.java @@ -0,0 +1,65 @@ +package com.ycl.entity.depart; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * <p> + * + * </p> + * + * @author zhanghua + * @since 2022-10-09 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_depart_manager") +public class DepartManager implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 鐢ㄦ埛id + */ + @TableField("user_id") + private Long userId; + + /** + * 閮ㄩ棬id + */ + @TableField("depart_id") + private Long departId; + + /** + * 鍒涘缓鏃堕棿 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 淇敼鏃堕棿 + */ + @TableField("update_time") + private LocalDateTime updateTime; + + /** + * 鏄惁鏄瀵� + */ + @TableField("is_leader") + private Integer isLeader; + + +} diff --git a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java index 1d38845..7c8cf83 100644 --- a/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java +++ b/ycl-common/src/main/java/com/ycl/entity/depart/UmsDepart.java @@ -38,7 +38,7 @@ private String departDes; @ApiModelProperty("閮ㄩ棬绫诲瀷") - private byte departType; + private Integer departType; @ApiModelProperty("鐖剁骇id,榛樿0") private Long parentId; diff --git a/ycl-common/src/main/java/com/ycl/entity/dict/DataDictionary.java b/ycl-common/src/main/java/com/ycl/entity/dict/DataDictionary.java new file mode 100644 index 0000000..5cbe0eb --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/entity/dict/DataDictionary.java @@ -0,0 +1,92 @@ +package com.ycl.entity.dict; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * <p> + * + * </p> + * + * @author lyq + * @since 2022-09-15 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("ums_data_dictionary") +@ApiModel(value = "瀛楀吀琛�") +public class DataDictionary implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 涓婚敭 + */ + @TableId(value = "id", type = IdType.AUTO) + @ApiModelProperty(value = "涓婚敭",dataType = "Long") + private Long id; + + /** + * 瀛楀吀鍊� + */ + @TableField("name") + @ApiModelProperty(value = "杩濊涓殑绫诲瀷/澶х被/灏忕被/妗堢敱,杩濆缓涓殑/绫诲瀷/绫诲埆",dataType = "String") + @NotBlank(message = "瀛楀吀鍊间负绌�") + private String name; + + /** + * 缂栫爜 + */ + @TableField("code") + @ApiModelProperty(value = "缂栫爜 ps:鏆傛椂涓嶄紶",dataType = "String") + private String code; + + /** + * 鐖剁骇id + */ + @TableField("parent_id") + @ApiModelProperty(value = "鐖剁骇id ps:涓轰笂涓�绾х殑id",dataType = "String") + private Integer parentId; + + /** + * 灞傜骇 + */ + @TableField("level") + @ApiModelProperty(value = "绾у埆:杩濊涓被鍨�/澶х被/灏忕被/妗堢敱 鍒嗗埆鏄�1/2/3/4 ,杩濆缓涓被鍨�/绫诲埆 鍒嗗埆鏄�1/2",dataType = "Integer") + @NotNull(message = "灞傜骇涓虹┖") + private Short level; + + /** + * 瀛楀吀绫诲瀷 + */ + @TableField("type_name") + @ApiModelProperty(value = "瀛楀吀绫诲瀷:杩濊涓洪棶棰樼被鍨�,杩濆缓涓鸿繚寤虹被鍨�",dataType = "String") + @NotBlank(message = "瀛楀吀绫诲瀷涓虹┖") + private String typeName; + + /** + * 瀛楀吀绫诲瀷浠g爜 + */ + @TableField("type_code") + @ApiModelProperty(value = "瀛楀吀绫诲瀷浠g爜:杩濊涓�'01',杩濆缓涓�'06'",dataType = "String") + @NotBlank(message = "瀛楀吀绫诲瀷涓虹┖") + private String typeCode; + + /** + * 澶囨敞 + */ + @TableField("remark") + @ApiModelProperty(value = "澶囨敞 ps:棰勭暀瀛楁",dataType = "String") + private String remark; + +} diff --git a/ycl-common/src/main/java/com/ycl/mapper/depart/DepartManagerMapper.java b/ycl-common/src/main/java/com/ycl/mapper/depart/DepartManagerMapper.java new file mode 100644 index 0000000..5d77dd4 --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/mapper/depart/DepartManagerMapper.java @@ -0,0 +1,16 @@ +package com.ycl.mapper.depart; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.depart.DepartManager; + +/** + * <p> + * Mapper 鎺ュ彛 + * </p> + * + * @author zhanghua + * @since 2022-10-09 + */ +public interface DepartManagerMapper extends BaseMapper<DepartManager> { + +} diff --git a/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java b/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java new file mode 100644 index 0000000..2cc3748 --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java @@ -0,0 +1,15 @@ +package com.ycl.mapper.dict; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ycl.entity.dict.DataDictionary; + +/** + * <p> + * Mapper 鎺ュ彛 + * </p> + * + * @author lyq + * @since 2022-09-15 + */ +public interface DataDictionaryMapper extends BaseMapper<DataDictionary> { +} diff --git a/ycl-common/src/main/java/com/ycl/service/depart/IDepartManagerService.java b/ycl-common/src/main/java/com/ycl/service/depart/IDepartManagerService.java new file mode 100644 index 0000000..6115ce8 --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/service/depart/IDepartManagerService.java @@ -0,0 +1,16 @@ +package com.ycl.service.depart; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ycl.entity.depart.DepartManager; + +/** + * <p> + * 鏈嶅姟绫� + * </p> + * + * @author zhanghua + * @since 2022-10-09 + */ +public interface IDepartManagerService extends IService<DepartManager> { + +} diff --git a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java index 06e0a45..50f9d50 100644 --- a/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java +++ b/ycl-common/src/main/java/com/ycl/service/depart/UmsDepartService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ycl.entity.depart.UmsDepart; import com.ycl.vo.depart.DepartVO; +import com.ycl.vo.depart.UmsDepartVO; import java.util.List; @@ -55,7 +56,7 @@ * @param params * @return */ - IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params); + IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params); /** * 淇敼鐘舵�� diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/DepartManagerServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/DepartManagerServiceImpl.java new file mode 100644 index 0000000..67bd3a0 --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/DepartManagerServiceImpl.java @@ -0,0 +1,20 @@ +package com.ycl.service.depart.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ycl.entity.depart.DepartManager; +import com.ycl.mapper.depart.DepartManagerMapper; +import com.ycl.service.depart.IDepartManagerService; +import org.springframework.stereotype.Service; + +/** + * <p> + * 鏈嶅姟瀹炵幇绫� + * </p> + * + * @author zhanghua + * @since 2022-10-09 + */ +@Service +public class DepartManagerServiceImpl extends ServiceImpl<DepartManagerMapper, DepartManager> implements IDepartManagerService { + +} diff --git a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java index 0d55321..9865d23 100644 --- a/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java +++ b/ycl-common/src/main/java/com/ycl/service/depart/impl/UmsDepartServiceImpl.java @@ -7,21 +7,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ycl.dto.user.AdminDepartDTO; import com.ycl.entity.depart.UmsDepart; +import com.ycl.entity.dict.DataDictionary; import com.ycl.entity.user.UmsDepartManage; import com.ycl.enums.common.ResultCode; import com.ycl.exception.ApiException; import com.ycl.mapper.depart.UmsDepartMapper; +import com.ycl.mapper.dict.DataDictionaryMapper; +import com.ycl.service.depart.IDepartManagerService; import com.ycl.service.depart.UmsDepartService; -import com.ycl.service.user.UmsDepartManageService; import com.ycl.service.user.UmsAdminService; +import com.ycl.service.user.UmsDepartManageService; import com.ycl.utils.common.PojoUtils; import com.ycl.vo.depart.DepartVO; +import com.ycl.vo.depart.UmsDepartVO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -41,6 +47,12 @@ private UmsDepartManageService umsAdminDepartService; @Resource private UmsAdminService umsAdminService; + @Resource + IDepartManagerService iDepartManagerService; + @Resource + UmsDepartService umsDepartService; + @Resource + DataDictionaryMapper dataDictionaryMapper; @Override @Transactional(rollbackFor = Exception.class) @@ -51,9 +63,13 @@ } UmsDepart depart = new UmsDepart(); BeanUtils.copyProperties(addDepartVO, depart); - if (sccgDepartMapper.insert(depart) != 1) { - throw new ApiException(ResultCode.RECORD_SAVE_FAIL); - } + umsDepartService.save(depart); + addDepartVO.getDepartManagerList() + .forEach(item -> { + item.setCreateTime(LocalDateTime.now()); + item.setDepartId(depart.getId()); + }); + iDepartManagerService.saveBatch(addDepartVO.getDepartManagerList()); } @Override @@ -122,7 +138,7 @@ } @Override - public IPage<UmsDepart> pageDepart(DepartVO.PageDepartVO params) { + public IPage<UmsDepartVO> pageDepart(DepartVO.PageDepartVO params) { Page<UmsDepart> page = new Page<>(params.getCurrent(), params.getPageSize()); LambdaQueryWrapper<UmsDepart> query = new LambdaQueryWrapper<>(); if (StringUtils.isNotBlank(params.getDepartName())) { @@ -133,10 +149,19 @@ } query.orderByDesc(UmsDepart::getCreateTime); Page<UmsDepart> departPage = sccgDepartMapper.selectPage(page, query); - List<UmsDepart> records = departPage.getRecords(); + Page<UmsDepartVO> umsDepartVOPage = new Page<>(); + BeanUtils.copyProperties(departPage, umsDepartVOPage); + List<UmsDepartVO> umsDepartVOList = new ArrayList<>(); //璐熻矗浜� - if (CollUtil.isNotEmpty(records)) { - for (UmsDepart record : records) { + if (CollUtil.isNotEmpty(departPage.getRecords())) { + for (UmsDepart record : departPage.getRecords()) { + UmsDepartVO umsDepartVO = new UmsDepartVO(); + BeanUtils.copyProperties(record, umsDepartVO); + umsDepartVO.setDepartType(dataDictionaryMapper + .selectOne(new LambdaQueryWrapper<DataDictionary>() + .eq(DataDictionary::getId, record.getDepartType())) + .getName()); + umsDepartVOList.add(umsDepartVO); List<UmsDepartManage> umsAdminDeparts = umsAdminDepartService.queryByDepartId(record.getId()); if (CollUtil.isNotEmpty(umsAdminDeparts)) { List<AdminDepartDTO.UserInfoDTO> userInfoDTOS = umsAdminDeparts.stream().map(a -> { @@ -149,7 +174,8 @@ } } } - return departPage; + umsDepartVOPage.setRecords(umsDepartVOList); + return umsDepartVOPage; } @Override diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java index d1639f4..d2efd2b 100644 --- a/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java +++ b/ycl-common/src/main/java/com/ycl/vo/depart/DepartVO.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.ycl.api.BasePageVO; +import com.ycl.entity.depart.DepartManager; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -31,6 +32,8 @@ @ApiModelProperty("鐖剁骇id,榛樿0") private Long parentId; + @ApiModelProperty("娣诲姞鐢ㄦ埛") + private List<DepartManager> departManagerList; // @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤") // private byte status; } @@ -100,7 +103,7 @@ private String departDes; @ApiModelProperty("閮ㄩ棬绫诲瀷") - private byte departType; + private Integer departType; @ApiModelProperty("鐢ㄦ埛Id") private Long userId; diff --git a/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java new file mode 100644 index 0000000..022851b --- /dev/null +++ b/ycl-common/src/main/java/com/ycl/vo/depart/UmsDepartVO.java @@ -0,0 +1,53 @@ +package com.ycl.vo.depart; + +import com.baomidou.mybatisplus.annotation.*; +import com.ycl.api.BaseEntity; +import com.ycl.dto.user.AdminDepartDTO; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; + +import java.io.Serializable; +import java.util.List; + +/** + * <p> + * 閮ㄩ棬琛� + * </p> + * + * @author lyq + * @since 2022-09-07 + */ +@Getter +@Setter +@ApiModel(value = "umsDepartVO", description = "閮ㄩ棬琛�") +public class UmsDepartVO { + + @ApiModelProperty("涓婚敭") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + @ApiModelProperty("閮ㄩ棬鍚嶇О") + private String departName; + + @ApiModelProperty("閮ㄩ棬鎻忚堪") + private String departDes; + + @ApiModelProperty("閮ㄩ棬绫诲瀷") + private String departType; + + @ApiModelProperty("鐖剁骇id,榛樿0") + private Long parentId; + + @ApiModelProperty("鍋滅敤鐘舵�侊紝0->false,1->true,榛樿鍋滅敤") + private byte status; + + /** + * 閫昏緫鍒犻櫎 0:false 1:true 榛樿0 + */ + @ApiModelProperty(value = "鏄惁鍒犻櫎", hidden = true) + @TableField(select = false) + @TableLogic() + private byte isDeleted; +} diff --git a/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml b/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml new file mode 100644 index 0000000..1b425d7 --- /dev/null +++ b/ycl-common/src/main/resources/mapper/depart/DepartManagerMapper.xml @@ -0,0 +1,20 @@ +<?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.depart.DepartManagerMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.ycl.entity.depart.DepartManager"> + <id column="id" property="id" /> + <result column="user_id" property="userId" /> + <result column="depart_id" property="departId" /> + <result column="create_time" property="createTime" /> + <result column="update_time" property="updateTime" /> + <result column="is_leader" property="isLeader" /> + </resultMap> + + <!-- 閫氱敤鏌ヨ缁撴灉鍒� --> + <sql id="Base_Column_List"> + id, user_id, depart_id, create_time, update_time, is_leader + </sql> + +</mapper> diff --git a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java index 79df82e..f4f179c 100644 --- a/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java +++ b/ycl-platform/src/main/java/com/ycl/controller/dict/DatabaseDictionaryController.java @@ -1,6 +1,7 @@ package com.ycl.controller.dict; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ycl.api.CommonResult; import com.ycl.controller.BaseController; import com.ycl.entity.dict.DataDictionary; @@ -38,8 +39,44 @@ @GetMapping("/queryByCode") @ApiOperation(("/鏍规嵁code鑾峰彇瀛楁淇℃伅")) - private CommonResult<DataDictionary> queryByCode(@RequestParam(value = "code") String code){ + private CommonResult<DataDictionary> queryByCode(@RequestParam(value = "code") String code) { DataDictionary dataDictionary = iDatabaseDictionaryService.queryByCode(code); return CommonResult.success(dataDictionary); } + + @GetMapping("/query_user_type") + @ApiOperation("鏌ヨ鐢ㄦ埛绫诲瀷") + private CommonResult queryUserType() { + String level = "1"; + String typeCode = "07"; + return CommonResult.success(iDatabaseDictionaryService + .list(new LambdaQueryWrapper<DataDictionary>() + .eq(DataDictionary::getLevel, level) + .eq(DataDictionary::getTypeCode, typeCode) + )); + } + + @GetMapping("/query_role_type") + @ApiOperation("鏌ヨ瑙掕壊绫诲瀷") + private CommonResult queryRoleType() { + String level = "1"; + String typeCode = "09"; + return CommonResult.success(iDatabaseDictionaryService + .list(new LambdaQueryWrapper<DataDictionary>() + .eq(DataDictionary::getLevel, level) + .eq(DataDictionary::getTypeCode, typeCode) + )); + } + + @GetMapping("/query_depart_type") + @ApiOperation("鏌ヨ閮ㄩ棬绫诲瀷") + private CommonResult queryDepartType() { + String level = "1"; + String typeCode = "08"; + return CommonResult.success(iDatabaseDictionaryService + .list(new LambdaQueryWrapper<DataDictionary>() + .eq(DataDictionary::getLevel, level) + .eq(DataDictionary::getTypeCode, typeCode) + )); + } } -- Gitblit v1.8.0