From c4a333b83ba54bcadf2a6a2b34fe66ab88a6ba9d Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 05 八月 2025 18:51:11 +0800
Subject: [PATCH] 车辆导入去除校验2025/08/05
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportOwnerCarDataCleaningAdapt.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 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 3d5ae75..6e4fafb 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
@@ -60,14 +60,14 @@
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[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[10], (osIndex + 1) + "鍋滆溅鍦虹被鍨嬩笉鑳戒负绌�");
Assert.hasValue(os[11], (osIndex + 1) + "杞︿綅绫诲瀷涓嶈兘涓虹┖");
String startTime = excelDoubleToDate(os[8].toString());
String endTime = excelDoubleToDate(os[9].toString());
@@ -77,16 +77,16 @@
importOwnerCar.setCarNum(os[0].toString().trim());
importOwnerCar.setOwnerName(os[1].toString().trim());
importOwnerCar.setLink(os[2] == null ? "" : 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.setCarBrand(os[3] == null ? "" : os[3].toString().trim());
+ importOwnerCar.setCarType(os[4] == null ? "" : os[4].toString().trim());
+ importOwnerCar.setCarColor(os[5] == null ? "" : os[5].toString().trim());
+ importOwnerCar.setAreaNum(os[6] == null ? "" : os[6].toString().trim());
//鑾峰彇杞︿綅
- String parkingLot = os[7].toString().trim();
+ String parkingLot = os[7] == null ? "" : os[7].toString().trim();
importOwnerCar.setNum(parkingLot);
importOwnerCar.setLogStartTime(startTime);
importOwnerCar.setLogEndTime(endTime);
- importOwnerCar.setTypeCd(os[10].toString().trim());
+ importOwnerCar.setTypeCd(os[10] == null ? "" : os[10].toString().trim());
importOwnerCar.setSpaceSate(os[11].toString().trim());
importOwnerCar.setCommunityId(result.getCommunityId());
importOwnerCar.setUserId(result.getUserId());
@@ -102,7 +102,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