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/importData/adapt/ImportOwnerCarV2DataCleaningAdapt.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarV2DataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarV2DataCleaningAdapt.java
index 9fdc277..18c67ba 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarV2DataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarV2DataCleaningAdapt.java
@@ -36,6 +36,9 @@
return ownerCars;
}
+ public String defaultValue(Object o) {
+ return o == null ? "" : o.toString();
+ }
/**
* 鑾峰彇涓氫富杞﹁締淇℃伅
@@ -45,7 +48,7 @@
*/
private void getOwnerCars(Workbook workbook, List<OwnerCarDto> ownerCars, ComponentValidateResult result) throws ParseException {
Sheet sheet = null;
- sheet = ImportExcelUtils.getSheet(workbook, "鍦伴潰鍋滆溅璐� 瀵煎叆鏂版ā鏉� ");
+ sheet = ImportExcelUtils.getSheet(workbook, "鍦伴潰鍋滆溅璐� 瀵煎叆鏂版ā鏉�");
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
OwnerCarDto importOwnerCar = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
@@ -56,9 +59,11 @@
if (StringUtil.isNullOrNone(os[0])) {
continue;
}
- Assert.hasValue(os[8], (osIndex + 1) + "杞︾墝鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[1], (osIndex + 1) + "椤圭洰缂栫爜涓嶈兘涓虹┖");
- Assert.hasValue(os[10], (osIndex + 1) + "涓氫富涓嶈兘涓虹┖");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛岃溅鐗屽彿涓嶈兘涓虹┖");
+ if (defaultValue(os[1]).isEmpty() && defaultValue(os[2]).isEmpty()) {
+ throw new IllegalArgumentException((osIndex + 1) + "琛屽皬鍖虹紪鐮佸拰灏忓尯鍚嶇О蹇呭～鍏朵竴");
+ }
+// Assert.hasValue(os[10], (osIndex + 1) + "琛屼笟涓讳笉鑳戒负绌�");
// Assert.hasValue(os[2], (osIndex + 1) + "鎵嬫満鍙蜂笉鑳戒负绌�");
// Assert.hasValue(os[3], (osIndex + 1) + "杞﹁締鍝佺墝涓嶈兘涓虹┖");
// Assert.hasValue(os[4], (osIndex + 1) + "杞﹁締绫诲瀷涓嶈兘涓虹┖");
@@ -66,17 +71,17 @@
// Assert.hasValue(os[6], (osIndex + 1) + "棰滆壊涓嶈兘涓虹┖");
// Assert.hasValue(os[7], (osIndex + 1) + "鍋滆溅鍦轰笉鑳戒负绌�");
// Assert.hasValue(os[8], (osIndex + 1) + "杞︿綅涓嶈兘涓虹┖");
- Assert.hasValue(os[14], (osIndex + 1) + "璧风鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[15], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[12], (osIndex + 1) + "鍋滆溅绫诲瀷涓嶈兘涓虹┖");
+ Assert.hasValue(os[14], (osIndex + 1) + "琛岃捣绉熸椂闂翠笉鑳戒负绌�");
+// Assert.hasValue(os[15], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
+ Assert.hasValue(os[12], (osIndex + 1) + "琛屽仠杞︾被鍨嬩笉鑳戒负绌�");
// Assert.hasValue(os[11], (osIndex + 1) + "鍋滆溅鍦虹被鍨嬩笉鑳戒负绌�");
String startTime = os.length >= 14 && os[14] != null ? excelDoubleToDate(os[14].toString()):"";
String endTime = os.length >= 15 && os[15] != null ? excelDoubleToDate(os[15].toString()):"";
// Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD鏂囨湰鏍煎紡");
// Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD鏂囨湰鏍煎紡");
importOwnerCar = new OwnerCarDto();
- importOwnerCar.setCarNum(os[8].toString().trim());
- importOwnerCar.setOwnerName(os[10].toString().trim());
+ importOwnerCar.setCarNum(defaultValue(os[8]).trim());
+ importOwnerCar.setOwnerName(defaultValue(os[10]).trim());
importOwnerCar.setLink(os.length <= 11 || os[11] == null ? "" : os[11].toString().trim());
// importOwnerCar.setCarBrand(os.length <= 3 || os[3] == null ? "" : os[3].toString().trim());
importOwnerCar.setCarType("9901");
@@ -94,6 +99,10 @@
importOwnerCar.setCommunityId(result.getCommunityId());
importOwnerCar.setUserId(result.getUserId());
importOwnerCar.setOtherItem(os);
+ importOwnerCar.setRoadName(defaultValue(os[3]));
+ importOwnerCar.setFloorNum(defaultValue(os[4]));
+ importOwnerCar.setUnitNum(defaultValue(os[5]));
+ importOwnerCar.setRoomNum(defaultValue(os[6]));
ownerCars.add(importOwnerCar);
}
@@ -109,9 +118,11 @@
if (StringUtil.isNullOrNone(os[0])) {
continue;
}
- Assert.hasValue(os[8], (osIndex + 1) + "杞︾墝鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[1], (osIndex + 1) + "椤圭洰缂栫爜涓嶈兘涓虹┖");
- Assert.hasValue(os[10], (osIndex + 1) + "涓氫富涓嶈兘涓虹┖");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛岃溅鐗屽彿涓嶈兘涓虹┖");
+ if (defaultValue(os[1]).isEmpty() && defaultValue(os[2]).isEmpty()) {
+ throw new IllegalArgumentException((osIndex + 1) + "琛屽皬鍖虹紪鐮佸拰灏忓尯鍚嶇О蹇呭～鍏朵竴");
+ }
+// Assert.hasValue(os[10], (osIndex + 1) + "琛屼笟涓讳笉鑳戒负绌�");
// Assert.hasValue(os[2], (osIndex + 1) + "鎵嬫満鍙蜂笉鑳戒负绌�");
// Assert.hasValue(os[3], (osIndex + 1) + "杞﹁締鍝佺墝涓嶈兘涓虹┖");
// Assert.hasValue(os[4], (osIndex + 1) + "杞﹁締绫诲瀷涓嶈兘涓虹┖");
@@ -119,17 +130,17 @@
// Assert.hasValue(os[6], (osIndex + 1) + "棰滆壊涓嶈兘涓虹┖");
// Assert.hasValue(os[7], (osIndex + 1) + "鍋滆溅鍦轰笉鑳戒负绌�");
// Assert.hasValue(os[8], (osIndex + 1) + "杞︿綅涓嶈兘涓虹┖");
- Assert.hasValue(os[14], (osIndex + 1) + "璧风鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[15], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[12], (osIndex + 1) + "鍋滆溅绫诲瀷涓嶈兘涓虹┖");
+ Assert.hasValue(os[14], (osIndex + 1) + "琛岃捣绉熸椂闂翠笉鑳戒负绌�");
+// Assert.hasValue(os[15], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
+ Assert.hasValue(os[12], (osIndex + 1) + "琛屽仠杞︾被鍨嬩笉鑳戒负绌�");
// Assert.hasValue(os[11], (osIndex + 1) + "鍋滆溅鍦虹被鍨嬩笉鑳戒负绌�");
String startTime = os.length >= 14 && os[14] != null ? excelDoubleToDate(os[14].toString()):"";
String endTime = os.length >= 15 && os[15] != null ? excelDoubleToDate(os[15].toString()):"";
// Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD鏂囨湰鏍煎紡");
// Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD鏂囨湰鏍煎紡");
importOwnerCar = new OwnerCarDto();
- importOwnerCar.setCarNum(os[8].toString().trim());
- importOwnerCar.setOwnerName(os[10].toString().trim());
+ importOwnerCar.setCarNum(defaultValue(os[8]).trim());
+ importOwnerCar.setOwnerName(defaultValue(os[10]).trim());
importOwnerCar.setLink(os.length <= 11 || os[11] == null ? "" : os[11].toString().trim());
// importOwnerCar.setCarBrand(os.length <= 3 || os[3] == null ? "" : os[3].toString().trim());
importOwnerCar.setCarType("9901");
--
Gitblit v1.8.0