refactor: Replace HashMap with ConcurrentHashMap and clean up unused imports

Author: fit2-zhao

backend/crm/src/main/java/cn/cordys/common/resolver/field/ModuleFieldResolverFactory.java

@@ -9,7 +9,7 @@
  */
 public class ModuleFieldResolverFactory {
 
-    private static final HashMap<String, AbstractModuleFieldResolver> resolverMap = new HashMap<>();
+    private static final HashMap<String, AbstractModuleFieldResolver<?>> resolverMap = new HashMap<>();
 
     private static final DefaultModuleFieldResolver defaultModuleFieldResolver = new DefaultModuleFieldResolver();
 
@@ -47,8 +47,8 @@ public class ModuleFieldResolverFactory {
         resolverMap.put(FieldType.FORMULA.name(), new FormulaResolver());
     }
 
-    public static AbstractModuleFieldResolver getResolver(String type) {
-        AbstractModuleFieldResolver moduleFieldResolver = resolverMap.get(type);
+    public static AbstractModuleFieldResolver<?> getResolver(String type) {
+        var moduleFieldResolver = resolverMap.get(type);
         return moduleFieldResolver == null ? defaultModuleFieldResolver : moduleFieldResolver;
     }
 }

backend/crm/src/main/java/cn/cordys/common/service/BaseExportService.java

@@ -49,8 +49,6 @@
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -78,9 +76,6 @@ public abstract class BaseExportService {
     @Resource
     private ExportTaskService exportTaskService;
 
-    private final ExecutorService executor = Executors.newVirtualThreadPerTaskExecutor();
-
-
     public Map<String, BaseField> getFieldConfigMap(String formKey, String orgId) {
         return Objects.requireNonNull(CommonBeanFactory.getBean(ModuleFormService.class))
                 .getAllFields(formKey, orgId)
@@ -331,7 +326,7 @@ private List<List<String>> getExportMergeHeadList(List<ExportHeadDTO> headList,
      * @return 单行记录值
      */
     public List<Object> transFieldValueWithSub(List<FieldExportMeta> metas, LinkedHashMap<String, Object> sysFieldValMap, Map<String, Object> normalFieldMap,
-                                               Map<String, Object> subRowMap, HashMap<Object, Object> cacheMap) {
+                                               Map<String, Object> subRowMap, Map<Object, Object> cacheMap) {
         List<Object> dataList = new ArrayList<>(metas.size());
         for (FieldExportMeta meta : metas) {
             BaseField field = meta.getField();
@@ -375,7 +370,7 @@ public List<Object> transFieldValueWithSub(List<FieldExportMeta> metas, LinkedHa
     }
 
     @SuppressWarnings({"rawtypes", "unchecked"})
-    public Object transformFieldValue(AbstractModuleFieldResolver resolver, BaseField field, Object value, HashMap<Object, Object> cacheMap) {
+    public Object transformFieldValue(AbstractModuleFieldResolver resolver, BaseField field, Object value, Map<Object, Object> cacheMap) {
         if (value == null) {
             return null;
         }
@@ -416,7 +411,7 @@ public Object transformFieldValue(BaseField field, Object value) {
      *
      * @return 导出数据列表
      */
-    protected List<List<Object>> buildDataWithSub(List<BaseModuleFieldValue> moduleFieldValues, ExportFieldParam exportFieldParam, List<FieldExportMeta> metas, LinkedHashMap<String, Object> systemFieldMap, HashMap<Object, Object> cacheMap) {
+    protected List<List<Object>> buildDataWithSub(List<BaseModuleFieldValue> moduleFieldValues, ExportFieldParam exportFieldParam, List<FieldExportMeta> metas, LinkedHashMap<String, Object> systemFieldMap, Map<Object, Object> cacheMap) {
         List<List<Object>> dataList = new ArrayList<>();
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(moduleFieldValues)) {
             // 无自定义字段, 导出系统字段值, 单行导出

backend/crm/src/main/java/cn/cordys/crm/contract/service/ContractExportService.java

@@ -19,16 +19,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Strings;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.Semaphore;
+import java.util.concurrent.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -82,7 +80,7 @@ private MergeResult parallelBuildMergeResult(String taskId, ExportDTO exportPara
                                                  List<ContractListResponse> dataList,
                                                  ExportFieldParam exportFieldParam) {
         int size = dataList.size();
-        var cacheMap = new HashMap<>();
+        var cacheMap = new ConcurrentHashMap<>();
         List<List<Object>> mergeRowData = new ArrayList<>(size);
         List<int[]> mergeRegions = new ArrayList<>();
 
@@ -99,8 +97,7 @@ private MergeResult parallelBuildMergeResult(String taskId, ExportDTO exportPara
                 // 获取数据库访问许可
                 dbSemaphore.acquire();
                 try {
-                    List<List<Object>> buildData = buildData(detail, exportFieldParam,
-                            exportParam.getExportMetas(), cacheMap);
+                    List<List<Object>> buildData = buildData(detail, exportFieldParam, exportParam.getExportMetas(), cacheMap);
                     return Pair.of(idx, buildData);
                 } finally {
                     dbSemaphore.release();  // 确保释放
@@ -139,7 +136,7 @@ private MergeResult parallelBuildMergeResult(String taskId, ExportDTO exportPara
                 .build();
     }
 
-    private List<List<Object>> buildData(ContractListResponse detail, ExportFieldParam exportFieldParam, List<FieldExportMeta> exportMetas, HashMap<Object, Object> cacheMap) {
+    private List<List<Object>> buildData(ContractListResponse detail, ExportFieldParam exportFieldParam, List<FieldExportMeta> exportMetas, Map<Object, Object> cacheMap) {
         return buildDataWithSub(detail.getModuleFields(), exportFieldParam, exportMetas, getSystemFieldMap(detail, exportMetas), cacheMap);
     }
 
@@ -152,28 +149,39 @@ public LinkedHashMap<String, Object> getSystemFieldMap(ContractListResponse data
         systemFieldMap.put("amount", data.getAmount());
         systemFieldMap.put("alreadyPayAmount", data.getAlreadyPayAmount());
         systemFieldMap.put("number", data.getNumber());
+
         if (StringUtils.isNotBlank(data.getApprovalStatus())) {
             systemFieldMap.put("approvalStatus", Translator.get("contract.approval_status." + data.getApprovalStatus().toLowerCase(), Locale.SIMPLIFIED_CHINESE));
         }
         if (StringUtils.isNotBlank(data.getStage())) {
             systemFieldMap.put("stage", Translator.get("contract.stage." + data.getStage().toLowerCase(), Locale.SIMPLIFIED_CHINESE));
         }
+
         systemFieldMap.put("createUser", data.getCreateUserName());
         systemFieldMap.put("createTime", TimeUtils.getDateTimeStr(data.getCreateTime()));
         systemFieldMap.put("updateUser", data.getUpdateUserName());
         systemFieldMap.put("updateTime", TimeUtils.getDateTimeStr(data.getUpdateTime()));
         systemFieldMap.put("voidReason", data.getVoidReason());
 
-        FieldExportMeta startTime = exportMetas.stream().filter(field -> Strings.CI.equals(field.getBusinessKey(), "startTime")).findFirst().orElse(null);
-        if (startTime != null) {
-            AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(startTime.getField().getType());
-            systemFieldMap.put("startTime", customFieldResolver.transformToValue(startTime.getField(), String.valueOf(data.getStartTime())));
-        }
-        FieldExportMeta endTime = exportMetas.stream().filter(field -> Strings.CI.equals(field.getBusinessKey(), "endTime")).findFirst().orElse(null);
-        if (endTime != null) {
-            AbstractModuleFieldResolver customFieldResolver = ModuleFieldResolverFactory.getResolver(endTime.getField().getType());
-            systemFieldMap.put("endTime", customFieldResolver.transformToValue(endTime.getField(), String.valueOf(data.getEndTime())));
-        }
+        // 将 exportMetas 转为 Map，避免重复遍历
+        Map<String, FieldExportMeta> metaMap = exportMetas.stream()
+                .collect(Collectors.toMap(FieldExportMeta::getBusinessKey, Function.identity(), (a, b) -> a));
+
+        resolveAndPutTimeField(systemFieldMap, metaMap, "startTime", String.valueOf(data.getStartTime()));
+        resolveAndPutTimeField(systemFieldMap, metaMap, "endTime", String.valueOf(data.getEndTime()));
+
         return systemFieldMap;
     }
+
+    private void resolveAndPutTimeField(LinkedHashMap<String, Object> map,
+                                        Map<String, FieldExportMeta> metaMap,
+                                        String businessKey,
+                                        String rawValue) {
+        FieldExportMeta meta = metaMap.get(businessKey);
+        if (meta != null) {
+            AbstractModuleFieldResolver resolver = ModuleFieldResolverFactory.getResolver(meta.getField().getType());
+            map.put(businessKey, resolver.transformToValue(meta.getField(), rawValue));
+        }
+    }
+
 }