From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java | 61 +++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 11 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 bc22806..b5e9ab1 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
@@ -17,13 +17,14 @@
import com.java110.intf.community.*;
import com.java110.intf.user.*;
import com.java110.po.car.OwnerCarPo;
+import com.java110.po.parking.ParkingAreaPo;
import com.java110.po.parking.ParkingSpacePo;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -67,7 +68,13 @@
private IParkingAreaInnerServiceSMO parkingAreaInnerServiceSMOImpl;
@Autowired
+ private IParkingAreaV1InnerServiceSMO parkingAreaV1InnerServiceSMOImpl;
+
+ @Autowired
private IParkingSpaceInnerServiceSMO parkingSpaceInnerServiceSMOImpl;
+
+ @Autowired
+ private IParkingSpaceV1InnerServiceSMO parkingSpaceV1InnerServiceSMOImpl;
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
@@ -160,10 +167,13 @@
if (ownerCars.size() < 1) {
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
+ String psId = "";
+ String paId = "";
for (OwnerCarDto ownerCarDto : ownerCars) {
OwnerCarPo ownerCarPo = BeanConvertUtil.covertBean(ownerCarDto, OwnerCarPo.class);
+
//鑾峰彇鎴垮眿鍚嶇О
- String roomName = ownerCarDto.getRoomName();
+ String roomName = ownerCarDto.getRoomName().trim();
String[] split = roomName.split("-");
String floorNum = split[0];
String unitNum = split[1];
@@ -207,19 +217,48 @@
parkingAreaDto.setTypeCd(ownerCarDto.getTypeCd());
//鏌ヨ鍋滆溅鍦�
List<ParkingAreaDto> parkingAreaDtos = parkingAreaInnerServiceSMOImpl.queryParkingAreas(parkingAreaDto);
- Assert.listOnlyOne(parkingAreaDtos, "鏌ヨ鍋滆溅鍦洪敊璇紒");
+ //Assert.listOnlyOne(parkingAreaDtos, "鏌ヨ鍋滆溅鍦洪敊璇紒");
+ if(parkingAreaDtos == null || parkingAreaDtos.size() <1){
+ paId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_paId);
+ ParkingAreaPo parkingAreaPo = new ParkingAreaPo();
+ parkingAreaPo.setCommunityId(reqJson.getString("communityId"));
+ parkingAreaPo.setNum(ownerCarDto.getAreaNum());
+ parkingAreaPo.setPaId(paId);
+ parkingAreaPo.setTypeCd(ownerCarDto.getTypeCd());
+ parkingAreaPo.setRemark("瀵煎叆鏁版嵁");
+ parkingAreaV1InnerServiceSMOImpl.saveParkingArea(parkingAreaPo);
+ }else{
+ paId = parkingAreaDtos.get(0).getPaId();
+ }
ParkingSpaceDto parkingSpaceDto = new ParkingSpaceDto();
parkingSpaceDto.setNum(ownerCarDto.getNum());
- parkingSpaceDto.setPaId(parkingAreaDtos.get(0).getPaId());
+ parkingSpaceDto.setPaId(paId);
//鏌ヨ鍋滆溅浣�
List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
- Assert.listOnlyOne(parkingSpaceDtos, "鏌ヨ鍋滆溅浣嶉敊璇紒");
- //鑾峰彇鍋滆溅浣嶇姸鎬�(鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F)
- String state = parkingSpaceDtos.get(0).getState();
- if (!StringUtil.isEmpty(state) && !state.equals("F")) {
- throw new IllegalArgumentException(parkingAreaDtos.get(0).getNum() + "鍋滆溅鍦�-" + parkingSpaceDtos.get(0).getNum() + "鍋滆溅浣嶄笉鏄┖闂茬姸鎬侊紒");
+ String state = "";
+ if(parkingSpaceDtos == null || parkingSpaceDtos.size() <1){
+ psId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_psId);
+ ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
+ parkingSpacePo.setCommunityId(reqJson.getString("communityId"));
+ parkingSpacePo.setNum(ownerCarDto.getNum());
+ parkingSpacePo.setPaId(paId);
+ parkingSpacePo.setArea("1");
+ parkingSpacePo.setParkingType(ParkingSpaceDto.TYPE_CD_COMMON);
+ parkingSpacePo.setState(ParkingSpaceDto.STATE_FREE);
+ parkingSpacePo.setPsId(psId);
+ parkingSpacePo.setRemark("瀵煎叆鏁版嵁");
+ parkingSpaceV1InnerServiceSMOImpl.saveParkingSpace(parkingSpacePo);
+ state = ParkingSpaceDto.STATE_FREE;
+ }else{
+ psId = parkingSpaceDtos.get(0).getPsId();
+ //鑾峰彇鍋滆溅浣嶇姸鎬�(鍑哄敭 S锛屽嚭绉� H 锛岀┖闂� F)
+ state = parkingSpaceDtos.get(0).getState();
}
- ownerCarPo.setPsId(parkingSpaceDtos.get(0).getPsId());
+
+ if (!StringUtil.isEmpty(state) && !state.equals("F")) {
+ throw new IllegalArgumentException(ownerCarDto.getAreaNum() + "鍋滆溅鍦�-" + ownerCarDto.getNum() + "鍋滆溅浣嶄笉鏄┖闂茬姸鎬侊紒");
+ }
+ ownerCarPo.setPsId(psId);
ownerCarPo.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
ownerCarPo.setUserId("-1");
ownerCarPo.setCommunityId(reqJson.getString("communityId"));
@@ -228,7 +267,7 @@
ownerCarPo.setState("1001"); //1001 姝ｅ父鐘舵�侊紝2002 杞︿綅閲婃斁娆犺垂鐘舵�侊紝3003 杞︿綅閲婃斁
ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
ParkingSpacePo parkingSpacePo = new ParkingSpacePo();
- parkingSpacePo.setPsId(parkingSpaceDtos.get(0).getPsId()); //杞︿綅id
+ parkingSpacePo.setPsId(psId); //杞︿綅id
parkingSpacePo.setState(ownerCarDto.getSpaceSate());
parkingSpaceInnerServiceSMOImpl.updateParkingSpace(parkingSpacePo);
}
--
Gitblit v1.8.0