From 03dcc05067d46487eac0c65b9fdeb6436c6e7311 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期四, 11 九月 2025 18:48:19 +0800
Subject: [PATCH] 小区添加接管日期以及对初始化时间进行限制2025/09/11
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java | 54 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 31 insertions(+), 23 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 5ff57dd..fe8a2e3 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
@@ -59,35 +59,41 @@
}
Assert.hasValue(os[0], (osIndex + 1) + "杞︾墝鍙蜂笉鑳戒负绌�");
Assert.hasValue(os[1], (osIndex + 1) + "涓氫富涓嶈兘涓虹┖");
- Assert.hasValue(os[2], (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) + "璧风鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[9], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
- Assert.hasValue(os[10], (osIndex + 1) + "鍋滆溅鍦虹被鍨嬩笉鑳戒负绌�");
- Assert.hasValue(os[11], (osIndex + 1) + "杞︿綅绫诲瀷涓嶈兘涓虹┖");
- String startTime = excelDoubleToDate(os[8].toString());
- String endTime = excelDoubleToDate(os[9].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鏂囨湰鏍煎紡");
+// Assert.hasValue(os[2], (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[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()):"";
+// 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[2].toString().trim());
- importOwnerCar.setCarBrand(os[3].toString().trim());
- importOwnerCar.setCarType(os[4].toString().trim());
- importOwnerCar.setCarColor(os[5].toString().trim());
- importOwnerCar.setAreaNum(os[6].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());
//鑾峰彇杞︿綅
- String parkingLot = os[7].toString().trim();
+ String parkingLot = os.length <= 8 || os[8] == null ? "" : os[8].toString().trim();
importOwnerCar.setNum(parkingLot);
importOwnerCar.setLogStartTime(startTime);
importOwnerCar.setLogEndTime(endTime);
- importOwnerCar.setTypeCd(os[10].toString().trim());
- importOwnerCar.setSpaceSate(os[11].toString().trim());
+ 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.setUserId(result.getUserId());
ownerCars.add(importOwnerCar);
@@ -102,7 +108,9 @@
*/
private void validateCarInfo(List<OwnerCarDto> ownerCars) {
for (OwnerCarDto ownerCarDto : ownerCars) {
-
+ if ("".equals(ownerCarDto.getTypeCd()) || ownerCarDto.getTypeCd() == null) {
+ continue;
+ }
if (!"1001".equals(ownerCarDto.getTypeCd()) && !"2001".equals(ownerCarDto.getTypeCd())) {
throw new IllegalArgumentException(ownerCarDto.getCarNum() + "鍋滆溅鍦虹被鍨嬪簲濉啓 1001(鍦颁笂鍋滆溅鍦�)鎴栬�� 2001 (鍦颁笅鍋滆溅鍦�)");
}
--
Gitblit v1.8.0