From c0496c39e1013904d9956d5e10e077edfca6d167 Mon Sep 17 00:00:00 2001
From: luozhun <2025254074@qq.com>
Date: Fri, 15 Nov 2024 11:12:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(cache):=20=E5=AE=9E=E7=8E=B0=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=BC=93=E5=AD=98=E7=AE=A1=E7=90=86=E5=99=A8=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9E=9A=E4=B8=BE=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 GlobalCacheManager 类，用于统一管理枚举缓存
- 重构 BaseEnum 接口，使用 SelectNodeVo 作为序列化返回类型
- 更新 CheckStatus、EnterprisesUnitType 和 IsEnable 枚举类，使用 SelectNodeVo 作为序列化结果- 修改 CommonController 中的 enums 方法，直接使用 GlobalCacheManager 中的缓存数据
- 移除 CommonController 中的 initEnums 方法和 enumsResult 静态变量
---
 .../common/cache/GlobalCacheManager.java      | 79 +++++++++++++++++++
 .../java/com/changhu/common/db/BaseEnum.java  | 27 ++++---
 .../changhu/common/db/enums/CheckStatus.java  |  9 ---
 .../common/db/enums/EnterprisesUnitType.java  | 16 ++--
 .../com/changhu/common/db/enums/IsEnable.java |  9 ---
 .../com/changhu/common/enums/OpenApiType.java |  2 -
 .../changhu/controller/CommonController.java  | 69 ++--------------
 .../handler/ManagementPoliceUnitLogin.java    |  2 +-
 .../handler/ManagementSecurityUnitLogin.java  |  2 +-
 .../enums/handler/MiniProgramUserLogin.java   |  2 +-
 .../AssessmentCriteriaController.java         |  2 +-
 .../mapper/CkAssessmentRecordMapper.java      |  3 -
 .../pojo/entity/CkAssessmentRecord.java       | 16 ++--
 .../entity/CkAssessmentRecordDetails.java     | 16 ++--
 .../pojo/entity/CkGroup.java                  | 16 ++--
 .../pojo/entity/CkItem.java                   | 18 ++---
 .../pojo/entity/CkProject.java                | 18 ++---
 .../pojo/entity/CkStandard.java               | 17 ++--
 .../params/CkGroupSaveOrUpdateParams.java     |  1 -
 .../params/CkProjectSaveOrUpdateParams.java   |  2 -
 .../params/CkStandardSaveOrUpdateParams.java  |  1 -
 .../pojo/vo/AssessmentRecordPagerVo.java      |  1 -
 .../impl/AssessmentCriteriaServiceImpl.java   | 10 +--
 .../mapper/ServiceProjectMapper.java          |  1 -
 .../service/ServiceProjectService.java        |  1 -
 .../service/impl/ManagementServiceImpl.java   |  2 +-
 .../service/impl/SecurityServiceImpl.java     |  2 +-
 .../impl/ServiceProjectServiceImpl.java       |  1 -
 .../miniProgram/pojo/entity/SecurityUser.java | 18 ++---
 .../service/ProjectManageIndexService.java    |  1 -
 .../impl/MiniProgramUserServiceImpl.java      |  1 -
 .../impl/ProjectManageIndexServiceImpl.java   |  5 +-
 .../pojo/dto/EnterprisesUnitDetailDTO.java    |  5 --
 .../service/impl/OpenApiServiceImpl.java      |  1 -
 34 files changed, 180 insertions(+), 196 deletions(-)
 create mode 100644 policeSecurityServer/src/main/java/com/changhu/common/cache/GlobalCacheManager.java

diff --git a/policeSecurityServer/src/main/java/com/changhu/common/cache/GlobalCacheManager.java b/policeSecurityServer/src/main/java/com/changhu/common/cache/GlobalCacheManager.java
new file mode 100644
index 0000000..6738b5a
--- /dev/null
+++ b/policeSecurityServer/src/main/java/com/changhu/common/cache/GlobalCacheManager.java
@@ -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("初始化枚举字典数据----完成");
+    }
+}
diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/BaseEnum.java b/policeSecurityServer/src/main/java/com/changhu/common/db/BaseEnum.java
index 9dd7153..df0235a 100644
--- a/policeSecurityServer/src/main/java/com/changhu/common/db/BaseEnum.java
+++ b/policeSecurityServer/src/main/java/com/changhu/common/db/BaseEnum.java
@@ -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;
     }
+
 }
diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/CheckStatus.java b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/CheckStatus.java
index 3116c84..b52332d 100644
--- a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/CheckStatus.java
+++ b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/CheckStatus.java
@@ -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)
-        );
-    }
 }
diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java
index e6425e7..91a36c4 100644
--- a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java
+++ b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/EnterprisesUnitType.java
@@ -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();
     }
 }
diff --git a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/IsEnable.java b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/IsEnable.java
index 9ab863e..5244f02 100644
--- a/policeSecurityServer/src/main/java/com/changhu/common/db/enums/IsEnable.java
+++ b/policeSecurityServer/src/main/java/com/changhu/common/db/enums/IsEnable.java
@@ -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)
-        );
-    }
 }
\ No newline at end of file
diff --git a/policeSecurityServer/src/main/java/com/changhu/common/enums/OpenApiType.java b/policeSecurityServer/src/main/java/com/changhu/common/enums/OpenApiType.java
index c68e356..db2de04 100644
--- a/policeSecurityServer/src/main/java/com/changhu/common/enums/OpenApiType.java
+++ b/policeSecurityServer/src/main/java/com/changhu/common/enums/OpenApiType.java
@@ -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
diff --git a/policeSecurityServer/src/main/java/com/changhu/controller/CommonController.java b/policeSecurityServer/src/main/java/com/changhu/controller/CommonController.java
index 0984600..ed3ed63 100644
--- a/policeSecurityServer/src/main/java/com/changhu/controller/CommonController.java
+++ b/policeSecurityServer/src/main/java/com/changhu/controller/CommonController.java
@@ -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());
-
-    }
 }
diff --git a/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementPoliceUnitLogin.java b/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementPoliceUnitLogin.java
index 74b9897..3b49c5f 100644
--- a/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementPoliceUnitLogin.java
+++ b/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementPoliceUnitLogin.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementSecurityUnitLogin.java b/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementSecurityUnitLogin.java
index f185b4d..8390ba4 100644
--- a/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementSecurityUnitLogin.java
+++ b/policeSecurityServer/src/main/java/com/changhu/enums/handler/ManagementSecurityUnitLogin.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java b/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java
index 909bd6e..f3bdf79 100644
--- a/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java
+++ b/policeSecurityServer/src/main/java/com/changhu/enums/handler/MiniProgramUserLogin.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/controller/AssessmentCriteriaController.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/controller/AssessmentCriteriaController.java
index df4f2bc..4165e9d 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/controller/AssessmentCriteriaController.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/controller/AssessmentCriteriaController.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/mapper/CkAssessmentRecordMapper.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/mapper/CkAssessmentRecordMapper.java
index 9c0cadb..13bc5c3 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/mapper/CkAssessmentRecordMapper.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/mapper/CkAssessmentRecordMapper.java
@@ -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
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecord.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecord.java
index bc8ee3d..e3113b2 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecord.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecord.java
@@ -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;
-
 
 /**
  * 考核记录 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecordDetails.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecordDetails.java
index 7b99f6c..cc758cb 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecordDetails.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkAssessmentRecordDetails.java
@@ -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;
-
 
 /**
  * 考核记录明细 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkGroup.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkGroup.java
index 4b2e86d..454b0bd 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkGroup.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkGroup.java
@@ -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;
-
 
 /**
  * 考核组 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkItem.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkItem.java
index f969bd6..53710ae 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkItem.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkItem.java
@@ -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;
-
 
 /**
  * 分组内的考核项 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkProject.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkProject.java
index f9f1bb3..56467bd 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkProject.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkProject.java
@@ -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;
-
 
 /**
  * 考核项目 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkStandard.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkStandard.java
index 1a561a2..e4b6848 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkStandard.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/entity/CkStandard.java
@@ -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;
-
 
 /**
  * 扣分标准 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkGroupSaveOrUpdateParams.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkGroupSaveOrUpdateParams.java
index d0e464c..66560c5 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkGroupSaveOrUpdateParams.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkGroupSaveOrUpdateParams.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkProjectSaveOrUpdateParams.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkProjectSaveOrUpdateParams.java
index fb01afa..1c3d654 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkProjectSaveOrUpdateParams.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkProjectSaveOrUpdateParams.java
@@ -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
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkStandardSaveOrUpdateParams.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkStandardSaveOrUpdateParams.java
index 9923114..f03d7c6 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkStandardSaveOrUpdateParams.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/params/CkStandardSaveOrUpdateParams.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/vo/AssessmentRecordPagerVo.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/vo/AssessmentRecordPagerVo.java
index f371242..ce1159f 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/vo/AssessmentRecordPagerVo.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/pojo/vo/AssessmentRecordPagerVo.java
@@ -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;
 
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/service/impl/AssessmentCriteriaServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/service/impl/AssessmentCriteriaServiceImpl.java
index 7656390..517e38f 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/service/impl/AssessmentCriteriaServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/assessmentCriteria/service/impl/AssessmentCriteriaServiceImpl.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java b/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java
index a9a22a8..9850bf1 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/management/mapper/ServiceProjectMapper.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ServiceProjectService.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ServiceProjectService.java
index 8c9db18..8f8d735 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/ServiceProjectService.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/ServiceProjectService.java
@@ -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;
 
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementServiceImpl.java
index 9a2a580..48a7fad 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ManagementServiceImpl.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java
index fea4772..573a796 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/SecurityServiceImpl.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ServiceProjectServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ServiceProjectServiceImpl.java
index d4e6e80..15453f5 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ServiceProjectServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/management/service/impl/ServiceProjectServiceImpl.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java
index d0b0a8c..fb8a58c 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/pojo/entity/SecurityUser.java
@@ -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;
-
 
 /**
  * 保安人员 实体类
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java
index 69c3f9d..a1c7cd8 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/ProjectManageIndexService.java
@@ -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;
 
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java
index fb85ceb..be7f6e2 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/MiniProgramUserServiceImpl.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java
index 82ee67c..ab64842 100644
--- a/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/module/miniProgram/service/impl/ProjectManageIndexServiceImpl.java
@@ -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
diff --git a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/EnterprisesUnitDetailDTO.java b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/EnterprisesUnitDetailDTO.java
index 096f36b..65161b0 100644
--- a/policeSecurityServer/src/main/java/com/changhu/pojo/dto/EnterprisesUnitDetailDTO.java
+++ b/policeSecurityServer/src/main/java/com/changhu/pojo/dto/EnterprisesUnitDetailDTO.java
@@ -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;
diff --git a/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java b/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java
index 2904329..12843aa 100644
--- a/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java
+++ b/policeSecurityServer/src/main/java/com/changhu/service/impl/OpenApiServiceImpl.java
@@ -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;

From ab386a85c741d2366584245ca654fcbd3a975592 Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Fri, 15 Nov 2024 11:24:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=95=E4=BD=8D=20=E9=80=89=E6=8B=A9=20?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=20=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

单位 选择 替换为 搜索组件
---
 .../src/assets/images/popuptiobg.png          | Bin 0 -> 20709 bytes
 .../src/picker-search/picker-search.json.ts   |   3 +
 .../src/picker-search/picker-search.scss      |  85 ++++++++++++
 .../src/picker-search/picker-search.vue       |  90 +++++++++++++
 .../dailyInspection/dailyInspection.scss      | 122 ++++++++++++++++++
 .../dailyInspection/dailyInspection.vue       |  87 ++++++++++++-
 6 files changed, 384 insertions(+), 3 deletions(-)
 create mode 100644 collect_information/src/assets/images/popuptiobg.png
 create mode 100644 collect_information/src/picker-search/picker-search.json.ts
 create mode 100644 collect_information/src/picker-search/picker-search.scss
 create mode 100644 collect_information/src/picker-search/picker-search.vue

diff --git a/collect_information/src/assets/images/popuptiobg.png b/collect_information/src/assets/images/popuptiobg.png
new file mode 100644
index 0000000000000000000000000000000000000000..865066694ab2dab85940390059cba96673913272
GIT binary patch
literal 20709
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

literal 0
HcmV?d00001

diff --git a/collect_information/src/picker-search/picker-search.json.ts b/collect_information/src/picker-search/picker-search.json.ts
new file mode 100644
index 0000000..29210de
--- /dev/null
+++ b/collect_information/src/picker-search/picker-search.json.ts
@@ -0,0 +1,3 @@
+export default {
+  "component": true
+}
diff --git a/collect_information/src/picker-search/picker-search.scss b/collect_information/src/picker-search/picker-search.scss
new file mode 100644
index 0000000..f5ee090
--- /dev/null
+++ b/collect_information/src/picker-search/picker-search.scss
@@ -0,0 +1,85 @@
+.uiwu-flex-align {
+  align-items: center;
+}
+
+.uiwu-flex {
+  display: flex;
+}
+
+.uiwu-flex-space {
+  align-items: center;
+  justify-content: space-between;
+}
+
+.uiwu-picker-search {
+  position: absolute;
+  height: 1031rpx;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: url('../assets/images/popuptiobg.png') no-repeat 0 0 #fff;
+  background-size: 100% auto;
+  border-radius: 30rpx 30rpx 0 0;
+
+  &-btn {
+    padding: 20rpx 30rpx 40rpx;
+
+    text {
+      &:nth-child(1) {
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: #00bbff;
+      }
+    }
+  }
+
+  &-input {
+    box-sizing: border-box;
+    height: 80rpx;
+    background: rgba(#f3f6fd, 0.6);
+    border-radius: 16rpx;
+    margin: 0 30rpx;
+    padding-left: 24rpx;
+    padding-right: 10rpx;
+
+    input {
+      font-size: 28rpx;
+      width: 100%;
+    }
+  }
+
+  .scroll-view {
+    width: 100%;
+    height: calc(100% - 212rpx);
+    margin-top: 30rpx;
+  }
+
+  .radio-group {
+    padding: 0 50rpx 30rpx;
+
+    &-item {
+      margin-bottom: 20rpx;
+
+      text {
+        font-size: 28rpx;
+        color: #666;
+      }
+
+      radio {
+        transform: scale(0.8);
+      }
+    }
+  }
+}
+
+.searchButton {
+  height: 60rpx;
+  width: 200rpx;
+  border-radius: 10rpx;
+  line-height: 60rpx;
+  text-align: center;
+  color: #fff;
+  background-color: #00bbff;
+}
diff --git a/collect_information/src/picker-search/picker-search.vue b/collect_information/src/picker-search/picker-search.vue
new file mode 100644
index 0000000..d23edcb
--- /dev/null
+++ b/collect_information/src/picker-search/picker-search.vue
@@ -0,0 +1,90 @@
+<template>
+  <view>
+    <view @tap.stop="open">11111</view>
+    <nut-popup v-model:visible="show" position="bottom" round="true">
+      <view style="height: 1031rpx">
+        <view class="uiwu-picker-search">
+          <view class="uiwu-picker-search-btn uiwu-flex uiwu-flex-space">
+            <text @tap.stop="show = false">取消</text>
+            <text @tap.stop="determine">确定</text>
+          </view>
+          <view class="uiwu-picker-search-input uiwu-flex uiwu-flex-align">
+            <input v-model="inputText.value" type="text" :placeholder="placeholder" confirm-type="search" @confirm="confirm_" />
+            <view @click.stop="confirm" class="searchButton">搜索</view>
+          </view>
+          <scroll-view class="scroll-view" scroll-y>
+            <!-- <radio-group class="radio-group" @change="change">
+              <view class="radio-group-item uiwu-flex uiwu-flex-space" v-for="(item, index) in listData.value" :key="index">
+                <text>{{ item.bank_name }}</text>
+                <radio :value="item.bank_name" color="#687CFF" />
+              </view>
+            </radio-group> -->
+          </scroll-view>
+        </view>
+      </view>
+    </nut-popup>
+  </view>
+</template>
+
+<script setup>
+import './picker-search.scss'
+import { ref, expose } from 'vue'
+// import { searchBankName } from '@/api/app'
+
+const props = defineProps({
+  placeholder: {
+    type: String,
+    default: '请输入银行名称',
+  },
+})
+
+// 定义响应式变量
+const show = ref(true)
+const listData = ref([])
+const currentBankName = ref('')
+const inputText = ref('')
+
+// 搜索方法
+const confirm = () => {
+  // searchBankName({ bank_name: inputText.value.trim() }).then((res) => {
+  //   console.log('searchBankName', res)
+  //   listData.value = res.data
+  // })
+}
+
+// 输入确认方法
+const confirm_ = ({ detail: { value } }) => {
+  console.log('confirm', value)
+  // searchBankName({ bank_name: value.trim() }).then((res) => {
+  //   console.log('searchBankName', res)
+  //   listData.value = res.data
+  // })
+}
+
+// 单选框切换方法
+const change = ({ detail: { value } }) => {
+  console.log('change', value)
+  currentBankName.value = value
+}
+
+// 确定方法
+const determine = () => {
+  if (currentBankName.value.trim() === '') {
+    uni.showToast({
+      title: '请选择银行',
+      duration: 1500,
+      icon: 'error',
+    })
+    return
+  }
+  // 触发父组件的事件，传递选择的银行名称
+  emit('change', currentBankName.value.trim())
+  show.value = false
+}
+
+// 打开弹窗
+const open = () => {
+  show.value = true
+}
+// expose({ open })
+</script>
diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
index b239470..569272c 100644
--- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
+++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
@@ -39,9 +39,131 @@ page {
     border-left: white;
   }
 }
+
 .sigh_btns {
   transform: rotate(-90deg);
   transform-origin: center
 }
 
 .sigh_btns_noRotate {}
+
+.input_box {
+  width: 638rpx;
+  background: #f8f9fa;
+  border-radius: 16rpx;
+  padding: 20rpx 32rpx;
+  display: flex;
+  margin-bottom: 24rpx;
+  display: flex;
+  align-items: center
+}
+
+.input_lable {
+  width: 180rpx;
+  display: flex;
+  flex-wrap: wrap;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #101010;
+  line-height: 40rpx;
+  font-style: normal;
+}
+
+.input_width {
+  width: 400rpx;
+  height: 40rpx;
+  display: flex;
+  justify-content: space-between;
+  align-items: center
+}
+
+
+
+
+
+.uiwu-flex-align {
+  align-items: center;
+}
+
+.uiwu-flex {
+  display: flex;
+}
+
+.uiwu-flex-space {
+  align-items: center;
+  justify-content: space-between;
+}
+
+.uiwu-picker-search {
+  position: absolute;
+  height: 1031rpx;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: url('../../../assets/images/popuptiobg.png') no-repeat 0 0 #fff;
+  background-size: 100% auto;
+  border-radius: 30rpx 30rpx 0 0;
+
+  &-btn {
+    padding: 20rpx 30rpx 40rpx;
+
+    text {
+      &:nth-child(1) {
+        color: #999;
+      }
+
+      &:nth-child(2) {
+        color: rgb(73, 143, 242);
+      }
+    }
+  }
+
+  &-input {
+    box-sizing: border-box;
+    height: 80rpx;
+    background: rgba(#f3f6fd, 0.6);
+    border-radius: 16rpx;
+    margin: 0 30rpx;
+    padding-left: 24rpx;
+    padding-right: 10rpx;
+
+    input {
+      font-size: 28rpx;
+      width: 100%;
+    }
+  }
+
+  .scroll-view {
+    width: 100%;
+    height: 800rpx;
+    margin-top: 30rpx;
+  }
+
+  .radio-group {
+    padding: 0 50rpx 30rpx;
+    overflow-y: scroll;
+
+    &-item {
+      margin-bottom: 20rpx;
+
+      text {
+        font-size: 28rpx;
+        color: #666;
+      }
+
+      radio {
+        transform: scale(0.8);
+      }
+    }
+  }
+}
+
+.searchButton {
+  height: 60rpx;
+  width: 200rpx;
+  border-radius: 10rpx;
+  line-height: 60rpx;
+  text-align: center;
+  color: #fff;
+  background-color: rgb(73, 143, 242);
+}
diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
index 5d78af5..029bc5d 100644
--- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
+++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
@@ -1,6 +1,15 @@
 <template>
   <view class="container">
-    <picker mode="selector" :range="selector" rangeKey="label" @change="onChange">
+    <nut-form labelWidth="320rpx" labelAlign="left" @click.stop="openSearch">
+      <nut-form-item label="考核单位：">
+        <view class="input_width">
+          <input style="width: 300rpx" disabled="true" v-model="enterprisesName" placeholder="请选择考核单位：" placeholder-class="input_placeholder" />
+          <IconFont name="arrow-down"></IconFont>
+        </view>
+      </nut-form-item>
+    </nut-form>
+
+    <!-- <picker mode="selector" :range="selector" rangeKey="label" @change="onChange">
       <view class="picker">
         考核单位：
         <view style="display: flex; align-items: center">
@@ -9,7 +18,7 @@
           <IconFont name="arrow-right"></IconFont>
         </view>
       </view>
-    </picker>
+    </picker> -->
 
     <picker v-if="(selectorType?.length ?? 0) > 0" mode="selector" :range="selectorType" rangeKey="label" @change="onChangeType">
       <view class="picker">
@@ -63,15 +72,48 @@
     <view style="display: flex; width: 100%; justify-content: center; position: fixed; bottom: 50rpx">
       <nut-button :loading="isLoading" shape="round" type="info" @click="onSubmit" style="height: 80rpx; width: 702rpx; margin: 10rpx auto">确认提交</nut-button>
     </view>
+
+    <nut-popup v-model:visible="show" position="bottom" :round="true">
+      <view style="height: 1031rpx">
+        <view class="uiwu-picker-search">
+          <view class="uiwu-picker-search-btn uiwu-flex uiwu-flex-space">
+            <text @tap.stop="show = false">取消</text>
+            <text @tap.stop="determine">确定</text>
+          </view>
+          <view class="uiwu-picker-search-input uiwu-flex uiwu-flex-align">
+            <input v-model="inputText" type="text" placeholder="请输入单位名称" confirm-type="search" @confirm="confirm_" />
+            <view @click.stop="confirm" class="searchButton">搜索</view>
+          </view>
+          <scroll-view class="scroll-view" :scroll-y="true">
+            <!-- <radio-group class="radio-group" @change="radioChange">
+              <view class="radio-group-item uiwu-flex uiwu-flex-space" v-for="(item, index) in selector" :key="index">
+                <text>{{ item.label }}</text>
+                <radio :value="item.value" color="#687CFF" />
+              </view>
+            </radio-group> -->
+            <nut-radio-group style="margin-left: 30rpx" v-model="selectedID">
+              <nut-radio icon-size="20" v-for="(item, index) in selectorCopy" :key="index" :label="item.value"> {{ item.label }}</nut-radio>
+              <view style="height: 40rpx"></view>
+            </nut-radio-group>
+          </scroll-view>
+        </view>
+      </view>
+    </nut-popup>
   </view>
+  <!-- <picker-search ref="picker_search" @change="changeSearch" /> -->
 </template>
+
 <script setup lang="ts">
+// import PickerSearch from '@/components/PickerSearch.vue'
+// import picker-search from
 import { IconFont } from '@nutui/icons-vue-taro'
 import Taro, { useLoad, useUnload } from '@tarojs/taro'
 import './dailyInspection.scss'
 import { ref, computed, reactive, watch } from 'vue'
 import api from '@/request/index'
 import { useDailyStore } from '@/store/daily'
+
+const picker_search = ref()
 const starRating = ref<any[]>([])
 const store = useDailyStore()
 const daily = computed(() => store.getdailyinspection)
@@ -80,7 +122,7 @@ const base64_2 = computed(() => store.get_base64_2)
 
 const currentCkProjectId = ref('')
 const submitData = ref<Item[]>([])
-
+const enterprisesName = ref('')
 const _form = reactive({
   enterprisesUnitId: '', //企事业单位id
   ckProjectId: '', //考核项目
@@ -185,6 +227,7 @@ const onChangeType = function (e: any) {
 }
 
 const selector = ref<UnitEnterprisesUnitList[]>()
+const selectorCopy = ref<UnitEnterprisesUnitList[]>()
 const selectorChecked = ref<string>('')
 const onChange = function (e: any) {
   try {
@@ -202,6 +245,7 @@ const getUnitEnterprisesUnitList = async function () {
   const res = await api.get<UnitEnterprisesUnitList[]>(`/policeIndex/getUnitEnterprisesUnitList`)
 
   selector.value = res.data
+  selectorCopy.value = res.data
 }
 
 const _showToast = function (title) {
@@ -309,4 +353,41 @@ useUnload(() => {
   _form.byAssessmentEnterprisesUnitUserSignature = ''
   _form.remark = ''
 })
+
+const show = ref(false)
+const inputText = ref('')
+const selectedID = ref('')
+
+const openSearch = () => {
+  show.value = true
+}
+
+const fuzzySearch = function (query) {
+  selectorCopy.value = selector.value?.filter((item) => item.label.includes(query))
+}
+const confirm = () => {
+  console.log(inputText.value)
+  if (inputText.value.trim() === '') {
+    selectorCopy.value = selector.value
+  } else {
+    fuzzySearch(inputText.value.trim())
+  }
+}
+const confirm_ = ({ detail: { value } }) => {
+  console.log('confirm', value)
+  if (inputText.value.trim() === '') {
+    selectorCopy.value = selector.value
+  } else {
+    fuzzySearch(inputText.value.trim())
+  }
+}
+
+const determine = () => {
+  let index: number = selector.value?.findIndex((item) => item.value === selectedID.value) as number
+  _form.enterprisesUnitId = selectedID.value
+  let type = selector.value?.[index].extData.type.value
+  enterprisesName.value = selector.value?.[index].label as string
+  show.value = false
+  ckProjectListByType(type)
+}
 </script>

From 18ba81d1194b6958d22ceb371405de1f15344680 Mon Sep 17 00:00:00 2001
From: TimSpan <cat20201314@163.com>
Date: Fri, 15 Nov 2024 11:48:03 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect_information/.env.development          |  4 ++--
 .../dailyInspection/dailyInspection.scss      | 20 -------------------
 .../dailyInspection/dailyInspection.vue       | 15 ++++++++++++--
 policeManagement/.env.development             |  2 +-
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/collect_information/.env.development b/collect_information/.env.development
index 4e393f7..d7a068a 100644
--- a/collect_information/.env.development
+++ b/collect_information/.env.development
@@ -1,7 +1,7 @@
 # 配置文档参考 https://taro-docs.jd.com/docs/next/env-mode-config
 TARO_APP_ID="wx0acd1c4fcf94bdd3"
-# TARO_APP_BASE_API="http://172.10.10.93:8765"
-TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
+TARO_APP_BASE_API="http://172.10.10.93:8765"
+# TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
 
 
 
diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
index 569272c..1d91809 100644
--- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
+++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.scss
@@ -47,27 +47,7 @@ page {
 
 .sigh_btns_noRotate {}
 
-.input_box {
-  width: 638rpx;
-  background: #f8f9fa;
-  border-radius: 16rpx;
-  padding: 20rpx 32rpx;
-  display: flex;
-  margin-bottom: 24rpx;
-  display: flex;
-  align-items: center
-}
 
-.input_lable {
-  width: 180rpx;
-  display: flex;
-  flex-wrap: wrap;
-  font-weight: bold;
-  font-size: 28rpx;
-  color: #101010;
-  line-height: 40rpx;
-  font-style: normal;
-}
 
 .input_width {
   width: 400rpx;
diff --git a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
index 029bc5d..6a5ab3f 100644
--- a/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
+++ b/collect_information/src/subPages/police/dailyInspection/dailyInspection.vue
@@ -3,7 +3,7 @@
     <nut-form labelWidth="320rpx" labelAlign="left" @click.stop="openSearch">
       <nut-form-item label="考核单位：">
         <view class="input_width">
-          <input style="width: 300rpx" disabled="true" v-model="enterprisesName" placeholder="请选择考核单位：" placeholder-class="input_placeholder" />
+          <input style="width: 300rpx" disabled="true" v-model="enterprisesName" placeholder="请选择考核单位：" />
           <IconFont name="arrow-down"></IconFont>
         </view>
       </nut-form-item>
@@ -91,10 +91,11 @@
                 <radio :value="item.value" color="#687CFF" />
               </view>
             </radio-group> -->
-            <nut-radio-group style="margin-left: 30rpx" v-model="selectedID">
+            <nut-radio-group v-if="(selectorCopy?.length ?? 0) > 0" style="margin-left: 30rpx" v-model="selectedID">
               <nut-radio icon-size="20" v-for="(item, index) in selectorCopy" :key="index" :label="item.value"> {{ item.label }}</nut-radio>
               <view style="height: 40rpx"></view>
             </nut-radio-group>
+            <nut-empty v-else description="暂无单位"></nut-empty>
           </scroll-view>
         </view>
       </view>
@@ -383,6 +384,16 @@ const confirm_ = ({ detail: { value } }) => {
 }
 
 const determine = () => {
+  console.log(selectedID.value)
+  if (selectedID.value === '' && (selector.value?.length as number) > 0) {
+    Taro.showToast({
+      title: '请选择单位',
+      icon: 'none',
+      duration: 1500,
+      mask: true,
+    })
+    return
+  }
   let index: number = selector.value?.findIndex((item) => item.value === selectedID.value) as number
   _form.enterprisesUnitId = selectedID.value
   let type = selector.value?.[index].extData.type.value
diff --git a/policeManagement/.env.development b/policeManagement/.env.development
index 853dff4..09fc9f3 100644
--- a/policeManagement/.env.development
+++ b/policeManagement/.env.development
@@ -7,7 +7,7 @@ VITE_DROP_CONSOLE=false
 VITE_APP_BASE_API=/api
 # VITE_APP_PROXY_URL=http://localhost:8765
 VITE_APP_PROXY_URL=http://172.10.10.93:8765
-
+# 
 
 # rsa 公钥
 VITE_APP_RSA_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJps/EXxxSpEM1Ix4R0NWIOBciHCr7P7coDT8tNKfelgR7txcJOqHCO/MIWe7T04aHQTcpQxqx9hMca7dbqz8TZpz9jvLzE/6ZonVKxHsoFnNlHMp1/CPAJ9f6D9wYicum2KltJkmQ0g//D9W2zPCYoGOmSRFcZx/KEBa4EM53jQIDAQAB