diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitStripEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitStripEnum.java new file mode 100644 index 0000000..f753833 --- /dev/null +++ b/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitStripEnum.java @@ -0,0 +1,26 @@ +package com.hz.pm.api.external.model.enumeration; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + *
+ * MhUnitStripEnum + *
+ * + * @author WendyYang + * @since 10:26 2024/1/25 + */ +@Getter +@AllArgsConstructor +public enum MhUnitStripEnum { + + GOV_COMPANY("国企"), + + PARTY_GOV("党政"), + + INDUSTRY("行业"); + + private final String name; + +} diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitTypeEnum.java b/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitTypeEnum.java index ddfe5d8..f3367ef 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitTypeEnum.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/external/model/enumeration/MhUnitTypeEnum.java @@ -87,4 +87,14 @@ public enum MhUnitTypeEnum { return !isGovCompany() && !isIndustry(); } + public MhUnitStripEnum getStrip() { + if (isIndustry()) { + return MhUnitStripEnum.INDUSTRY; + } else if (isGovCompany()) { + return MhUnitStripEnum.GOV_COMPANY; + } else { + return MhUnitStripEnum.PARTY_GOV; + } + } + } diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/helper/impl/MhUnitCacheImpl.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/helper/impl/MhUnitCacheImpl.java index 7e7b929..c18d941 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/user/helper/impl/MhUnitCacheImpl.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/helper/impl/MhUnitCacheImpl.java @@ -7,6 +7,7 @@ import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.Lists; +import com.hz.pm.api.external.model.enumeration.MhUnitTypeEnum; import com.hz.pm.api.user.helper.MhUnitCache; import com.hz.pm.api.user.model.dto.UnitDTO; import com.hz.pm.api.user.model.entity.MhUnit; @@ -18,7 +19,10 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; @@ -65,7 +69,9 @@ public class MhUnitCacheImpl implements MhUnitCache, InitializingBean { return null; } putToChildIdMap(unit.getId(), unit.getParentId()); - return BeanUtil.copyProperties(unit, UnitDTO.class); + UnitDTO unitTmp = BeanUtil.copyProperties(unit, UnitDTO.class); + unitTmp.setType(MhUnitTypeEnum.getByCode(unit.getType()).orElse(null)); + return unitTmp; } @Override @@ -83,7 +89,9 @@ public class MhUnitCacheImpl implements MhUnitCache, InitializingBean { } return CollUtils.listToMap(allUnits, MhUnit::getId, w -> { putToChildIdMap(w.getId(), w.getParentId()); - return BeanUtil.copyProperties(w, UnitDTO.class); + UnitDTO unit = BeanUtil.copyProperties(w, UnitDTO.class); + unit.setType(MhUnitTypeEnum.getByCode(w.getType()).orElse(null)); + return unit; }); } }); diff --git a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/MhUnitManage.java b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/MhUnitManage.java index e398c7f..1c72106 100644 --- a/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/MhUnitManage.java +++ b/hz-pm-api/src/main/java/com/hz/pm/api/user/manage/MhUnitManage.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hz.pm.api.common.util.StrUtils; +import com.hz.pm.api.external.model.enumeration.MhUnitTypeEnum; import com.hz.pm.api.user.helper.MhUnitCache; -import com.hz.pm.api.user.model.dto.UnitDTO; import com.hz.pm.api.user.model.dto.MhUnitTreeDTO; import com.hz.pm.api.user.model.dto.MhUnitUserTreeDTO; +import com.hz.pm.api.user.model.dto.UnitDTO; import com.hz.pm.api.user.model.entity.MhUnit; import com.hz.pm.api.user.model.entity.UserInfo; import com.hz.pm.api.user.model.enumeration.UnitUserNodeType; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; /** *
@@ -45,7 +47,11 @@ public class MhUnitManage {
public List