Merge remote-tracking branch 'origin/main'

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="http://172.10.10.93:8765"
-TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
+# TARO_APP_BASE_API="https://www.hnjinglian.cn:5678"
 
 
 

collect_information/src/picker-search/picker-search.json.ts

@@ -0,0 +1,3 @@
+export default {
+  "component": true
+}

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;
+}

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>

collect_information/src/subPages/police/dailyInspection/dailyInspection.scss

@@ -39,9 +39,111 @@ page {
     border-left: white;
   }
 }
+
 .sigh_btns {
   transform: rotate(-90deg);
   transform-origin: center
 }
 
 .sigh_btns_noRotate {}
+
+
+
+.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);
+}

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="请选择考核单位：" />
+          <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,49 @@
     <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 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>
+    </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 +123,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 +228,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 +246,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 +354,51 @@ 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 = () => {
+  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
+  enterprisesName.value = selector.value?.[index].label as string
+  show.value = false
+  ckProjectListByType(type)
+}
 </script>

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

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("初始化枚举字典数据----完成");
+    }
+}

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();
+        Map<BaseEnum<?>, SelectNodeVo<?>> nodeVoMap = GlobalCacheManager.ENUM_CACHE.get(enumType);
-        for (BaseEnum<P> pBaseEnum : enumConstants) {
+        for (Map.Entry<BaseEnum<?>, SelectNodeVo<?>> mapEntry : nodeVoMap.entrySet()) {
-            if (ObjectUtil.equals(code, pBaseEnum.getValue())) {
+            if (ObjectUtil.equals(code, mapEntry.getValue().getValue())) {
-                return (T) pBaseEnum;
+                return (T) mapEntry.getKey();
             }
         }
         throw new MessageException("不存在值为:{} 的【{}】对象!", code.toString(), enumType.componentType().getSimpleName());
     }
 
-    default Object serializer() {
+    @SuppressWarnings("unchecked")
-        return Dict.of(
+    default SelectNodeVo<V> serializer() {
-                "value", this.getValue(),
+        Map<BaseEnum<?>, SelectNodeVo<?>> map = GlobalCacheManager.ENUM_CACHE.get(this.getClass());
-                "label", this.getLabel()
+        if (map != null) {
-        );
+            return (SelectNodeVo<V>) map.get(this);
         }
+        return null;
+    }
+
 }

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)
-        );
-    }
 }

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() {
+    public SelectNodeVo<String> serializer() {
-        return Dict.of(
+        return SelectNodeVo.<String>builder()
-                "value", this.getValue(),
+                .value(this.getValue())
-                "label", this.getLabel(),
+                .label(this.getLabel())
-                "extData", Dict.of("icon", "/resources/icon/gaode/marker/" + this.icon)
+                .extData(Dict.of("icon", "/resources/icon/gaode/marker/" + this.icon))
-        );
+                .build();
     }
 }

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)
-        );
-    }
 }

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

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.HashMap;
-import java.util.*;
+import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
-import java.util.stream.Stream;
 
 /**
  * @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());
-
-    }
 }

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;

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;

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;

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;

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

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;
-
 
 /**
  * 考核记录 实体类

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;
-
 
 /**
  * 考核记录明细 实体类

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;
-
 
 /**
  * 考核组 实体类

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;
-
 
 /**
  * 分组内的考核项 实体类

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;
-
 
 /**
  * 考核项目 实体类

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;
-
 
 /**
  * 扣分标准 实体类

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;

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

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;

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;
 

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;

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;

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;
 

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;

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;

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;

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;
-
 
 /**
  * 保安人员 实体类

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;
 

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;

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

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;

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;