Z四

chengf

2026-01-27 b6184e2ddf3db37a94f7efb3b619bbc64642a292

 service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java

@@ -97,8 +97,12 @@
    @Override
    public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
        JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
        if (paramIn.getString("userId").isEmpty() || paramIn.getString("userId").equals("null")){
            throw new IllegalArgumentException("userId为空");
        }
        paramIn.put("userId", pd.getUserId());
        Assert.hasKeyAndValue(paramIn, "importAdapt", "未包含模板");
        Assert.hasKeyAndValue(paramIn, "userId", "未包含userId");
        String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";

        importDataCleaningAdapt = ApplicationContextFactory.getBean(importAdapt, IImportDataCleaningAdapt.class);
@@ -156,7 +160,7 @@
            }
            else{
                workbook = ImportExcelUtils.createWorkbook(uploadFile);

                result.setImportFileName(uploadFile.getOriginalFilename());
                // todo 适配器封装数据
                List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result);

@@ -202,6 +206,7 @@
                assetImportLogPo.setUserName(users.get(0).getUserName());
            }
        }
        assetImportLogPo.setImportFileName(result.getImportFileName());
        assetImportLogInnerServiceSMOImpl.saveAssetImportLog(assetImportLogPo);

        List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();