From ba0fc4930fca76ee2742dc8b79c9c5c7ce0fca64 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 16 六月 2023 16:45:32 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java | 77 ++++++++++++++------------------------
1 files changed, 28 insertions(+), 49 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 8b24d15..d6915ad 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
@@ -115,35 +115,37 @@
continue;
}
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) + "杞︿綅绫诲瀷涓嶈兘涓虹┖");
- String startTime = excelDoubleToDate(os[7].toString());
- String endTime = excelDoubleToDate(os[8].toString());
+ 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鏂囨湰鏍煎紡");
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.setAreaNum(os[5].toString());
+ importOwnerCar.setOwnerName(os[1].toString());
+ importOwnerCar.setLink(os[2].toString());
+ importOwnerCar.setCarBrand(os[3].toString());
+ importOwnerCar.setCarType(os[4].toString());
+ importOwnerCar.setCarColor(os[5].toString());
+ importOwnerCar.setAreaNum(os[6].toString());
//鑾峰彇杞︿綅
- String parkingLot = os[6].toString();
+ String parkingLot = os[7].toString();
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());
- importOwnerCar.setSpaceSate(os[10].toString());
+ importOwnerCar.setTypeCd(os[10].toString());
+ importOwnerCar.setSpaceSate(os[11].toString());
ownerCarDtos.add(importOwnerCar);
@@ -259,39 +261,16 @@
if(split.length != 3){
throw new IllegalArgumentException(ownerCarDto.getCarNum()+"鎴垮眿鍙锋牸寮忛敊璇� 鏍煎紡搴斾负锛氭ゼ鏍�-鍗曞厓-鎴垮眿锛屽鏋滄槸鍟嗛摵 妤兼爧-0-鍟嗛摵缂栧彿");
}
- String floorNum = split[0];
- String unitNum = split[1];
- String roomNum = split[2];
- FloorDto floorDto = new FloorDto();
- floorDto.setCommunityId(reqJson.getString("communityId"));
- floorDto.setFloorNum(floorNum);
- //鏌ヨ妤兼爧
- List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
- Assert.listOnlyOne(floorDtos, ownerCarDto.getCarNum() + "鏌ヨ妤兼爧閿欒锛�");
- UnitDto unitDto = new UnitDto();
- unitDto.setUnitNum(unitNum);
- unitDto.setFloorId(floorDtos.get(0).getFloorId());
- //鏌ヨ鍗曞厓
- List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
- Assert.listOnlyOne(unitDtos, ownerCarDto.getCarNum() + "鏌ヨ鍗曞厓閿欒锛�");
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomNum(roomNum);
- roomDto.setUnitId(unitDtos.get(0).getUnitId());
- //鏌ヨ鎴垮眿
- List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
- Assert.listOnlyOne(roomDtos, ownerCarDto.getCarNum() + "鏌ヨ鎴垮眿閿欒锛�");
- OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
- ownerRoomRelDto.setRoomId(roomDtos.get(0).getRoomId());
- //鏌ヨ涓氫富鎴垮眿鍏崇郴琛�
- List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- Assert.listOnlyOne(ownerRoomRelDtos, ownerCarDto.getCarNum() + "鏌ヨ涓氫富鎴垮眿淇℃伅閿欒锛�");
+
OwnerDto ownerDto = new OwnerDto();
- ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
- //ownerDto.setName(ownerCarDto.getOwnerName());
+ ownerDto.setName(ownerCarDto.getOwnerName());
+ ownerDto.setLink(ownerCarDto.getLink());
//鏌ヨ涓氫富
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "鏌ヨ涓氫富淇℃伅閿欒锛�");
- ownerCarDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
+ ownerCarDto.setOwnerId(ownerDtos.get(0).getOwnerId());
+ }
+
}
}
--
Gitblit v1.8.0