From 64b14b0549344f13b191e2c26ed199f62655c43f Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 25 二月 2026 10:12:46 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
index 1d89e5e..93bee0e 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java
@@ -7,6 +7,7 @@
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.system.ComponentValidateResult;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import org.apache.poi.ss.usermodel.Sheet;
@@ -47,13 +48,57 @@
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportOwnerRoomDto importOwnerRoomDto = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- if (osIndex < 7) {
+ if (osIndex < 5) {
continue;
}
- Object[] os = oList.get(osIndex);
+
+ if (oList.get(osIndex)[0] == null) {
+ break;
+ }
+ Object[] os = new Object[170];
+ try {
+ System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throw new IllegalArgumentException("Excel闀垮害杩囬暱锛�");
+ }
+// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
+// Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
+// Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
+// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
+ os[169] = result.getUserId();
+
ownerRoomDtos.add(os);
+ }
+ sheet = ImportExcelUtils.getSheet(workbook, " 鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉�");
+ oList = ImportExcelUtils.listFromSheet(sheet);
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ if (osIndex < 5) {
+ continue;
+ }
+ if (oList.get(osIndex)[0] == null) {
+ break;
+ }
+ Object[] os = new Object[170];
+ System.arraycopy(oList.get(osIndex), 0, os, 0, oList.get(osIndex).length);
+// Assert.hasValue(os[3], (osIndex + 1) + "琛岄」鐩紪鐮佷笉鑳戒负绌�");
+ Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
+// Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
+// Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
+// Assert.hasValue(os[9], (osIndex + 1) + "琛岄棬瀹ゅ彿涓嶈兘涓虹┖");
+ Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
+ Assert.hasValue("鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
+ os[169] = result.getUserId();
+
+
+ ownerRoomDtos.add(os);
+ }
+ if (ownerRoomDtos.size() == 0) {
+ throw new IllegalArgumentException("sheet鍐呭涓虹┖");
}
}
--
Gitblit v1.8.0