Merge remote-tracking branch 'origin/master'

lyh

2025-07-09 c8cd3c3bd67c33002700e110e3648eba0aa013dd

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java

@@ -15,15 +15,16 @@
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService;
import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

/**
@@ -149,6 +150,7 @@

    /**
     * 提交
     *
     * @param id
     * @return
     */
@@ -181,41 +183,45 @@
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            MultipartFile file = entity.getValue();
            String fileName = file.getOriginalFilename();

            Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importSafetyEquipmentCheck(file);

            if (importResult.isSuccess()) {
                results.put(fileName, "成功: " + importResult.getMessage());
                successCount++;
            } else {
                results.put(fileName, "失败: " + importResult.getMessage());
                results.put(fileName, importResult.getMessage());
                failureCount++;
            }
        }
        // 构建最终响应
        Map<String, Object> response = new HashMap<>();
        response.put("results", results);
        response.put("totalFiles", fileMap.size());
        response.put("successCount", successCount);
        response.put("failureCount", failureCount);

        if (failureCount > 0) {
            return Result.error("部分文件导入失败", response);
        }

        return Result.ok("所有文件导入成功"+response);
        return getResult(results, fileMap.size(), successCount, failureCount);
    }

    /**
     * 安全装置检查明细导入
     *
     * @param request
     * @param response
     * @return
     */
    @PostMapping(value = "/importPrecisionCheck")
    public Result<?> importPrecisionCheck(HttpServletRequest request, HttpServletResponse response) {
        return null;
    public Result<?> importPrecisionCheck(HttpServletRequest request) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, String> results = new LinkedHashMap<>();
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 统计导入结果
        int successCount = 0;
        int failureCount = 0;
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            MultipartFile file = entity.getValue();
            String fileName = file.getOriginalFilename();
            Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importPrecisionCheck(file);
            if (importResult.isSuccess()) {
                successCount++;
            } else {
                results.put(fileName, importResult.getMessage());
                failureCount++;
            }
        }
        // 构建最终响应
        return getResult(results, fileMap.size(), successCount, failureCount);
    }


@@ -223,12 +229,42 @@
     * 安全装置检查明细导入
     *
     * @param request
     * @param response
     * @return
     */
    @PostMapping(value = "/importOtherCheck")
    public Result<?> importOtherCheck(HttpServletRequest request, HttpServletResponse response) {
        return null;
    public Result<?> importOtherCheck(HttpServletRequest request) {
        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
        Map<String, String> results = new LinkedHashMap<>();
        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
        // 统计导入结果
        int successCount = 0;
        int failureCount = 0;
        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
            MultipartFile file = entity.getValue();
            String fileName = file.getOriginalFilename();
            Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importOtherCheck(file);
            if (importResult.isSuccess()) {
                successCount++;
            } else {
                results.put(fileName, importResult.getMessage());
                failureCount++;
            }
        }
        // 构建最终响应
        return getResult(results, fileMap.size(), successCount, failureCount);
    }

    @NotNull
    private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) {
        List<String> response = new ArrayList<>();
        response.add("总文件数：" + fileCount);
        response.add("成功数：" + successCount);
        response.add("失败数：" + failureCount);
        if (failureCount > 0) {
            response.add("错误信息：" + results.values());
            return Result.error("部分文件导入失败：" + response);
        }
        return Result.ok("所有文件导入成功：" + response);
    }