From 7b90160465723602365521fa85e233680b60dd5e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 12 五月 2023 17:16:25 +0800
Subject: [PATCH] optimize statistics
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
index e6d0a80..8b24d15 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java
@@ -119,7 +119,7 @@
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[5], (osIndex + 1) + "鍋滆溅鍦轰笉鑳戒负绌�");
Assert.hasValue(os[6], (osIndex + 1) + "杞︿綅涓嶈兘涓虹┖");
Assert.hasValue(os[7], (osIndex + 1) + "璧风鏃堕棿涓嶈兘涓虹┖");
Assert.hasValue(os[8], (osIndex + 1) + "鎴鏃堕棿涓嶈兘涓虹┖");
@@ -127,27 +127,19 @@
Assert.hasValue(os[10], (osIndex + 1) + "杞︿綅绫诲瀷涓嶈兘涓虹┖");
String startTime = excelDoubleToDate(os[7].toString());
String endTime = excelDoubleToDate(os[8].toString());
- Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD HH:mm:ss鏂囨湰鏍煎紡");
- Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD HH:mm:ss鏂囨湰鏍煎紡");
+ 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());
importOwnerCar.setRoomName(os[1].toString());
importOwnerCar.setCarBrand(os[2].toString());
importOwnerCar.setCarType(os[3].toString());
importOwnerCar.setCarColor(os[4].toString());
- importOwnerCar.setOwnerName(os[5].toString());
+ importOwnerCar.setAreaNum(os[5].toString());
//鑾峰彇杞︿綅
String parkingLot = os[6].toString();
- if(!parkingLot.contains("-")){
- throw new IllegalArgumentException((osIndex + 1) +"琛岃溅浣嶆牸寮忛敊璇� 鏍煎紡搴斾负锛氬仠杞﹀満-杞︿綅缂栧彿锛岃溅浣嶇紪鍙峰彲浠ヤ粠1鑷缂栧啓");
- }
- String[] split = parkingLot.split("-",2);
- if(split.length != 2){
- throw new IllegalArgumentException((osIndex + 1) +"琛岃溅浣嶆牸寮忛敊璇� 鏍煎紡搴斾负锛氬仠杞﹀満-杞︿綅缂栧彿锛岃溅浣嶇紪鍙峰彲浠ヤ粠1鑷缂栧啓");
- }
- importOwnerCar.setAreaNum(split[0]);
- importOwnerCar.setNum(split[1]);
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ importOwnerCar.setNum(parkingLot);
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
importOwnerCar.setStartTime(simpleDateFormat.parse(startTime));
importOwnerCar.setEndTime(simpleDateFormat.parse(endTime));
importOwnerCar.setTypeCd(os[9].toString());
@@ -252,10 +244,10 @@
for (OwnerCarDto ownerCarDto : ownerCars) {
- if(!"1001".equals(ownerCarDto.getTypeCd()) && !"2002".equals(ownerCarDto.getTypeCd())){
- throw new IllegalArgumentException(ownerCarDto.getCarNum()+"鍋滆溅鍦虹被鍨嬪簲濉啓 1001(鍦颁笂鍋滆溅鍦�)鎴栬�� 2002 (鍦颁笅鍋滆溅鍦�)");
+ if(!"1001".equals(ownerCarDto.getTypeCd()) && !"2001".equals(ownerCarDto.getTypeCd())){
+ throw new IllegalArgumentException(ownerCarDto.getCarNum()+"鍋滆溅鍦虹被鍨嬪簲濉啓 1001(鍦颁笂鍋滆溅鍦�)鎴栬�� 2001 (鍦颁笅鍋滆溅鍦�)");
}
- if(!"H".equals(ownerCarDto.getSpaceSate()) && !"S".equals(ownerCarDto.getTypeCd())){
+ if(!"H".equals(ownerCarDto.getSpaceSate()) && !"S".equals(ownerCarDto.getSpaceSate())){
throw new IllegalArgumentException(ownerCarDto.getCarNum()+"杞︿綅鐘舵�佸簲濉啓 S锛堝嚭鍞級鎴栬�� H 锛堝嚭绉燂級");
}
//鑾峰彇鎴垮眿鍚嶇О
@@ -295,7 +287,7 @@
Assert.listOnlyOne(ownerRoomRelDtos, ownerCarDto.getCarNum() + "鏌ヨ涓氫富鎴垮眿淇℃伅閿欒锛�");
OwnerDto ownerDto = new OwnerDto();
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
- ownerDto.setName(ownerCarDto.getOwnerName());
+ //ownerDto.setName(ownerCarDto.getOwnerName());
//鏌ヨ涓氫富
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "鏌ヨ涓氫富淇℃伅閿欒锛�");
--
Gitblit v1.8.0