luozhun
/
policeSecurity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(cache): 实现全局缓存管理器并优化枚举数据处理 

- 新增 GlobalCacheManager 类，用于统一管理枚举缓存
- 重构 BaseEnum 接口，使用 SelectNodeVo 作为序列化返回类型
- 更新 CheckStatus、EnterprisesUnitType 和 IsEnable 枚举类，使用 SelectNodeVo 作为序列化结果- 修改 CommonController 中的 enums 方法，直接使用 GlobalCacheManager 中的缓存数据
- 移除 CommonController 中的 initEnums 方法和 enumsResult 静态变量
This commit is contained in:
luozhun 2024-11-15 11:12:23 +08:00
parent ac1dc62adc
commit c0496c39e1
34 changed files with 180 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
policeSecurityServer/src/main/java/com/changhu/common/cache/GlobalCacheManager.java vendored Normal file
View File

@ -0,0 +1,79 @@
package com.changhu.common.cache;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ReflectUtil;
import com.changhu.common.annotation.IsExtData;
import com.changhu.common.db.BaseEnum;
import com.changhu.common.pojo.vo.SelectNodeVo;
import lombok.extern.slf4j.Slf4j;
import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author 20252
* @createTime 2024/11/15 上午9:03
* @desc GlobalCacheManager...
*/
@Slf4j
public class GlobalCacheManager {
/**
* 枚举缓存
*/
public static final Map<Class<?>, Map<BaseEnum<?>, SelectNodeVo<?>>> ENUM_CACHE = new ConcurrentHashMap<>();
static {
//初始化枚举数据
initEnum();
}
static void initEnum() {
log.info("初始化枚举字典数据----");
Set<Class<?>> classes = ClassUtil.scanPackageBySuper("com.changhu.common.db.enums", BaseEnum.class);
Method superSerializer = ClassUtil.getDeclaredMethod(BaseEnum.class, "serializer");
for (Class<?> aClass : classes) {
Method childrenSerializer = ClassUtil.getDeclaredMethod(aClass, "serializer");
BaseEnum<?>[] enumConstants = (BaseEnum<?>[]) aClass.getEnumConstants();
if (enumConstants == null) {
continue;
}
// 获取所有字段
Field[] fields = aClass.getDeclaredFields();
// 过滤出非静态字段并带有 IsExtData 注解的字段
List<Field> extDataFields = Arrays.stream(fields)
.filter(field -> !Modifier.isStatic(field.getModifiers()))
.filter(field -> field.getAnnotation(IsExtData.class) != null)
.collect(Collectors.toList());
Map<BaseEnum<?>, SelectNodeVo<?>> map = new LinkedHashMap<>();
Stream.of(enumConstants).forEach(v -> {
//如果子类重写父类的方法 则直接使用子类的结果
if (!superSerializer.equals(childrenSerializer)) {
map.put(v, v.serializer());
} else {
SelectNodeVo<Object> vo = new SelectNodeVo<>();
vo.setValue(v.getValue());
vo.setLabel(v.getLabel());
if (CollUtil.isNotEmpty(extDataFields)) {
Dict extData = Dict.create();
for (Field extDataField : extDataFields) {
extData.put(extDataField.getName(), ReflectUtil.getFieldValue(v, extDataField));
}
vo.setExtData(extData);
}
map.put(v, vo);
}
});
GlobalCacheManager.ENUM_CACHE.put(aClass, map);
}
log.info("初始化枚举字典数据----完成");
}
}

27
policeSecurityServer/src/main/java/com/changhu/common/db/BaseEnum.java
View File

@ -1,8 +1,11 @@
package com.changhu.common.db;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import com.changhu.common.cache.GlobalCacheManager;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;
import java.util.Map;
/**
* author: luozhun
@ -10,6 +13,7 @@ import com.changhu.common.exception.MessageException;
* createTime: 2023/8/16 17:38
*/
public interface BaseEnum<V> {
/**
* 获取值
*
@ -26,19 +30,22 @@ public interface BaseEnum<V> {
@SuppressWarnings("unchecked")
static <P, T extends BaseEnum<P>> T valueOf(Class<? extends BaseEnum<P>> enumType, P code) {
BaseEnum<P>[] enumConstants = enumType.getEnumConstants();
for (BaseEnum<P> pBaseEnum : enumConstants) {
if (ObjectUtil.equals(code, pBaseEnum.getValue())) {
return (T) pBaseEnum;
Map<BaseEnum<?>, SelectNodeVo<?>> nodeVoMap = GlobalCacheManager.ENUM_CACHE.get(enumType);
for (Map.Entry<BaseEnum<?>, SelectNodeVo<?>> mapEntry : nodeVoMap.entrySet()) {
if (ObjectUtil.equals(code, mapEntry.getValue().getValue())) {
return (T) mapEntry.getKey();
}
}
throw new MessageException("不存在值为:{} 的【{}】对象!", code.toString(), enumType.componentType().getSimpleName());
}
default Object serializer() {
return Dict.of(
"value", this.getValue(),
"label", this.getLabel()
);
@SuppressWarnings("unchecked")
default SelectNodeVo<V> serializer() {
Map<BaseEnum<?>, SelectNodeVo<?>> map = GlobalCacheManager.ENUM_CACHE.get(this.getClass());
if (map != null) {
return (SelectNodeVo<V>) map.get(this);
}
return null;
}
}

9
policeSecurityServer/src/main/java/com/changhu/common/db/enums/CheckStatus.java
View File

@ -1,6 +1,5 @@
package com.changhu.common.db.enums;
import cn.hutool.core.lang.Dict;
import com.baomidou.mybatisplus.annotation.IEnum;
import com.changhu.common.annotation.IsExtData;
import com.changhu.common.db.BaseEnum;
@ -25,12 +24,4 @@ public enum CheckStatus implements BaseEnum<Integer>, IEnum<Integer> {
@IsExtData
private final String color;
@Override
public Object serializer() {
return Dict.of(
"value", this.getValue(),
"label", this.getLabel(),
"extData", Dict.of("color", this.color)
);
}
}

16
policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java
View File

@ -4,12 +4,10 @@ import cn.hutool.core.lang.Dict;
import com.baomidou.mybatisplus.annotation.IEnum;
import com.changhu.common.annotation.IsExtData;
import com.changhu.common.db.BaseEnum;
import com.changhu.common.pojo.vo.SelectNodeVo;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.stream.Collectors;
/**
* @author 20252
* @createTime 2024/11/5 下午4:22
@ -46,11 +44,11 @@ public enum EnterprisesUnitType implements BaseEnum<String>, IEnum<String> {
private final String icon;
@Override
public Object serializer() {
return Dict.of(
"value", this.getValue(),
"label", this.getLabel(),
"extData", Dict.of("icon", "/resources/icon/gaode/marker/" + this.icon)
);
public SelectNodeVo<String> serializer() {
return SelectNodeVo.<String>builder()
.value(this.getValue())
.label(this.getLabel())
.extData(Dict.of("icon", "/resources/icon/gaode/marker/" + this.icon))
.build();
}
}

9
policeSecurityServer/src/main/java/com/changhu/common/db/enums/IsEnable.java
View File

@ -1,6 +1,5 @@
package com.changhu.common.db.enums;
import cn.hutool.core.lang.Dict;
import com.baomidou.mybatisplus.annotation.IEnum;
import com.changhu.common.annotation.IsExtData;
import com.changhu.common.db.BaseEnum;
@ -25,12 +24,4 @@ public enum IsEnable implements BaseEnum<Integer>, IEnum<Integer> {
@IsExtData
private final String color;
@Override
public Object serializer() {
return Dict.of(
"value", this.getValue(),
"label", this.getLabel(),
"extData", Dict.of("color", this.color)
);
}
}

2
policeSecurityServer/src/main/java/com/changhu/common/enums/OpenApiType.java
View File

@ -1,12 +1,10 @@
package com.changhu.common.enums;
import cn.hutool.core.util.IdUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
/**
* @author 20252

69
policeSecurityServer/src/main/java/com/changhu/controller/CommonController.java
View File

@ -1,13 +1,7 @@
package com.changhu.controller;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import com.changhu.common.annotation.IsExtData;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.BaseEnum;
import com.changhu.common.cache.GlobalCacheManager;
import com.changhu.common.pojo.model.JsonResult;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.common.pojo.vo.TreeNodeVo;
@ -20,16 +14,14 @@ import com.changhu.support.minio.service.MinioService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.PostConstruct;
import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.web.bind.annotation.*;
import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author 20252
@ -50,9 +42,6 @@ public class CommonController {
@Autowired
private AdministrativeDivisionService administrativeDivisionService;
private static final Map<String, List<SelectNodeVo<?>>> enumsResult = new HashMap<>();
@Cacheable(value = "common", key = "'AdministrativeDivisionLevel' + #level + 'Tree'")
@Operation(summary = "行政区划树")
@GetMapping("/administrativeDivisionTree")
@ -95,53 +84,11 @@ public class CommonController {
@Operation(summary = "字典数据")
@GetMapping("/enums")
public Map<String, List<SelectNodeVo<?>>> enums() {
// 初始化 enumsResult
Map<String, List<SelectNodeVo<?>>> enumsResult = new HashMap<>();
//将缓存的数据转换
GlobalCacheManager.ENUM_CACHE.forEach((aClass, item) -> enumsResult.put(aClass.getSimpleName(), item.values().stream().toList()));
return enumsResult;
}
@SuppressWarnings("unchecked")
@PostConstruct
public void initEnums() {
Set<Class<?>> classes = ClassUtil.scanPackageBySuper("com.changhu.common.db.enums", BaseEnum.class);
for (Class<?> aClass : classes) {
if (BaseEnum.class.isAssignableFrom(aClass)) {
enumsResult.put(aClass.getSimpleName(), listSelectNodes((Class<? extends BaseEnum<?>>) aClass));
}
}
}
public static <T extends BaseEnum<?>> List<SelectNodeVo<?>> listSelectNodes(Class<T> enumType) {
if (enumType == null) {
return null;
}
Field[] fields = ReflectUtil.getFields(enumType);
List<String> extras = new ArrayList<>();
for (Field field : fields) {
IsExtData annotation = field.getAnnotation(IsExtData.class);
if (ObjectUtil.isNotNull(annotation)) {
extras.add(field.getName());
}
}
T[] enumConstants = enumType.getEnumConstants();
if (enumConstants == null) {
return null;
}
return Stream.of(enumConstants).map(v -> {
SelectNodeVo<Object> vo = new SelectNodeVo<>();
vo.setValue(v.getValue());
vo.setLabel(v.getLabel());
if (CollUtil.isNotEmpty(extras)) {
Dict map = Dict.create();
for (String extra : extras) {
map.put(extra, ReflectUtil.getFieldValue(v, extra));
}
vo.setExtData(map);
}
return vo;
}).collect(Collectors.toList());
}
}

2
policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementPoliceUnitLogin.java
View File

@ -3,8 +3,8 @@ package com.changhu.enums.handler;
import cn.dev33.satoken.stp.SaTokenInfo;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.TokenInfo;

2
policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementSecurityUnitLogin.java
View File

@ -3,8 +3,8 @@ package com.changhu.enums.handler;
import cn.dev33.satoken.stp.SaTokenInfo;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.TokenInfo;

2
policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java
View File

@ -8,9 +8,9 @@ import cn.hutool.core.lang.func.LambdaUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.CheckStatus;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.TokenInfo;

2
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/controller/AssessmentCriteriaController.java
View File

@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.annotation.CheckUserType;
import com.changhu.common.annotation.JsonBody;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.module.assessmentCriteria.pojo.entity.CkGroup;

3
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/mapper/CkAssessmentRecordMapper.java
View File

@ -4,13 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.module.assessmentCriteria.pojo.entity.CkAssessmentRecord;
import com.changhu.module.assessmentCriteria.pojo.queryParams.AssessmentRecordPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordDetailVo;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentRecordPagerVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* ck_assessment_record (考核记录) 固化类
* author: luozhun

16
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecord.java
View File

@ -1,16 +1,16 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 考核记录 实体类

16
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecordDetails.java
View File

@ -1,16 +1,16 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 考核记录明细 实体类

16
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkGroup.java
View File

@ -1,16 +1,16 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 考核组 实体类

18
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkItem.java
View File

@ -1,17 +1,17 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.SelectType;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.common.db.enums.SelectType;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 分组内的考核项 实体类

18
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkProject.java
View File

@ -1,17 +1,17 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 考核项目 实体类

17
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkStandard.java
View File

@ -1,17 +1,16 @@
package com.changhu.module.assessmentCriteria.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.common.db.enums.SelectType;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 扣分标准 实体类

1
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkGroupSaveOrUpdateParams.java
View File

@ -1,6 +1,5 @@
package com.changhu.module.assessmentCriteria.pojo.params;
import com.changhu.common.db.enums.EnterprisesUnitType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

2
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkProjectSaveOrUpdateParams.java
View File

@ -6,8 +6,6 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author 20252
* @createTime 2024/11/6 上午10:31

1
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkStandardSaveOrUpdateParams.java
View File

@ -1,6 +1,5 @@
package com.changhu.module.assessmentCriteria.pojo.params;
import com.changhu.common.db.enums.SelectType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

1
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/vo/AssessmentRecordPagerVo.java
View File

@ -1,7 +1,6 @@
package com.changhu.module.assessmentCriteria.pojo.vo;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.utils.JavaClassToTsUtil;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

10
policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/service/impl/AssessmentCriteriaServiceImpl.java
View File

@ -1,12 +1,5 @@
package com.changhu.module.assessmentCriteria.service.impl;
import com.changhu.common.db.enums.SelectType;
import com.changhu.common.utils.SnowFlakeIdUtil;
import com.changhu.module.assessmentCriteria.pojo.entity.*;
import com.changhu.module.assessmentCriteria.pojo.params.*;
import com.google.common.collect.Lists;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Dict;
@ -16,7 +9,10 @@ import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.EnterprisesUnitType;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;
import com.changhu.common.utils.SnowFlakeIdUtil;
import com.changhu.module.assessmentCriteria.mapper.CkProjectMapper;
import com.changhu.module.assessmentCriteria.pojo.entity.*;
import com.changhu.module.assessmentCriteria.pojo.params.*;
import com.changhu.module.assessmentCriteria.pojo.queryParams.CkProjectPagerQueryParams;
import com.changhu.module.assessmentCriteria.pojo.vo.AssessmentCriteriaRuleVo;
import com.changhu.module.assessmentCriteria.pojo.vo.CkProjectDetailTableVo;

1
policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java
View File

@ -6,7 +6,6 @@ import com.changhu.module.management.pojo.entity.ServiceProject;
import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo;
import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo;
import com.changhu.pojo.dto.EnterprisesUnitDetailDTO;
import com.changhu.pojo.dto.ServiceProjectDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

1
policeSecurityServer/src/main/java/com/changhu/module/management/service/ServiceProjectService.java
View File

@ -6,7 +6,6 @@ import com.changhu.module.management.pojo.entity.ServiceProject;
import com.changhu.module.management.pojo.params.ServiceProjectSaveOrUpdateParams;
import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo;
import com.changhu.pojo.dto.EnterprisesUnitDetailDTO;
import com.changhu.pojo.dto.ServiceProjectDTO;
import com.changhu.support.mybatisplus.pojo.params.PageParams;

2
policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.changhu.module.management.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.MiniProgramUserIdentity;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.exception.MessageException;
import com.changhu.common.utils.UserUtil;
import com.changhu.module.management.pojo.params.IndexCheckPassParams;

2
policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java
View File

@ -8,9 +8,9 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.toolkit.Db;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.db.enums.IsEnable;
import com.changhu.common.db.enums.MiniProgramUserIdentity;
import com.changhu.common.db.enums.UserType;
import com.changhu.common.enums.ResultCode;
import com.changhu.common.exception.MessageException;
import com.changhu.common.pojo.vo.SelectNodeVo;

1
policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ServiceProjectServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.changhu.module.management.pojo.params.ServiceProjectSaveOrUpdateParam
import com.changhu.module.management.pojo.queryParams.ServiceProjectPagerQueryParams;
import com.changhu.module.management.pojo.vo.ServiceProjectPagerVo;
import com.changhu.module.management.service.ServiceProjectService;
import com.changhu.pojo.dto.EnterprisesUnitDetailDTO;
import com.changhu.pojo.dto.ServiceProjectDTO;
import com.changhu.support.mybatisplus.pojo.params.PageParams;
import org.springframework.stereotype.Service;

18
policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java
View File

@ -1,17 +1,17 @@
package com.changhu.module.miniProgram.pojo.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.changhu.common.db.enums.Sex;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.io.Serial;
import java.io.Serializable;
import com.changhu.common.db.enums.Sex;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.Data;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.TableName;
/**
* 保安人员 实体类

1
policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java
View File

@ -2,7 +2,6 @@ package com.changhu.module.miniProgram.service;
import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams;
import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.core.io.Resource;
import org.springframework.http.ResponseEntity;

1
policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.changhu.common.utils.SnowFlakeIdUtil;
import com.changhu.module.miniProgram.mapper.MiniProgramUserMapper;
import com.changhu.module.miniProgram.mapper.SecurityUserMapper;
import com.changhu.module.miniProgram.pojo.entity.MiniProgramUser;
import com.changhu.module.miniProgram.pojo.entity.SecurityUser;
import com.changhu.module.miniProgram.pojo.params.MiniProgramUserRegisterParams;
import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams;
import com.changhu.module.miniProgram.pojo.queryParams.ServiceProjectSecurityUserPagerQueryParams;

5
policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java
View File

@ -11,8 +11,6 @@ import com.changhu.module.miniProgram.pojo.entity.SecurityUser;
import com.changhu.module.miniProgram.pojo.params.SaveOrUpdateSecurityUserParams;
import com.changhu.module.miniProgram.pojo.vo.IndexServiceProjectListVo;
import com.changhu.module.miniProgram.service.ProjectManageIndexService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.beans.factory.annotation.Autowired;
@ -23,9 +21,8 @@ import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.io.*;
import java.io.File;
import java.util.List;
import java.util.Optional;
/**
* @author 20252

5
policeSecurityServer/src/main/java/com/changhu/pojo/dto/EnterprisesUnitDetailDTO.java
View File

@ -1,10 +1,5 @@
package com.changhu.pojo.dto;
import cn.hutool.core.util.DesensitizedUtil;
import com.changhu.common.annotation.Desensitized;
import com.changhu.common.db.enums.IsOrNot;
import com.changhu.common.db.enums.ServiceProjectType;
import com.changhu.common.db.enums.Sex;
import com.changhu.module.management.pojo.model.ContactPersonInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;

1
policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java
View File

@ -10,7 +10,6 @@ import com.changhu.module.management.service.ServiceProjectService;
import com.changhu.module.miniProgram.pojo.entity.SecurityUser;
import com.changhu.pojo.dto.DataViewDTO;
import com.changhu.pojo.dto.EnterprisesUnitDetailDTO;
import com.changhu.pojo.dto.ServiceProjectDTO;
import com.changhu.service.OpenApiService;
import com.changhu.support.mybatisplus.pojo.entity.BaseEntity;
import lombok.SneakyThrows;