From d0b19298e28a9b8b50c778704b77160f17e73950 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期五, 17 四月 2026 18:20:38 +0800
Subject: [PATCH] 水电话费
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportRoomOwnerDataV2CleaningAdapt.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 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 8395634..ee51c77 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
@@ -48,23 +48,27 @@
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportOwnerRoomDto importOwnerRoomDto = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- if (osIndex < 8) {
+ if (osIndex < 5) {
continue;
}
if (oList.get(osIndex)[0] == null) {
break;
}
- Object[] os = new Object[168];
- 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[167] = result.getUserId();
+ 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[5], (osIndex + 1) + "琛岃矾涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[7], (osIndex + 1) + "琛岄棬鍙蜂笉鑳戒负绌�");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[8], (osIndex + 1) + "琛屽鍙蜂笉鑳戒负绌�");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[10], (osIndex + 1) + "琛屼笟涓诲湴鍧�涓嶈兘涓虹┖");
+ Assert.hasValue("浣忓畢鐗╀笟璐� 瀵煎叆鏂版ā鏉夸腑" + os[16], (osIndex + 1) + "琛屼綇瀹呴潰绉笉鑳戒负绌�");
+ os[169] = result.getUserId();
ownerRoomDtos.add(os);
@@ -72,27 +76,30 @@
sheet = ImportExcelUtils.getSheet(workbook, " 鍟嗛摵鐗╀笟璐� 瀵煎叆鏂版ā鏉�");
oList = ImportExcelUtils.listFromSheet(sheet);
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- if (osIndex < 8) {
+ if (osIndex < 5) {
continue;
}
if (oList.get(osIndex)[0] == null) {
break;
}
- Object[] os = new Object[168];
- 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[167] = result.getUserId();
+ Object[] os = new Object[170];
+ System.arraycopy(oList.get(osIndex), 0, os, 0, Math.min(oList.get(osIndex).length, 170));
+// 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