From b6184e2ddf3db37a94f7efb3b619bbc64642a292 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 27 一月 2026 18:12:48 +0800
Subject: [PATCH] Z四
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
index bb62387..f7fd3b7 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/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", "鏈寘鍚玼serId");
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<>();
--
Gitblit v1.8.0