Merge branch 'master' of http://git.ningdatech.com/liushuai/project-management

ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java

@@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig {
     }
 
     public static void main(String[] args) {
-        generate("WendyYang", "projectlib", PATH_YYD, "nd_project_renewal_fund_declaration");
+        generate("Liuxinxin", "expert", PATH_LXX, "expert_intention_work_region");
     }
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/common/constant/BoolDisplayEnum.java

@@ -0,0 +1,32 @@
+package com.ningdatech.pmapi.common.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/26 上午9:21
+ */
+@AllArgsConstructor
+@Getter
+public enum BoolDisplayEnum {
+
+    /**
+     * true
+     */
+    Y,
+
+    /**
+     * false
+     */
+    N;
+
+    public static boolean judgeBoolean(String key) {
+        return Y.name().equals(key);
+    }
+
+    public static BoolDisplayEnum judgeBoolean(boolean key) {
+        return key ? Y : N;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java

@@ -8,6 +8,7 @@ import org.springframework.util.NumberUtils;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -63,4 +64,9 @@ public class BizUtils {
         }
         return result;
     }
+
+    public static String uuid32() {
+        return UUID.randomUUID().toString().replace("-", "");
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertController.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.expert.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Controller
+@RequestMapping("/api/v1/expert")
+public class ExpertController {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/controller/ExpertIntentionWorkRegionController.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.expert.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Controller
+@RequestMapping("/pmapi.expert/expert-intention-work-region")
+public class ExpertIntentionWorkRegionController {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertIntentionWorkRegion.java

@@ -0,0 +1,39 @@
+package com.ningdatech.pmapi.expert.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@TableName("expert_intention_work_region")
+@Data
+@ApiModel(value = "ExpertIntentionWorkRegion对象", description = "")
+public class ExpertIntentionWorkRegion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long userId;
+
+    private String regionCode;
+
+    private Integer regionLevel;
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/entity/ExpertUserFullInfo.java

@@ -0,0 +1,108 @@
+package com.ningdatech.pmapi.expert.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@TableName("nd_expert_user_full_info")
+@Data
+@ApiModel(value = "NdExpertUserFullInfo对象", description = "")
+public class ExpertUserFullInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long userId;
+
+    private String expertAccountStatus;
+
+    private String isDingUser;
+
+    private String userInfoStep;
+
+    private String phoneNo;
+
+    private String gender;
+
+    private String expertName;
+
+    private String avatarFileId;
+
+    private String idCard;
+
+    private String officePhone;
+
+    private String bankNo;
+
+    private String bank;
+
+    private String email;
+
+    private String school;
+
+    private LocalDateTime graduatedAt;
+
+    private String academicTitle;
+
+    private String graduationCertificateFileIdList;
+
+    private String degreeCertificateFileIdList;
+
+    private LocalDateTime retiredAt;
+
+    private String company;
+
+    private String legalEntityCode;
+
+    private String administrativeDuties;
+
+    private String startWorkAt;
+
+    private String address;
+
+    private String experience;
+
+    private String technicalTitles;
+
+    private String titleCertificateFileIdList;
+
+    private String awards;
+
+    private String recognitionReward;
+
+    private String recommendationProofFileIdList;
+
+    private String regionCode;
+
+    private Integer regionLevel;
+
+    private String recommendedWay;
+
+    private String remark;
+
+    private String hometown;
+
+    private String nationality;
+
+    private LocalDateTime birth;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertIntentionWorkRegionMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.expert.mapper;
+
+import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface ExpertIntentionWorkRegionMapper extends BaseMapper<ExpertIntentionWorkRegion> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/ExpertIntentionWorkRegionMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.expert.mapper.ExpertIntentionWorkRegionMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/NdExpertUserFullInfoMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.expert.mapper;
+
+import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface NdExpertUserFullInfoMapper extends BaseMapper<ExpertUserFullInfo> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/mapper/NdExpertUserFullInfoMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.expert.mapper.NdExpertUserFullInfoMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertIntentionWorkRegionService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.expert.service;
+
+import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IExpertIntentionWorkRegionService extends IService<ExpertIntentionWorkRegion> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/service/IExpertUserFullInfoService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.expert.service;
+
+import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IExpertUserFullInfoService extends IService<ExpertUserFullInfo> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertIntentionWorkRegionServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.expert.service.impl;
+
+import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion;
+import com.ningdatech.pmapi.expert.mapper.ExpertIntentionWorkRegionMapper;
+import com.ningdatech.pmapi.expert.service.IExpertIntentionWorkRegionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class ExpertIntentionWorkRegionServiceImpl extends ServiceImpl<ExpertIntentionWorkRegionMapper, ExpertIntentionWorkRegion> implements IExpertIntentionWorkRegionService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertUserFullInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.expert.service.impl;
+
+import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo;
+import com.ningdatech.pmapi.expert.mapper.NdExpertUserFullInfoMapper;
+import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class ExpertUserFullInfoServiceImpl extends ServiceImpl<NdExpertUserFullInfoMapper, ExpertUserFullInfo> implements IExpertUserFullInfoService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java

@@ -23,6 +23,7 @@ import javax.validation.Valid;
 @Controller
 @RequestMapping("/api/v1/fiscal-code")
 @RequiredArgsConstructor
+@ApiOperation("印章配置/财政编码配置")
 public class CompanyFiscalCodeController {
 
     private final CompanyFiscalCodeManage companyFiscalCodeManage;

pmapi/src/main/java/com/ningdatech/pmapi/meta/assembler/MetaDictionaryAssembler.java

@@ -0,0 +1,36 @@
+package com.ningdatech.pmapi.meta.assembler;
+
+
+import com.ningdatech.pmapi.meta.model.entity.MetaDictionary;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import com.ningdatech.pmapi.meta.model.vo.ResDictionaryVO;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午10:53
+ */
+
+public class MetaDictionaryAssembler {
+
+    public static DictionaryDTO toDictionaryDTO(MetaDictionary dictionaryManage) {
+        DictionaryDTO dictionaryDTO = new DictionaryDTO();
+        dictionaryDTO.setDescribe(dictionaryManage.getDictionaryDescribe());
+        dictionaryDTO.setDictionaryCode(dictionaryManage.getDictionaryCode());
+        dictionaryDTO.setDictionaryType(dictionaryManage.getDictionaryType());
+        dictionaryDTO.setName(dictionaryManage.getDictionaryName());
+        dictionaryDTO.setReadonly(dictionaryManage.getReadonly());
+        dictionaryDTO.setSortValue(dictionaryManage.getSortValue());
+        return dictionaryDTO;
+    }
+
+    public static ResDictionaryVO toDictionaryVO(DictionaryDTO dictionaryDTO) {
+        ResDictionaryVO resDictionaryVO = new ResDictionaryVO();
+        resDictionaryVO.setDescribe(dictionaryDTO.getDescribe());
+        resDictionaryVO.setDictionaryCode(dictionaryDTO.getDictionaryCode());
+        resDictionaryVO.setDictionaryType(dictionaryDTO.getDictionaryType());
+        resDictionaryVO.setName(dictionaryDTO.getName());
+        resDictionaryVO.setReadonly(dictionaryDTO.getReadonly());
+        resDictionaryVO.setSortValue(dictionaryDTO.getSortValue());
+        return resDictionaryVO;
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/assembler/MetaTagAssembler.java

@@ -0,0 +1,62 @@
+package com.ningdatech.pmapi.meta.assembler;
+
+import com.ningdatech.pmapi.meta.model.entity.MetaTag;
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO;
+import com.ningdatech.pmapi.meta.model.vo.ResTagTreeVO;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午9:57
+ */
+
+public class MetaTagAssembler {
+
+    public static TagDTO toTagDTO(MetaTag metaTagManage) {
+        TagDTO tagDTO = new TagDTO();
+        tagDTO.setParentCode(metaTagManage.getParentCode());
+        tagDTO.setTagCode(metaTagManage.getTagCode());
+        tagDTO.setTagLevel(metaTagManage.getTagLevel());
+        tagDTO.setTagName(metaTagManage.getTagName());
+        return tagDTO;
+    }
+
+    public static List<TagTreeDTO> toTagTreeDTOList(List<TagDTO> tagDTOList) {
+        if (CollectionUtils.isEmpty(tagDTOList)) {
+            return new ArrayList<>();
+        }
+        return tagDTOList.stream().map(MetaTagAssembler::toTagTreeDTO).collect(Collectors.toList());
+
+    }
+
+    public static TagTreeDTO toTagTreeDTO(TagDTO tagDTO) {
+        TagTreeDTO tagTreeDTO = new TagTreeDTO();
+        tagTreeDTO.setParentCode(tagDTO.getParentCode());
+        tagTreeDTO.setTagCode(tagDTO.getTagCode());
+        tagTreeDTO.setTagLevel(tagDTO.getTagLevel());
+        tagTreeDTO.setTagName(tagDTO.getTagName());
+        return tagTreeDTO;
+    }
+
+    public static List<ResTagTreeVO> toTagTreeVOList(List<TagTreeDTO> tagTreeDTOList) {
+        List<ResTagTreeVO> resTagTreeVOList = new ArrayList<>();
+        for (TagTreeDTO tagTreeDTO : tagTreeDTOList) {
+            ResTagTreeVO resTagTreeVO = new ResTagTreeVO();
+            resTagTreeVO.setTagLevel(tagTreeDTO.getTagLevel());
+            resTagTreeVO.setTagName(tagTreeDTO.getTagName());
+            resTagTreeVO.setParentCode(tagTreeDTO.getParentCode());
+            resTagTreeVO.setTagCode(tagTreeDTO.getTagCode());
+            resTagTreeVO.setUnionCode(tagTreeDTO.getTagName() + "##" + tagTreeDTO.getTagCode());
+            if (CollectionUtils.isNotEmpty(tagTreeDTO.getChildren())) {
+                resTagTreeVO.setChildren(toTagTreeVOList(tagTreeDTO.getChildren()));
+            }
+            resTagTreeVOList.add(resTagTreeVO);
+        }
+        return resTagTreeVOList;
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/constant/DictAllTypeEnum.java

@@ -0,0 +1,53 @@
+package com.ningdatech.pmapi.meta.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/21 下午6:08
+ */
+@AllArgsConstructor
+@Getter
+public enum DictAllTypeEnum {
+
+    //    政治面貌
+    POLITICAL("political"),
+    //    专家来源
+    EXPERT_SOURCE("expert_source"),
+    //    学历
+    EDU("edu"),
+    //    学位
+    DEGREE("degree"),
+    //    在职状态
+    JOB_STATUS("job_status"),
+    //    行政职级
+    ADMINISTRATIVE_RANK("administrative_rank"),
+    //    内外围（专家类型）
+    EXPERT_TYPE("expert_type"),
+    //    单位类型
+    COMPANY_ATTRIBUTE("company_attribute"),
+    //    职称级别
+    TITLE_LEVEL("title_level"),
+    // 通知类型
+    NOTICE_TYPE("notice_type"),
+    // 会议类型
+    MEETING_TYPE("meeting_type");
+
+    private final String key;
+
+
+    public static boolean contains(String key) {
+        if (StringUtils.isBlank(key)) {
+            return false;
+        }
+        for (DictAllTypeEnum typeEnum : DictAllTypeEnum.values()) {
+            if (typeEnum.key.equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/constant/DictExpertInfoTypeEnum.java

@@ -0,0 +1,70 @@
+package com.ningdatech.pmapi.meta.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/21 下午6:08
+ */
+@AllArgsConstructor
+@Getter
+public enum DictExpertInfoTypeEnum {
+
+    //    政治面貌
+    POLITICAL("political"),
+    //    学历
+    EDU("edu"),
+    //    学位
+    DEGREE("degree"),
+    //    在职状态
+    JOB_STATUS("job_status"),
+    //    行政职级
+    ADMINISTRATIVE_RANK("administrative_rank"),
+    //    内外围（专家类型）
+    EXPERT_TYPE("expert_type"),
+    //    单位类型
+    COMPANY_ATTRIBUTE("company_attribute"),
+    //    职称级别
+    TITLE_LEVEL("title_level"),
+    //    推荐方式
+    RECOMMENDED_WAY("recommended_way");
+
+
+    private final String key;
+
+    public static List<String> getAll() {
+        List<String> dictionaryList = new ArrayList<>();
+        DictExpertInfoTypeEnum[] values = DictExpertInfoTypeEnum.values();
+        for (DictExpertInfoTypeEnum typeEnum : values) {
+            dictionaryList.add(typeEnum.key);
+        }
+        return dictionaryList;
+    }
+
+    public static boolean contains(String key) {
+        if (StringUtils.isBlank(key)) {
+            return false;
+        }
+        for (DictExpertInfoTypeEnum typeEnum : DictExpertInfoTypeEnum.values()) {
+            if (typeEnum.key.equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static DictExpertInfoTypeEnum of(String key) {
+        for (DictExpertInfoTypeEnum statusEnum : DictExpertInfoTypeEnum.values()) {
+            if (statusEnum.key.equals(key)) {
+                return statusEnum;
+            }
+        }
+        throw new IllegalArgumentException(String.format("Illegal DictionaryExpertInfoTypeEnum = %s", key));
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/constant/ExpertTagEnum.java

@@ -0,0 +1,51 @@
+package com.ningdatech.pmapi.meta.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午11:13
+ */
+@AllArgsConstructor
+@Getter
+public enum ExpertTagEnum {
+
+    //    专家来源
+    EXPERT_SOURCE("expert_source"),
+    // 擅长方向
+    GOOD_AT("good_at"),
+    // 技术专长
+    TECHNICAL_EXPERTISE("technical_expertise"),
+    // 行业领域
+    INDUSTRY_SECTOR("industry_sector"),
+    // 其他
+    OTHER("other");
+
+    private final String key;
+
+    public static List<String> getAll() {
+        List<String> tagList = new ArrayList<>();
+        ExpertTagEnum[] values = ExpertTagEnum.values();
+        for (ExpertTagEnum fieldEnum : values) {
+            tagList.add(fieldEnum.key);
+        }
+        return tagList;
+    }
+
+    public static boolean contains(String key) {
+        if (StringUtils.isBlank(key)) {
+            return false;
+        }
+        for (ExpertTagEnum fieldEnum : ExpertTagEnum.values()) {
+            if (fieldEnum.key.equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/constant/TagConst.java

@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.meta.constant;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/27 下午1:49
+ */
+
+public class TagConst {
+
+    private TagConst() {
+    }
+
+    /**
+     * 标签类型顶级时 parent_code 为 -1
+     */
+    public static final String TAG_ROOT_PARENT_CODE = "-1";
+
+    public static final Long TAG_ROOT_LEVEL = 1L;
+
+    public static final String TAG_CREATOR = "管理员";
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaDictionaryManageController.java

@@ -0,0 +1,62 @@
+package com.ningdatech.pmapi.meta.controller;
+
+
+import com.ningdatech.pmapi.meta.manage.MetaManage;
+import com.ningdatech.pmapi.meta.model.po.ReqAddDictionaryPO;
+import com.ningdatech.pmapi.meta.model.po.ReqDictionaryListPO;
+import com.ningdatech.pmapi.meta.model.vo.ResDictionaryListVO;
+import com.ningdatech.pmapi.meta.validate.DictionaryRequestValidator;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liuxinxin
+ * @since 2022-07-21
+ */
+@RestController
+@Validated
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/meta/dictionary")
+@Api(tags = "基础数据接口")
+public class MetaDictionaryManageController {
+
+    //    private final IMetaDictionaryManageService metaDictionaryManageService;
+    private final MetaManage metaManage;
+
+    @PostMapping("/list")
+    @ApiOperation("字典筛选数据返回")
+    public List<ResDictionaryListVO> expertDictList(@RequestBody ReqDictionaryListPO request) {
+        DictionaryRequestValidator.dictionaryRequestValidator(request);
+        return metaManage.getDictionaryList(request);
+    }
+
+    @PostMapping("/common/list")
+    @ApiOperation("通用字典筛选数据返回")
+    public List<ResDictionaryListVO> commonDictList(@RequestBody ReqDictionaryListPO request) {
+        DictionaryRequestValidator.dictionaryRequestValidator(request);
+        return metaManage.commonDictList(request);
+    }
+
+    @PostMapping("/add/dictionary")
+    @ApiOperation("添加字典值")
+    public void addDictionary(@Valid @RequestBody ReqAddDictionaryPO reqAddDictionaryPO) {
+        metaManage.addDictionary(reqAddDictionaryPO);
+    }
+
+    @PostMapping("/remove/dictionary/{dictionaryCode}")
+    @ApiOperation("删除字典值")
+    public void removeDictionary(@PathVariable String dictionaryCode) {
+        metaManage.removeDictionary(dictionaryCode);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/controller/MetaTagManageController.java

@@ -0,0 +1,79 @@
+package com.ningdatech.pmapi.meta.controller;
+
+
+import com.ningdatech.pmapi.meta.manage.MetaManage;
+import com.ningdatech.pmapi.meta.model.po.ReqAddTagTypePO;
+import com.ningdatech.pmapi.meta.model.po.ReqTagListPO;
+import com.ningdatech.pmapi.meta.model.po.ReqTagQueryPO;
+import com.ningdatech.pmapi.meta.model.vo.ResTagListVO;
+import com.ningdatech.pmapi.meta.model.vo.ResTagTreeVO;
+import com.ningdatech.pmapi.meta.model.vo.ResTagTypeVO;
+import com.ningdatech.pmapi.meta.validate.TagListRequestValidator;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liuxinxin
+ * @since 2022-07-21
+ */
+@RestController
+@Validated
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/meta")
+@Api(value = "MetaController", tags = "基础数据接口")
+public class MetaTagManageController {
+
+    /**
+     * 专家标签的缓存时间设置为5分钟，单位秒
+     */
+    private static final Long MAX_AGE = 5 * 60L;
+    /**
+     * max-age=86400
+     */
+    private static final String MAX_AGE_STR = "max-age=" + MAX_AGE;
+    private final MetaManage metaManage;
+
+    @PostMapping("/tag")
+    @ApiOperation("获取专家标签的树状结构")
+    public List<ResTagTreeVO> getRegionTree(HttpServletResponse response, @RequestBody ReqTagListPO request) {
+        response.setHeader("Cache-Control", MAX_AGE_STR);
+        TagListRequestValidator.tagListRequestValidator(request);
+        return metaManage.getTagTree(request);
+    }
+
+    @PostMapping("/tag/query")
+    @ApiOperation("标签查询接口")
+    public List<ResTagListVO> tagQuery(@Valid @RequestBody ReqTagQueryPO reqTagQueryPO) {
+        return metaManage.tagQuery(reqTagQueryPO);
+    }
+
+    @PostMapping("/tag-tyoe/list")
+    @ApiOperation("获取标签分类列表")
+    public List<ResTagTypeVO> tagTypeList() {
+        return metaManage.tagTypeList();
+    }
+
+    @PostMapping("/add/tag-type")
+    @ApiOperation("新增标签分类")
+    public void addTagType(@Valid @RequestBody ReqAddTagTypePO request) {
+        metaManage.addTagType(request);
+    }
+
+    @PostMapping("/remove/tag/{tagCode}")
+    @ApiOperation("删除标签")
+    public void removeTagName(@PathVariable String tagCode) {
+        metaManage.removeTagName(tagCode);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/DictionaryCache.java

@@ -0,0 +1,49 @@
+package com.ningdatech.pmapi.meta.helper;
+
+
+
+import com.ningdatech.pmapi.meta.constant.DictAllTypeEnum;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/12/22 上午11:03
+ */
+
+public interface DictionaryCache {
+
+    /**
+     * 根据字典类型枚举 获取 字典列表
+     *
+     * @param dictionaryType
+     * @return
+     */
+    List<DictionaryDTO> getDictionaryListByDictionaryType(DictAllTypeEnum dictionaryType);
+
+    /**
+     * 根据字典类型 获取 字典列表
+     *
+     * @param dictionaryType
+     * @return
+     */
+    List<DictionaryDTO> getDictionaryListByDictionaryType(String dictionaryType);
+
+    /**
+     * 根据字典类型、字典编码 获取 字典实体
+     *
+     * @param dictionaryType
+     * @param code
+     * @return
+     */
+    DictionaryDTO getDictionaryByDictionaryType(DictAllTypeEnum dictionaryType, String code);
+
+    /**
+     * 根据字典编码 获取 字典实体
+     *
+     * @param dictionaryCode
+     * @return
+     */
+    DictionaryDTO getByCode(String dictionaryCode);
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/TagCache.java

@@ -0,0 +1,55 @@
+package com.ningdatech.pmapi.meta.helper;
+
+
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author liuxinxin
+ * @date 2022/12/22 上午11:56
+ */
+
+public interface TagCache {
+
+    /**
+     * @param level       最多几级标签
+     * @param rootTagCode 根标签类型及对应的字段类型
+     * @return
+     */
+    TagTreeDTO getTagTreeDTO(int level, String rootTagCode);
+
+    /**
+     * 根据标签编码获取 实体类
+     *
+     * @param tagCode
+     * @return
+     */
+    TagDTO getByTagCode(String tagCode);
+
+    /**
+     * 导入原专家库数据使用
+     *
+     * @return
+     */
+    Map<String, TagDTO> getNameTagDtoMap();
+
+    /**
+     * 获取所有子节点包含当前节点
+     *
+     * @param code 标签编码
+     * @return
+     */
+    List<TagTreeDTO> listChildren(String code);
+
+    /**
+     * 获取所有子节点包含当前节点的编码
+     *
+     * @param code 标签编码
+     * @return
+     */
+    List<String> listChildrenCodes(String code);
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/basic/AbstractDictionaryCache.java

@@ -0,0 +1,54 @@
+package com.ningdatech.pmapi.meta.helper.basic;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.ningdatech.pmapi.meta.service.IMetaDictionaryService;
+import com.ningdatech.pmapi.meta.constant.DictAllTypeEnum;
+import com.ningdatech.pmapi.meta.helper.DictionaryCache;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @author liuxinxin
+ * @date 2022/12/22 上午11:03
+ */
+public abstract class AbstractDictionaryCache implements InitializingBean, DictionaryCache {
+
+    @Autowired
+    private IMetaDictionaryService iMetaDictionaryService;
+
+    protected Map<String, DictionaryDTO> dictionaryMap;
+    protected LoadingCache<String, List<DictionaryDTO>> dictionaryCacheHelper;
+
+    @Override
+    public void afterPropertiesSet() {
+        dictionaryCacheHelper = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES)
+                .refreshAfterWrite(5, TimeUnit.MINUTES).build(key -> {
+                    List<DictionaryDTO> dictionaryDTOList = iMetaDictionaryService.queryAll();
+                    dictionaryMap = buildCateMap(dictionaryDTOList);
+                    Map<String, List<DictionaryDTO>> dictionaryTypeListMap = dictionaryDTOList.stream().collect(Collectors.groupingBy(DictionaryDTO::getDictionaryType));
+                    return dictionaryTypeListMap.get(key);
+                });
+        warmUp();
+    }
+
+    private Map<String, DictionaryDTO> buildCateMap(List<DictionaryDTO> dictionaryDTOList) {
+        Map<String, DictionaryDTO> dictionaryDtoMap = new ConcurrentHashMap<>(128);
+        dictionaryDTOList.forEach(dictionaryDTO -> dictionaryDtoMap.put(dictionaryDTO.getDictionaryCode(), dictionaryDTO));
+        return dictionaryDtoMap;
+    }
+
+    private void warmUp() {
+        for (DictAllTypeEnum typeEnum : DictAllTypeEnum.values()) {
+            dictionaryCacheHelper.get(typeEnum.getKey());
+        }
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/basic/AbstractTagsCache.java

@@ -0,0 +1,97 @@
+package com.ningdatech.pmapi.meta.helper.basic;
+
+import cn.hutool.core.lang.Assert;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.ningdatech.pmapi.meta.assembler.MetaTagAssembler;
+import com.ningdatech.pmapi.meta.helper.TagCache;
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO;
+import com.ningdatech.pmapi.meta.service.IMetaTagService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+/**
+ * @author liuxinxin
+ * @date 2022/12/22 上午11:56
+ */
+public abstract class AbstractTagsCache implements InitializingBean, TagCache {
+
+    protected static final int MAX_LEVEL = 4;
+
+    @Autowired
+    private IMetaTagService iMetaTagService;
+
+    protected LoadingCache<String, List<TagTreeDTO>> tagsCache;
+
+    protected Map<String, TagDTO> tagDtoMap;
+
+    @Override
+    public void afterPropertiesSet() {
+        tagsCache = Caffeine.newBuilder().expireAfterWrite(10, TimeUnit.MINUTES)
+                .refreshAfterWrite(5, TimeUnit.MINUTES)
+                .build(key -> {
+                    // 查询全部
+                    List<TagDTO> tagDTOList = iMetaTagService.queryAll();
+                    // TODO 临时关闭校验
+//                    Assert.isTrue(CollectionUtils.isNotEmpty(tagDTOList), "MetaTags queryAll is Empty");
+                    tagDtoMap = buildCateMap(tagDTOList);
+                    List<TagDTO> tagInLevel = tagDTOList.stream().filter(tagDto -> {
+                        // 只过滤出小于等于level的tag
+                        if (Objects.isNull(tagDto.getTagLevel())) {
+                            return false;
+                        }
+                        return Integer.parseInt(key) >= tagDto.getTagLevel();
+                    }).collect(Collectors.toList());
+                    List<TagTreeDTO> treeDtos = MetaTagAssembler.toTagTreeDTOList(tagInLevel);
+                    return toTreeStructure(treeDtos);
+                });
+        warmUp();
+    }
+
+    private Map<String, TagDTO> buildCateMap(List<TagDTO> tagDTOList) {
+        Map<String, TagDTO> tagDtoMapTemp = new ConcurrentHashMap<>(1024);
+        tagDTOList.forEach(tagDTO -> tagDtoMapTemp.put(tagDTO.getTagCode(), tagDTO));
+        return tagDtoMapTemp;
+    }
+
+    private List<TagTreeDTO> toTreeStructure(List<TagTreeDTO> rootList) {
+        List<TagTreeDTO> nodeList = new ArrayList<>();
+        for (TagTreeDTO tagTreeDTO : rootList) {
+            if ("-1".equals(tagTreeDTO.getParentCode()) || Objects.isNull(tagTreeDTO.getParentCode())) {
+                nodeList.add(tagTreeDTO);
+            }
+            tagTreeDTO.setChildren(getChildren(tagTreeDTO.getTagCode(), rootList));
+        }
+        return nodeList;
+    }
+
+    public void warmUp() {
+        for (int level = 1; level <= MAX_LEVEL; level++) {
+            tagsCache.get(level + "");
+        }
+    }
+
+    protected List<TagTreeDTO> getChildren(String tagCode, List<TagTreeDTO> list) {
+        List<TagTreeDTO> childList = new ArrayList<>();
+        for (TagTreeDTO tagTreeDTO : list) {
+            if (tagCode.equals(tagTreeDTO.getParentCode())) {
+                childList.add(tagTreeDTO);
+            }
+        }
+        for (TagTreeDTO tagTreeDTO : childList) {
+            tagTreeDTO.setChildren(getChildren(tagTreeDTO.getTagCode(), list));
+        }
+        if (CollectionUtils.isEmpty(childList)) {
+            return Collections.emptyList();
+        }
+        return childList;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/DictionaryCacheImpl.java

@@ -0,0 +1,40 @@
+package com.ningdatech.pmapi.meta.helper.impl;
+
+import com.ningdatech.pmapi.meta.constant.DictAllTypeEnum;
+import com.ningdatech.pmapi.meta.helper.basic.AbstractDictionaryCache;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午10:47
+ */
+@Component
+public class DictionaryCacheImpl extends AbstractDictionaryCache {
+
+    @Override
+    public List<DictionaryDTO> getDictionaryListByDictionaryType(DictAllTypeEnum dictionaryType) {
+        return dictionaryCacheHelper.get(dictionaryType.getKey());
+    }
+
+    @Override
+    public List<DictionaryDTO> getDictionaryListByDictionaryType(String dictionaryType) {
+        return dictionaryCacheHelper.get(dictionaryType);
+    }
+
+    @Override
+    public DictionaryDTO getDictionaryByDictionaryType(DictAllTypeEnum dictionaryType, String code) {
+        return Objects.requireNonNull(dictionaryCacheHelper.get(dictionaryType.getKey()))
+                .stream().filter(w -> w.getDictionaryCode().equals(code))
+                .findFirst().orElse(null);
+    }
+
+    @Override
+    public DictionaryDTO getByCode(String dictionaryCode) {
+        return dictionaryMap.get(dictionaryCode);
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/helper/impl/TagsCacheImpl.java

@@ -0,0 +1,105 @@
+package com.ningdatech.pmapi.meta.helper.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.meta.helper.basic.AbstractTagsCache;
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午9:51
+ * 标签树
+ */
+@Slf4j
+@Component
+public class TagsCacheImpl extends AbstractTagsCache {
+
+    @Override
+    public TagTreeDTO getTagTreeDTO(int level, String rootTagCode) {
+        List<TagTreeDTO> tagTreeDtos = tagsCache.get(level + "");
+        for (TagTreeDTO tagTreeDTO : tagTreeDtos) {
+            if (tagTreeDTO.getTagCode().equals(rootTagCode)) {
+                return tagTreeDTO;
+            }
+        }
+        throw new BizException("rootTagCode not exist");
+    }
+
+    @Override
+    public TagDTO getByTagCode(String tagCode) {
+        return tagDtoMap.get(tagCode);
+    }
+
+    /**
+     * 导入原专家库数据使用
+     *
+     * @return
+     */
+    @Override
+    public Map<String, TagDTO> getNameTagDtoMap() {
+        Map<String, TagDTO> nameTagDtoMap = new HashMap<>(1024);
+        for (String key : tagDtoMap.keySet()) {
+            nameTagDtoMap.put(tagDtoMap.get(key).getTagName(), tagDtoMap.get(key));
+        }
+        return nameTagDtoMap;
+    }
+
+
+    /**
+     * 获取所有子节点包含当前节点
+     *
+     * @param code 标签编码
+     * @return java.util.List<com.ningdatech.emapi.meta.entity.dto.TagTreeDTO>
+     * @author WendyYang
+     **/
+    @Override
+    public List<TagTreeDTO> listChildren(String code) {
+        List<TagTreeDTO> allTree = tagsCache.get(String.valueOf(MAX_LEVEL));
+        assert allTree != null;
+        List<TagTreeDTO> children = getChildren(code, allTree);
+        TagDTO tagDTO = tagDtoMap.get(code);
+        TagTreeDTO rootNode = BeanUtil.copyProperties(tagDTO, TagTreeDTO.class);
+        rootNode.setChildren(children);
+        return treeToList(rootNode);
+    }
+
+    /**
+     * 获取所有子节点包含当前节点的编码
+     *
+     * @param code 标签编码
+     * @return java.util.List<com.ningdatech.emapi.meta.entity.dto.TagTreeDTO>
+     * @author WendyYang
+     **/
+    @Override
+    public List<String> listChildrenCodes(String code) {
+        return CollUtils.fieldList(listChildren(code), TagTreeDTO::getTagCode);
+    }
+
+    /**
+     * tree -> list
+     *
+     * @param tagTreeDTO 树节点
+     * @return java.util.List<com.ningdatech.emapi.meta.entity.dto.TagTreeDTO>
+     * @author WendyYang
+     **/
+    private List<TagTreeDTO> treeToList(TagTreeDTO tagTreeDTO) {
+        List<TagTreeDTO> result = new ArrayList<>();
+        result.add(tagTreeDTO);
+        if (tagTreeDTO.getChildren() != null && tagTreeDTO.getChildren().size() > 0) {
+            tagTreeDTO.getChildren().forEach(node -> {
+                result.addAll(treeToList(node));
+            });
+        }
+        return result;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/manage/MetaManage.java

@@ -0,0 +1,283 @@
+package com.ningdatech.pmapi.meta.manage;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.common.constant.BoolDisplayEnum;
+import com.ningdatech.pmapi.common.util.BizUtils;
+import com.ningdatech.pmapi.meta.assembler.MetaDictionaryAssembler;
+import com.ningdatech.pmapi.meta.assembler.MetaTagAssembler;
+import com.ningdatech.pmapi.meta.constant.DictExpertInfoTypeEnum;
+import com.ningdatech.pmapi.meta.constant.ExpertTagEnum;
+import com.ningdatech.pmapi.meta.constant.TagConst;
+import com.ningdatech.pmapi.meta.helper.DictionaryCache;
+import com.ningdatech.pmapi.meta.helper.TagCache;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import com.ningdatech.pmapi.meta.model.dto.TagTreeDTO;
+import com.ningdatech.pmapi.meta.model.entity.ExpertDictionary;
+import com.ningdatech.pmapi.meta.model.entity.ExpertTag;
+import com.ningdatech.pmapi.meta.model.entity.MetaDictionary;
+import com.ningdatech.pmapi.meta.model.entity.MetaTag;
+import com.ningdatech.pmapi.meta.model.po.*;
+import com.ningdatech.pmapi.meta.model.vo.*;
+import com.ningdatech.pmapi.meta.service.IExpertDictionaryService;
+import com.ningdatech.pmapi.meta.service.IExpertTagService;
+import com.ningdatech.pmapi.meta.service.IMetaDictionaryService;
+import com.ningdatech.pmapi.meta.service.IMetaTagService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author liuxinxin
+ * @date 2023/2/22 下午2:34
+ */
+@Component
+@RequiredArgsConstructor
+public class MetaManage {
+
+    private final DictionaryCache dictionaryCache;
+    private final TagCache tagCache;
+    private final IMetaDictionaryService metaDictionaryManageService;
+    private final IExpertDictionaryService iExpertDictionaryService;
+    private final IMetaTagService iMetaTagManageService;
+    private final IExpertTagService iExpertTagService;
+
+    public List<ResDictionaryListVO> getDictionaryList(ReqDictionaryListPO request) {
+        List<String> dictionaryTypeList = request.getDictionaryTypeList();
+        if (CollectionUtils.isEmpty(dictionaryTypeList)) {
+            dictionaryTypeList = DictExpertInfoTypeEnum.getAll();
+        }
+
+        List<ResDictionaryListVO> resDictionaryListVos = new ArrayList<>();
+        for (String dictionaryType : dictionaryTypeList) {
+            ResDictionaryListVO resDictionaryListVO = new ResDictionaryListVO();
+            resDictionaryListVO.setDictionaryName(dictionaryType);
+            List<DictionaryDTO> dictionaryList = dictionaryCache.getDictionaryListByDictionaryType(dictionaryType);
+            List<ResDictionaryVO> resDictionaryVOList = dictionaryList.stream()
+                    .map(MetaDictionaryAssembler::toDictionaryVO).collect(Collectors.toList());
+            resDictionaryListVO.setDictionaryList(resDictionaryVOList);
+            resDictionaryListVos.add(resDictionaryListVO);
+        }
+        return resDictionaryListVos;
+    }
+
+    public List<ResDictionaryListVO> commonDictList(ReqDictionaryListPO request) {
+        List<ResDictionaryListVO> result = new ArrayList<>();
+        if (request.getAllDict()) {
+            Map<String, List<MetaDictionary>> groupByType = CollUtils.group(metaDictionaryManageService.list(), MetaDictionary::getDictionaryType);
+            groupByType.forEach((k, v) -> {
+                ResDictionaryListVO resDictionaryListVO = new ResDictionaryListVO();
+                resDictionaryListVO.setDictionaryName(k);
+                List<ResDictionaryVO> resDictionaryVOList = v.stream()
+                        .map(w -> {
+                            ResDictionaryVO vo = new ResDictionaryVO();
+                            vo.setDescribe(w.getDictionaryDescribe());
+                            vo.setDictionaryCode(w.getDictionaryCode());
+                            vo.setDictionaryType(w.getDictionaryType());
+                            vo.setName(w.getDictionaryName());
+                            vo.setReadonly(w.getReadonly());
+                            vo.setSortValue(w.getSortValue());
+                            return vo;
+                        }).collect(Collectors.toList());
+                resDictionaryListVO.setDictionaryList(resDictionaryVOList);
+                result.add(resDictionaryListVO);
+            });
+        } else {
+            List<String> dictionaryTypeList = request.getDictionaryTypeList();
+            for (String dictionaryType : dictionaryTypeList) {
+                ResDictionaryListVO resDictionaryListVO = new ResDictionaryListVO();
+                resDictionaryListVO.setDictionaryName(dictionaryType);
+                List<DictionaryDTO> dictionaryList = dictionaryCache.getDictionaryListByDictionaryType(dictionaryType);
+                List<ResDictionaryVO> resDictionaryVOList = dictionaryList.stream()
+                        .map(MetaDictionaryAssembler::toDictionaryVO).collect(Collectors.toList());
+                resDictionaryListVO.setDictionaryList(resDictionaryVOList);
+                result.add(resDictionaryListVO);
+            }
+        }
+        return result;
+    }
+
+    public List<ResTagTreeVO> getTagTree(ReqTagListPO request) {
+        List<String> rootTagCodeList = request.getRootTagCodeList();
+        if (CollectionUtils.isEmpty(rootTagCodeList)) {
+            rootTagCodeList = ExpertTagEnum.getAll();
+        }
+        List<TagTreeDTO> tagTreeDTOList = new ArrayList<>();
+        for (String rootTagCode : rootTagCodeList) {
+            TagTreeDTO tagTreeDTO = tagCache.getTagTreeDTO(4, rootTagCode);
+            if (Objects.nonNull(tagTreeDTO)) {
+                tagTreeDTOList.add(tagTreeDTO);
+            }
+        }
+        return MetaTagAssembler.toTagTreeVOList(tagTreeDTOList);
+    }
+
+
+    /**
+     * 专家管理员才能调用
+     *
+     * @param reqAddDictionaryPO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void addDictionary(ReqAddDictionaryPO reqAddDictionaryPO) {
+        String dictionaryType = reqAddDictionaryPO.getDictionaryType();
+        boolean contains = DictExpertInfoTypeEnum.contains(dictionaryType);
+        if (!contains) {
+            throw BizException.wrap("无效的专家字典类型：%s", dictionaryType);
+        }
+        String name = reqAddDictionaryPO.getName();
+        Integer sortValue = reqAddDictionaryPO.getSortValue();
+        LambdaQueryWrapper<MetaDictionary> eq = Wrappers.lambdaQuery(MetaDictionary.class).eq(MetaDictionary::getDictionaryType, dictionaryType);
+        List<MetaDictionary> dictionaryManageList = metaDictionaryManageService.list(eq);
+
+        MetaDictionary saveRecord = new MetaDictionary();
+        saveRecord.setCreateOn(LocalDateTime.now());
+        saveRecord.setDictionaryName(name);
+        saveRecord.setUpdateOn(LocalDateTime.now());
+        saveRecord.setDictionaryCode(BizUtils.uuid32());
+        saveRecord.setDictionaryType(dictionaryType);
+        saveRecord.setReadonly(BoolDisplayEnum.N.name());
+        saveRecord.setSortValue(sortValue);
+
+        List<MetaDictionary> saveRecordList = new ArrayList<>();
+        saveRecordList.add(saveRecord);
+        for (MetaDictionary metaDictionary : dictionaryManageList) {
+            if (metaDictionary.getSortValue() >= sortValue) {
+                metaDictionary.setSortValue(metaDictionary.getSortValue() + 1);
+            }
+            saveRecordList.add(metaDictionary);
+        }
+        boolean remove = metaDictionaryManageService
+                .remove(Wrappers.lambdaQuery(MetaDictionary.class).eq(MetaDictionary::getDictionaryType, dictionaryType));
+        if (remove) {
+            metaDictionaryManageService.saveBatch(saveRecordList);
+        }
+    }
+
+    public void removeDictionary(String dictionaryCode) {
+        LambdaUpdateWrapper<MetaDictionary> eq = Wrappers.lambdaUpdate(MetaDictionary.class)
+                .eq(MetaDictionary::getDictionaryCode, dictionaryCode);
+        MetaDictionary one = metaDictionaryManageService.getOne(eq);
+        if (Objects.isNull(one)) {
+            throw BizException.wrap("字典值不存在");
+        }
+        if (BoolDisplayEnum.judgeBoolean(one.getReadonly())) {
+            throw BizException.wrap("内置字典值无法删除");
+        }
+        List<ExpertDictionary> expertDictionaryList = iExpertDictionaryService.list(Wrappers.lambdaQuery(ExpertDictionary.class).eq(ExpertDictionary::getDictionaryCode, dictionaryCode));
+        if (CollUtil.isNotEmpty(expertDictionaryList)) {
+            throw BizException.wrap("该字典值已被使用无法删除");
+        }
+        metaDictionaryManageService.removeById(one);
+    }
+
+    public void addTagType(ReqAddTagTypePO request) {
+        String tagName = request.getTagName();
+        LambdaQueryWrapper<MetaTag> in = Wrappers.lambdaQuery(MetaTag.class)
+                .in(MetaTag::getTagName, tagName)
+                .in(MetaTag::getParentCode, TagConst.TAG_ROOT_PARENT_CODE);
+        List<MetaTag> list = iMetaTagManageService.list(in);
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw BizException.wrap("该标签类型已存在");
+        }
+        MetaTag saveRecord = new MetaTag();
+        saveRecord.setCreateOn(LocalDateTime.now());
+        saveRecord.setUpdateOn(LocalDateTime.now());
+        saveRecord.setParentCode(TagConst.TAG_ROOT_PARENT_CODE);
+        saveRecord.setTagCode(BizUtils.uuid32());
+        saveRecord.setTagName(tagName);
+        saveRecord.setTagLevel(TagConst.TAG_ROOT_LEVEL);
+        iMetaTagManageService.save(saveRecord);
+    }
+
+    public void removeTagName(String tagCode) {
+        LambdaQueryWrapper<ExpertTag> eq = Wrappers.lambdaQuery(ExpertTag.class)
+                .eq(ExpertTag::getTagCode, tagCode);
+        List<ExpertTag> expertTagList = iExpertTagService.list(eq);
+        if (CollectionUtils.isNotEmpty(expertTagList)) {
+            throw BizException.wrap("该标签正在使用无法删除");
+        }
+        LambdaQueryWrapper<MetaTag> queryWrapper = Wrappers.lambdaQuery(MetaTag.class).eq(MetaTag::getParentCode, tagCode);
+        List<MetaTag> list = iMetaTagManageService.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list)) {
+            throw BizException.wrap("该标签存在子标签无法删除");
+        }
+        LambdaQueryWrapper<MetaTag> metaTagManageLambdaQueryWrapper = Wrappers.lambdaQuery(MetaTag.class).eq(MetaTag::getTagCode, tagCode);
+        MetaTag one = iMetaTagManageService.getOne(metaTagManageLambdaQueryWrapper);
+        if (Objects.nonNull(one)) {
+            iMetaTagManageService.removeById(one);
+        }
+    }
+
+    public List<ResTagTypeVO> tagTypeList() {
+        LambdaQueryWrapper<MetaTag> eq = Wrappers.lambdaQuery(MetaTag.class).eq(MetaTag::getParentCode, TagConst.TAG_ROOT_PARENT_CODE);
+        List<MetaTag> list = iMetaTagManageService.list(eq);
+        return list.stream().map(r -> {
+            ResTagTypeVO resTagTypeVO = new ResTagTypeVO();
+            resTagTypeVO.setTagCode(r.getTagCode());
+            resTagTypeVO.setTagLevel(r.getTagLevel());
+            resTagTypeVO.setTagName(r.getTagName());
+            resTagTypeVO.setTagName(r.getTagName());
+            return resTagTypeVO;
+        }).collect(Collectors.toList());
+    }
+
+    public List<ResTagListVO> tagQuery(ReqTagQueryPO reqTagQueryPO) {
+        String parentCode = reqTagQueryPO.getParentCode();
+        if (StringUtils.isBlank(parentCode)) {
+            parentCode = TagConst.TAG_ROOT_PARENT_CODE;
+        }
+        LambdaQueryWrapper<MetaTag> eq = Wrappers.lambdaQuery(MetaTag.class)
+                .eq(MetaTag::getParentCode, parentCode);
+        List<MetaTag> list = iMetaTagManageService.list(eq);
+
+        List<String> tagCodeList = CollUtils.fieldList(list, MetaTag::getTagCode);
+        Map<String, List<MetaTag>> hasChildrenMap = new HashMap<>(16);
+        Map<String, List<ExpertTag>> useFrequencyMap = new HashMap<>(16);
+        if (CollectionUtils.isNotEmpty(tagCodeList)) {
+            List<MetaTag> childrenMetaTagList = iMetaTagManageService.list(Wrappers.lambdaQuery(MetaTag.class)
+                    .in(MetaTag::getParentCode, tagCodeList));
+            hasChildrenMap = CollUtils.group(childrenMetaTagList, MetaTag::getParentCode);
+
+            List<ExpertTag> expertTagList = iExpertTagService.list(Wrappers.lambdaQuery(ExpertTag.class)
+                    .in(ExpertTag::getTagCode, tagCodeList));
+            useFrequencyMap = CollUtils.group(expertTagList, ExpertTag::getTagCode);
+        }
+
+        Map<String, List<MetaTag>> finalHasChildrenMap = hasChildrenMap;
+        Map<String, List<ExpertTag>> finalUseFrequencyMap = useFrequencyMap;
+        return list.stream().map(r -> {
+            ResTagListVO resTagListVO = new ResTagListVO();
+            resTagListVO.setCreateTime(r.getCreateOn());
+            resTagListVO.setCreator(TagConst.TAG_CREATOR);
+            resTagListVO.setTagLevel(r.getTagLevel());
+            resTagListVO.setTagCode(r.getTagCode());
+            resTagListVO.setTagName(r.getTagName());
+            List<MetaTag> metaTagManages = finalHasChildrenMap.get(r.getTagCode());
+            if (CollUtil.isNotEmpty(metaTagManages)) {
+                resTagListVO.setIsLeaf(false);
+                resTagListVO.setHasChildren(true);
+            } else {
+                resTagListVO.setIsLeaf(true);
+                resTagListVO.setHasChildren(false);
+            }
+            long useFrequency = 0;
+            List<ExpertTag> expertTagList = finalUseFrequencyMap.get(r.getTagCode());
+            if (CollUtil.isNotEmpty(expertTagList)) {
+                useFrequency = expertTagList.size();
+            }
+            resTagListVO.setUseFrequency(useFrequency);
+            return resTagListVO;
+        }).collect(Collectors.toList());
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/ExpertDictionaryMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.mapper;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertDictionary;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface ExpertDictionaryMapper extends BaseMapper<ExpertDictionary> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/ExpertDictionaryMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.meta.mapper.ExpertDictionaryMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/ExpertTagMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.mapper;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface ExpertTagMapper extends BaseMapper<ExpertTag> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/ExpertTagMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.meta.mapper.ExpertTagMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/MetaDictionaryMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ningdatech.pmapi.meta.model.entity.MetaDictionary;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface MetaDictionaryMapper extends BaseMapper<MetaDictionary> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/MetaDictionaryMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.meta.mapper.MetaDictionaryMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/MetaTagMapper.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.mapper;
+
+import com.ningdatech.pmapi.meta.model.entity.MetaTag;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface MetaTagMapper extends BaseMapper<MetaTag> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/mapper/MetaTagMapper.xml

@@ -0,0 +1,5 @@
+<?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.ningdatech.pmapi.meta.mapper.MetaTagMapper">
+
+</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/ExpertRegionInfo.java

@@ -0,0 +1,36 @@
+package com.ningdatech.pmapi.meta.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/25 下午2:43
+ */
+@Data
+@ApiModel("专家区域信息")
+public class ExpertRegionInfo {
+
+    /**
+     * 区域编码
+     */
+    @NotBlank
+    @ApiModelProperty("区域编码")
+    private String regionCode;
+
+    /**
+     * 区域级别
+     */
+    @NotBlank
+    @ApiModelProperty("区域级别")
+    private Integer regionLevel;
+
+    /**
+     * 区域名称
+     */
+    @ApiModelProperty("区域名称")
+    private String regionName;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/bo/RegionContainsBO.java

@@ -0,0 +1,24 @@
+package com.ningdatech.pmapi.meta.model.bo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/26 下午4:48
+ */
+@Data
+public class RegionContainsBO {
+
+    /**
+     * 最高级节点级别
+     */
+    private Integer parentRegionTreeLevel;
+
+    /**
+     * 所有区域码列表
+     */
+    private List<String> containsRegionCodeList;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/dto/DictionaryDTO.java

@@ -0,0 +1,40 @@
+package com.ningdatech.pmapi.meta.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午10:49
+ */
+@Data
+public class DictionaryDTO {
+
+    private String dictionaryType;
+
+    /**
+     * 编码 随机数处理
+     */
+    private String dictionaryCode;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String describe;
+
+    /**
+     * 排序
+     */
+    private Integer sortValue;
+
+    /**
+     * 是否内置，内置不可删除
+     */
+    private String readonly;
+
+}
+

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/dto/TagDTO.java

@@ -0,0 +1,37 @@
+package com.ningdatech.pmapi.meta.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午9:53
+ */
+@Data
+public class TagDTO {
+
+    /**
+     * 标签 编码
+     * 根标签
擅长方向 good_at
+     * 技术专长 technical_expertise
+     * 行业领域 industry_sector
+     * 其他 other
+     */
+    private String tagCode;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 标签级别
+     */
+    private Long tagLevel;
+
+    /**
+     * 标签父级id
+     * 当parent_tag_code 为 -1 时为顶级标签
+     */
+    private String parentCode;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/dto/TagTreeDTO.java

@@ -0,0 +1,42 @@
+package com.ningdatech.pmapi.meta.model.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午9:53
+ */
+@Data
+public class TagTreeDTO {
+
+
+    /**
+     * 标签 编码
+     * 根标签
擅长方向 good_at
+     * 技术专长 technical_expertise
+     * 行业领域 industry_sector
+     * 其他 other
+     */
+    private String tagCode;
+
+    /**
+     * 标签名称
+     */
+    private String tagName;
+
+    /**
+     * 标签级别
+     */
+    private Long tagLevel;
+
+    /**
+     * 标签父级id
+     * 当parent_tag_code 为 -1 时为顶级标签
+     */
+    private String parentCode;
+
+
+    private List<TagTreeDTO> children;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/entity/ExpertDictionary.java

@@ -0,0 +1,38 @@
+package com.ningdatech.pmapi.meta.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Data
+@TableName("expert_dictionary")
+@ApiModel(value = "ExpertDictionary对象", description = "")
+public class ExpertDictionary implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private String dictionaryCode;
+
+    private String expertInfoField;
+
+    private Long userId;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/entity/ExpertTag.java

@@ -0,0 +1,38 @@
+package com.ningdatech.pmapi.meta.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@TableName("expert_tag")
+@Data
+@ApiModel(value = "ExpertTag对象", description = "")
+public class ExpertTag implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private Long userId;
+
+    private String tagCode;
+
+    private String expertInfoField;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/entity/MetaDictionary.java

@@ -0,0 +1,50 @@
+package com.ningdatech.pmapi.meta.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Data
+@TableName("meta_dictionary")
+@ApiModel(value = "MetaDictionary对象", description = "")
+public class MetaDictionary implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private String dictionaryType;
+
+    private String dictionaryCode;
+
+    private String dictionaryName;
+
+    private String dictionaryDescribe;
+
+    private Integer sortValue;
+
+    private Long createBy;
+
+    private String readonly;
+
+    private Long updateBy;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/entity/MetaTag.java

@@ -0,0 +1,43 @@
+package com.ningdatech.pmapi.meta.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Data
+@TableName("meta_tag")
+@ApiModel(value = "MetaTag对象", description = "")
+public class MetaTag implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    private LocalDateTime createOn;
+
+    private LocalDateTime updateOn;
+
+    private String tagName;
+
+    private Long tagLevel;
+
+    private String parentCode;
+
+    private String tagType;
+
+    private String tagCode;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/po/ReqAddDictionaryPO.java

@@ -0,0 +1,37 @@
+package com.ningdatech.pmapi.meta.model.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/25 上午11:10
+ */
+@Data
+@ApiModel("新增字典值")
+public class ReqAddDictionaryPO {
+
+    @ApiModelProperty(value = "字典类型")
+    @NotBlank
+    private String dictionaryType;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    @NotBlank
+    private String name;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    @NotNull
+    private Integer sortValue;
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/po/ReqAddTagTypePO.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.meta.model.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/27 上午10:17
+ */
+@ApiModel(description = "新增标签分类")
+@Data
+public class ReqAddTagTypePO {
+
+    @ApiModelProperty("标签分类名")
+    @NotBlank
+    private String tagName;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/po/ReqDictionaryListPO.java

@@ -0,0 +1,19 @@
+package com.ningdatech.pmapi.meta.model.po;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/21 下午6:05
+ */
+@Data
+public class ReqDictionaryListPO {
+
+    private List<String> dictionaryTypeList;
+
+    private Boolean allDict = false;
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/po/ReqTagListPO.java

@@ -0,0 +1,14 @@
+package com.ningdatech.pmapi.meta.model.po;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 下午2:43
+ */
+@Data
+public class ReqTagListPO {
+    private List<String> rootTagCodeList;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/po/ReqTagQueryPO.java

@@ -0,0 +1,24 @@
+package com.ningdatech.pmapi.meta.model.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/27 下午2:30
+ */
+@Data
+@ApiModel(description = "标签查询request")
+public class ReqTagQueryPO {
+//
+//    @ApiModelProperty("标签类型")
+//    private Long tagType;
+//
+//    @ApiModelProperty("标签名")
+//    private String tagName;
+
+    @ApiModelProperty("父级标签编码")
+    private String parentCode;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/vo/ResDictionaryListVO.java

@@ -0,0 +1,25 @@
+package com.ningdatech.pmapi.meta.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/21 下午6:13
+ */
+@Data
+@ToString(callSuper = true)
+@ApiModel(value = "DictionaryListVO", description = "字典列表结构VO")
+public class ResDictionaryListVO {
+
+    @ApiModelProperty(value = "字典名称")
+    private String dictionaryName;
+
+    @ApiModelProperty(value = "字典选项名称")
+    private List<ResDictionaryVO> dictionaryList;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/vo/ResDictionaryVO.java

@@ -0,0 +1,49 @@
+package com.ningdatech.pmapi.meta.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 上午11:26
+ */
+@Data
+@ApiModel(value = "DictionaryListVO", description = "字典结构VO")
+public class ResDictionaryVO {
+
+
+    @ApiModelProperty(value = "字典类型")
+    private String dictionaryType;
+
+    /**
+     * 编码 随机数处理
+     */
+    @ApiModelProperty(value = "编码")
+    private String dictionaryCode;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty(value = "描述")
+    private String describe;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sortValue;
+
+    /**
+     * 是否内置，内置不可删除
+     */
+    @ApiModelProperty(value = "是否内置，内置不可删除")
+    private String readonly;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/vo/ResTagListVO.java

@@ -0,0 +1,41 @@
+package com.ningdatech.pmapi.meta.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/27 下午2:35
+ */
+@Data
+@ApiModel(description = "标签列表展示")
+public class ResTagListVO {
+
+    @ApiModelProperty(value = "标签 编码")
+    private String tagCode;
+
+    @ApiModelProperty(value = "标签名称")
+    private String tagName;
+
+    @ApiModelProperty(value = "标签级别")
+    private Long tagLevel;
+
+    @ApiModelProperty(value = "使用频次")
+    private Long useFrequency;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
+    @ApiModelProperty(value = "是否为叶子节点")
+    private Boolean isLeaf;
+
+    @ApiModelProperty(value = "是否有子集")
+    private Boolean hasChildren;
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/vo/ResTagTreeVO.java

@@ -0,0 +1,58 @@
+package com.ningdatech.pmapi.meta.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 下午2:27
+ */
+@Data
+@ToString(callSuper = true)
+@ApiModel(value = "TagTreeVO", description = "标签树状结构VO")
+public class ResTagTreeVO {
+
+    /**
+     * 标签 编码
+     * 根标签
擅长方向 good_at
+     * 技术专长 technical_expertise
+     * 行业领域 industry_sector
+     * 其他 other
+     */
+    @ApiModelProperty(value = "     * 标签 编码\n" +
+            "     * 根标签\u2028擅长方向 good_at\n" +
+            "     * 技术专长 technical_expertise\n" +
+            "     * 行业领域 industry_sector\n" +
+            "     * 其他 other")
+    private String tagCode;
+
+    /**
+     * 标签名称
+     */
+    @ApiModelProperty(value = "标签名称")
+    private String tagName;
+
+    /**
+     * 标签级别
+     */
+    @ApiModelProperty(value = "标签级别")
+    private Long tagLevel;
+
+    /**
+     * 标签父级id
+     * 当parent_tag_code 为 -1 时为顶级标签
+     */
+    @ApiModelProperty(value = "     * 标签父级id\n" +
+            "     * 当parent_tag_code 为 -1 时为顶级标签")
+    private String parentCode;
+
+    @ApiModelProperty(value = "子节点标签")
+    private List<ResTagTreeVO> children;
+
+    @ApiModelProperty(value = "联合唯一字段方便页面使用（tagName##tagCode）")
+    private String unionCode;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/model/vo/ResTagTypeVO.java

@@ -0,0 +1,23 @@
+package com.ningdatech.pmapi.meta.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author liuxinxin
+ * @date 2022/8/27 下午2:20
+ */
+@Data
+@ApiModel(description = "标签类型VO")
+public class ResTagTypeVO {
+
+    @ApiModelProperty(value = "标签编码")
+    private String tagCode;
+
+    @ApiModelProperty(value = "标签名称")
+    private String tagName;
+
+    @ApiModelProperty(value = "标签级别")
+    private Long tagLevel;
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/IExpertDictionaryService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.service;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertDictionary;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IExpertDictionaryService extends IService<ExpertDictionary> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/IExpertTagService.java

@@ -0,0 +1,16 @@
+package com.ningdatech.pmapi.meta.service;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertTag;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IExpertTagService extends IService<ExpertTag> {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/IMetaDictionaryService.java

@@ -0,0 +1,22 @@
+package com.ningdatech.pmapi.meta.service;
+
+import com.ningdatech.pmapi.meta.model.entity.MetaDictionary;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IMetaDictionaryService extends IService<MetaDictionary> {
+
+    List<DictionaryDTO> queryAll();
+
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/IMetaTagService.java

@@ -0,0 +1,21 @@
+package com.ningdatech.pmapi.meta.service;
+
+import com.ningdatech.pmapi.meta.model.entity.MetaTag;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+public interface IMetaTagService extends IService<MetaTag> {
+
+    List<TagDTO> queryAll();
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/impl/ExpertDictionaryServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.meta.service.impl;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertDictionary;
+import com.ningdatech.pmapi.meta.mapper.ExpertDictionaryMapper;
+import com.ningdatech.pmapi.meta.service.IExpertDictionaryService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class ExpertDictionaryServiceImpl extends ServiceImpl<ExpertDictionaryMapper, ExpertDictionary> implements IExpertDictionaryService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/impl/ExpertTagServiceImpl.java

@@ -0,0 +1,20 @@
+package com.ningdatech.pmapi.meta.service.impl;
+
+import com.ningdatech.pmapi.meta.model.entity.ExpertTag;
+import com.ningdatech.pmapi.meta.mapper.ExpertTagMapper;
+import com.ningdatech.pmapi.meta.service.IExpertTagService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class ExpertTagServiceImpl extends ServiceImpl<ExpertTagMapper, ExpertTag> implements IExpertTagService {
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/impl/MetaDictionaryServiceImpl.java

@@ -0,0 +1,32 @@
+package com.ningdatech.pmapi.meta.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.meta.model.entity.MetaDictionary;
+import com.ningdatech.pmapi.meta.mapper.MetaDictionaryMapper;
+import com.ningdatech.pmapi.meta.service.IMetaDictionaryService;
+import com.ningdatech.pmapi.meta.assembler.MetaDictionaryAssembler;
+import com.ningdatech.pmapi.meta.model.dto.DictionaryDTO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class MetaDictionaryServiceImpl extends ServiceImpl<MetaDictionaryMapper, MetaDictionary> implements IMetaDictionaryService {
+
+    @Override
+    public List<DictionaryDTO> queryAll() {
+        List<MetaDictionary> dictionaryList = this.lambdaQuery().ne(MetaDictionary::getId, -1).list();
+        List<DictionaryDTO> dictionaryDTOList = dictionaryList.stream().map(MetaDictionaryAssembler::toDictionaryDTO).collect(Collectors.toList());
+        return dictionaryDTOList;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/service/impl/MetaTagServiceImpl.java

@@ -0,0 +1,33 @@
+package com.ningdatech.pmapi.meta.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ningdatech.pmapi.meta.assembler.MetaTagAssembler;
+import com.ningdatech.pmapi.meta.model.entity.MetaTag;
+import com.ningdatech.pmapi.meta.mapper.MetaTagMapper;
+import com.ningdatech.pmapi.meta.model.dto.TagDTO;
+import com.ningdatech.pmapi.meta.service.IMetaTagService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author Liuxinxin
+ * @since 2023-02-22
+ */
+@Service
+public class MetaTagServiceImpl extends ServiceImpl<MetaTagMapper, MetaTag> implements IMetaTagService {
+
+
+    @Override
+    public List<TagDTO> queryAll() {
+        List<MetaTag> allTags = this.lambdaQuery().ne(MetaTag::getId, -1).list();
+        List<TagDTO> allTagDTOList = allTags.stream().map(MetaTagAssembler::toTagDTO).collect(Collectors.toList());
+        return allTagDTOList;
+    }
+
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/validate/DictionaryRequestValidator.java

@@ -0,0 +1,27 @@
+package com.ningdatech.pmapi.meta.validate;
+
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.pmapi.meta.constant.DictExpertInfoTypeEnum;
+import com.ningdatech.pmapi.meta.model.po.ReqDictionaryListPO;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/21 下午6:15
+ */
+
+public class DictionaryRequestValidator {
+
+    public static void dictionaryRequestValidator(ReqDictionaryListPO reqDictionaryListPO) {
+        List<String> dictionaryTypeList = reqDictionaryListPO.getDictionaryTypeList();
+        if (CollectionUtils.isNotEmpty(dictionaryTypeList)) {
+            for (String dictionaryType : dictionaryTypeList) {
+                if (!DictExpertInfoTypeEnum.contains(dictionaryType)) {
+                    throw new BizException("Illegal dictionaryType: " + dictionaryType);
+                }
+            }
+        }
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/meta/validate/TagListRequestValidator.java

@@ -0,0 +1,31 @@
+package com.ningdatech.pmapi.meta.validate;
+
+
+import com.ningdatech.basic.exception.BizException;
+import com.ningdatech.pmapi.meta.constant.ExpertTagEnum;
+import com.ningdatech.pmapi.meta.model.po.ReqTagListPO;
+import org.apache.commons.collections4.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * @author liuxinxin
+ * @date 2022/7/22 下午2:44
+ */
+
+public class TagListRequestValidator {
+
+    private TagListRequestValidator() {
+    }
+
+    public static void tagListRequestValidator(ReqTagListPO request) {
+        List<String> rootTagCodeList = request.getRootTagCodeList();
+        if (CollectionUtils.isNotEmpty(rootTagCodeList)) {
+            for (String rootTagCode : rootTagCodeList) {
+                if (!ExpertTagEnum.contains(rootTagCode)) {
+                    throw new BizException("Illegal rootTagCode：" + rootTagCode);
+                }
+            }
+        }
+    }
+}

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/AdjustmentListReq.java

@@ -28,11 +28,11 @@ public class AdjustmentListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
     @ApiModelProperty("项目阶段")

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/ConstrctionPlanListReq.java

@@ -28,11 +28,11 @@ public class ConstrctionPlanListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/req/PrequalificationDeclaredListReq.java

@@ -28,11 +28,11 @@ public class PrequalificationDeclaredListReq {
     private Integer projectYear;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/req/ProjectListReq.java

@@ -62,11 +62,11 @@ public class ProjectListReq extends PagePo {
     private BigDecimal approveAmountMax;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMin;
 
     @ApiModelProperty("创建时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
     private LocalDateTime createOnMax;
 
     @ApiModelProperty("用户ID")

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/NoticeController.java

@@ -61,8 +61,9 @@ public class NoticeController {
 
     @GetMapping("/dashboard/list")
     @ApiOperation("工作台公告列表")
-    public PageVo<NoticeListItemVO> dashboardList(@RequestParam(required = false, defaultValue = "3") Integer limit) {
-        return noticeManage.dashboardList(limit);
+    public PageVo<NoticeListItemVO> dashboardList(@RequestParam(required = false, defaultValue = "3") Integer limit,
+                                                  @RequestParam(required = false) Integer type) {
+        return noticeManage.dashboardList(limit, type);
     }
 
     @GetMapping("/manage/list")

pmapi/src/main/java/com/ningdatech/pmapi/sys/controller/RoleController.java

@@ -5,12 +5,13 @@ import cn.hutool.core.lang.Assert;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.log.annotation.WebLog;
 import com.ningdatech.pmapi.common.util.BizUtils;
-import com.ningdatech.pmapi.sys.model.entity.Role;
-import com.ningdatech.pmapi.sys.model.req.RolePageReq;
+import com.ningdatech.pmapi.sys.manage.RoleManage;
+import com.ningdatech.pmapi.sys.model.dto.MenuDataScopeDTO;
 import com.ningdatech.pmapi.sys.model.dto.RoleSaveDTO;
 import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO;
+import com.ningdatech.pmapi.sys.model.entity.Role;
+import com.ningdatech.pmapi.sys.model.req.RolePageReq;
 import com.ningdatech.pmapi.sys.model.vo.RoleVO;
-import com.ningdatech.pmapi.sys.manage.RoleManage;
 import com.ningdatech.pmapi.sys.service.IRoleService;
 import com.ningdatech.pmapi.user.util.LoginUserUtil;
 import io.swagger.annotations.Api;
@@ -62,6 +63,8 @@ public class RoleController {
         Assert.notNull(role, "角色不存在");
         RoleVO query = BeanUtil.toBean(role, RoleVO.class);
         query.setManageRoleIdList(BizUtils.splitToLong(role.getManageRoleIds()));
+        List<MenuDataScopeDTO> menuDataScope = roleManage.getMenuDataScope(id);
+        query.setMenuDataScopeList(menuDataScope);
         // 菜单
         roleManage.buildMenu(query);
         return query;

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/NoticeManage.java

@@ -73,10 +73,11 @@ public class NoticeManage {
     }
 
 
-    public PageVo<NoticeListItemVO> dashboardList(Integer limit) {
+    public PageVo<NoticeListItemVO> dashboardList(Integer limit, Integer type) {
         NoticeListReq req = new NoticeListReq();
         req.setPageSize(limit);
         req.setEnabled(true);
+        req.setType(type);
         return listByManager(req);
     }
 

pmapi/src/main/java/com/ningdatech/pmapi/sys/manage/RoleManage.java

@@ -6,13 +6,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ningdatech.basic.model.PageVo;
 import com.ningdatech.basic.util.CollUtils;
+import com.ningdatech.pmapi.sys.model.dto.MenuDataScopeDTO;
 import com.ningdatech.pmapi.sys.model.entity.Menu;
 import com.ningdatech.pmapi.sys.model.entity.Role;
 import com.ningdatech.pmapi.sys.model.entity.RoleMenu;
+import com.ningdatech.pmapi.sys.model.entity.RoleMenuDatascope;
 import com.ningdatech.pmapi.sys.model.req.RolePageReq;
 import com.ningdatech.pmapi.sys.model.vo.MenuRoleVO;
 import com.ningdatech.pmapi.sys.model.vo.RoleVO;
 import com.ningdatech.pmapi.sys.service.IMenuService;
+import com.ningdatech.pmapi.sys.service.IRoleMenuDatascopeService;
 import com.ningdatech.pmapi.sys.service.IRoleMenuService;
 import com.ningdatech.pmapi.sys.service.IRoleService;
 import lombok.RequiredArgsConstructor;
@@ -38,6 +41,7 @@ public class RoleManage {
     private final IRoleService roleService;
     private final IMenuService menuService;
     private final IRoleMenuService roleMenuService;
+    private final IRoleMenuDatascopeService roleMenuDatascopeService;
 
     public PageVo<RoleVO> queryList(RolePageReq rolePageReq) {
         Page<Role> page = rolePageReq.page();
@@ -71,4 +75,16 @@ public class RoleManage {
         query.setMenu(menus);
     }
 
+    public List<MenuDataScopeDTO> getMenuDataScope(Long roleId) {
+        LambdaQueryWrapper<RoleMenuDatascope> query = Wrappers.lambdaQuery(RoleMenuDatascope.class)
+                .eq(RoleMenuDatascope::getRoleId, roleId);
+        List<RoleMenuDatascope> menuDataScopes = roleMenuDatascopeService.list(query);
+        return CollUtils.convert(menuDataScopes, w -> {
+            MenuDataScopeDTO dto = new MenuDataScopeDTO();
+            dto.setDataScope(w.getDatascope());
+            dto.setMenuId(w.getMenuId());
+            return dto;
+        });
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/sys/model/vo/RoleVO.java

@@ -1,5 +1,6 @@
 package com.ningdatech.pmapi.sys.model.vo;
 
+import com.ningdatech.pmapi.sys.model.dto.MenuDataScopeDTO;
 import com.ningdatech.pmapi.sys.model.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -49,11 +50,8 @@ public class RoleVO extends BaseEntity {
     @ApiModelProperty("是否是内置角色：true 是、false 否")
     private Boolean fixed;
 
-    /**
-     * 数据范围
-     */
-    @ApiModelProperty(value = "数据范围 1全部 2本区域 3本区域以及下区域 4本公司")
-    private Integer dataScope;
+    @ApiModelProperty("菜单数据权限")
+    private List<MenuDataScopeDTO> menuDataScopeList;
 
     /**
      * 菜单

pmapi/src/main/java/com/ningdatech/pmapi/user/entity/UserInfo.java

@@ -1,5 +1,7 @@
 package com.ningdatech.pmapi.user.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -28,6 +30,7 @@ public class UserInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     private LocalDateTime createOn;

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserAuthLoginManage.java

@@ -65,7 +65,7 @@ public class UserAuthLoginManage {
      */
     public UserFullInfoDTO queryUserInfoInPasswordAuth(String username) {
         // TODO 目前账号密码登陆测试使用 强制用户登录 userId 1L
-        UserInfo userInfo = iUserInfoService.getById(2L);
+        UserInfo userInfo = iUserInfoService.getById(username);
         if (Objects.isNull(userInfo)) {
             return null;
         }

pmapi/src/main/java/com/ningdatech/pmapi/user/manage/UserInfoManage.java

@@ -86,7 +86,6 @@ public class UserInfoManage {
                         resListVO.setOrgName(r.getOrganizationCode());
                         resListVO.setOrgCode(r.getOrganizationCode());
                         // TODO 从用户信息中获取
-
                         // 从所属组织中获取
 //                        resListVO.setRegionId();