From b2358fc44148073645def4e723c8153a98a701da Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 24 三月 2026 09:29:32 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 436eae6..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
@@ -32,6 +32,7 @@
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
@@ -59,7 +60,8 @@
/**
* 瀵煎叆鏈�澶ц鏁�
*/
- public static final int MAX_LINE = 5000;
+ @Value("${import.line.max}")
+ public int MAX_LINE;
/**
* 瀵煎叆鏈�澶ц鏁�
@@ -95,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);
@@ -154,7 +160,7 @@
}
else{
workbook = ImportExcelUtils.createWorkbook(uploadFile);
-
+ result.setImportFileName(uploadFile.getOriginalFilename());
// todo 閫傞厤鍣ㄥ皝瑁呮暟鎹�
List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result);
@@ -200,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