From dd6687b118561100e1677e88a9c2f5842a54c531 Mon Sep 17 00:00:00 2001
From: jialh <1972868360@qq.com>
Date: 星期四, 16 四月 2026 18:14:14 +0800
Subject: [PATCH] 水电话费
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java
index fe8a2e3..c14d5f0 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java
@@ -54,47 +54,51 @@
if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if (StringUtil.isNullOrNone(os[0])) {
+ if (StringUtil.isNullOrNone(os[8])) {
continue;
}
- Assert.hasValue(os[0], (osIndex + 1) + "杞︾墝鍙蜂笉鑳戒负绌�");
- Assert.hasValue(os[1], (osIndex + 1) + "涓氫富涓嶈兘涓虹┖");
-// Assert.hasValue(os[2], (osIndex + 1) + "鎵嬫満鍙蜂笉鑳戒负绌�");
+ Assert.hasValue(os[8], (osIndex + 1) + "琛岃溅鐗屽彿涓嶈兘涓虹┖");
+ Assert.hasValue(os[10], (osIndex + 1) + "琛屼笟涓讳笉鑳戒负绌�");
+// Assert.hasValue(os[11], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
// Assert.hasValue(os[3], (osIndex + 1) + "杞﹁締鍝佺墝涓嶈兘涓虹┖");
// Assert.hasValue(os[4], (osIndex + 1) + "杞﹁締绫诲瀷涓嶈兘涓虹┖");
// Assert.hasValue(os[5], (osIndex + 1) + "杞︾墝绫诲瀷涓嶈兘涓虹┖");
// Assert.hasValue(os[6], (osIndex + 1) + "棰滆壊涓嶈兘涓虹┖");
// Assert.hasValue(os[7], (osIndex + 1) + "鍋滆溅鍦轰笉鑳戒负绌�");
-// Assert.hasValue(os[8], (osIndex + 1) + "杞︿綅涓嶈兘涓虹┖");
- if(os.length > 8) {
- Assert.hasValue(os[9], (osIndex + 1) + "璧风鏃堕棿涓嶈兘涓虹┖");
- }else if(os.length > 9) {
- Assert.hasValue(os[10], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
- }else if(os.length > 11) {
- Assert.hasValue(os[12], (osIndex + 1) + "杞︿綅绫诲瀷涓嶈兘涓虹┖");
+// Assert.hasValue(os[9], (osIndex + 1) + "杞︿綅涓嶈兘涓虹┖");
+ if(os.length > 13) {
+ Assert.hasValue(os[14], (osIndex + 1) + "琛岃捣绉熸椂闂翠笉鑳戒负绌�");
+ }else if(os.length > 14) {
+ Assert.hasValue(os[15], (osIndex + 1) + "琛屾埅姝㈡椂闂翠笉鑳戒负绌�");
}
-// Assert.hasValue(os[11], (osIndex + 1) + "鍋滆溅鍦虹被鍨嬩笉鑳戒负绌�");
- String startTime = os.length >= 9 && os[9] != null ? excelDoubleToDate(os[9].toString()):"";
- String endTime = os.length >= 10 && os[10] != null ? excelDoubleToDate(os[10].toString()):"";
+
+ try {
+ importOwnerCar.setCommunityId(os[1].toString());
+ } catch (Exception e) {
+ throw new IllegalArgumentException("璇疯緭鍏ュ皬鍖虹紪鐮�");
+ }
+// Assert.hasValue(os[12], (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[0].toString().trim());
- importOwnerCar.setOwnerName(os[1].toString().trim());
- importOwnerCar.setLink(os.length <= 2 || os[2] == null ? "" : os[2].toString().trim());
- importOwnerCar.setCarBrand(os.length <= 3 || os[3] == null ? "" : os[3].toString().trim());
- importOwnerCar.setCarType(os.length <= 4 || os[4] == null ? "" : os[4].toString().trim());
- importOwnerCar.setLeaseType(os.length <= 5 || os[5] == null ? "" : os[5].toString().trim());
- importOwnerCar.setCarColor(os.length <= 6 || os[6] == null ? "" : os[6].toString().trim());
- importOwnerCar.setAreaNum(os.length <= 7 || os[7] == null ? "" : os[7].toString().trim());
+ importOwnerCar.setCarNum(os[8].toString().trim());
+ importOwnerCar.setOwnerName(os[10].toString().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(os.length <= 4 || os[4] == null ? "" : os[4].toString().trim());
+// importOwnerCar.setLeaseType(os.length <= 5 || os[5] == null ? "" : os[5].toString().trim());
+// importOwnerCar.setCarColor(os.length <= 6 || os[6] == null ? "" : os[6].toString().trim());
+// importOwnerCar.setAreaNum(os.length <= 7 || os[7] == null ? "" : os[7].toString().trim());
//鑾峰彇杞︿綅
- String parkingLot = os.length <= 8 || os[8] == null ? "" : os[8].toString().trim();
+ String parkingLot = os.length <= 9 || os[9] == null ? "" : os[9].toString().trim();
importOwnerCar.setNum(parkingLot);
importOwnerCar.setLogStartTime(startTime);
importOwnerCar.setLogEndTime(endTime);
- importOwnerCar.setTypeCd(os.length <= 11 || os[11] == null ? "" : os[11].toString().trim());
- importOwnerCar.setSpaceSate(os.length <= 12 || os[12] == null ? "" : os[12].toString().trim());
- importOwnerCar.setCommunityId(result.getCommunityId());
+ importOwnerCar.setTypeCd(os.length <= 12 || os[12] == null ? "" : os[12].toString().trim());
+ importOwnerCar.setSpaceSate("S");
+
importOwnerCar.setUserId(result.getUserId());
ownerCars.add(importOwnerCar);
}
--
Gitblit v1.8.0