From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java | 128 +++++++++++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 40 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
index df4455a..8993c52 100644
--- a/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -2,23 +2,17 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.common.constant.FeeTypeConstant;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.constant.ServiceConstant;
-import com.java110.common.exception.ListenerExecuteException;
-import com.java110.common.util.Assert;
-import com.java110.common.util.DateUtil;
-import com.java110.common.util.ImportExcelUtils;
-import com.java110.common.util.StringUtil;
+import com.java110.utils.constant.FeeTypeConstant;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.ImportExcelUtils;
+import com.java110.utils.util.StringUtil;
import com.java110.core.context.IPageData;
-import com.java110.dto.FeeConfigDto;
-import com.java110.dto.ParkingSpaceDto;
import com.java110.entity.assetImport.ImportFloor;
import com.java110.entity.assetImport.ImportOwner;
import com.java110.entity.assetImport.ImportParkingSpace;
import com.java110.entity.assetImport.ImportRoom;
import com.java110.entity.component.ComponentValidateResult;
-import com.java110.web.core.BaseComponentSMO;
+import com.java110.core.component.BaseComponentSMO;
import com.java110.web.smo.assetImport.IAssetImportSMO;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -32,7 +26,6 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -134,19 +127,35 @@
private ResponseEntity<String> savedParkingSpaceInfo(IPageData pd, List<ImportParkingSpace> parkingSpaces, ComponentValidateResult result) {
String apiUrl = "";
JSONObject paramIn = null;
- ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛",HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
ImportOwner owner = null;
for (ImportParkingSpace parkingSpace : parkingSpaces) {
+
+ JSONObject savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
+ paramIn = new JSONObject();
+ // 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
+ if (savedParkingAreaInfo == null) {
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingArea.saveParkingArea";
+ paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("typeCd",parkingSpace.getTypeCd());
+ paramIn.put("num", parkingSpace.getPaNum());
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
+ }
+ if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ continue;
+ }
+
JSONObject savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
if (savedParkingSpaceInfo != null) {
continue;
}
- paramIn = new JSONObject();
-
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.saveParkingSpace";
+ paramIn.put("paId", savedParkingAreaInfo.getString("paId"));
paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("userId", result.getUserId());
paramIn.put("num", parkingSpace.getPsNum());
paramIn.put("area", parkingSpace.getArea());
paramIn.put("typeCd", parkingSpace.getTypeCd());
@@ -157,7 +166,7 @@
}
savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
- if (savedParkingSpaceInfo != null) {
+ if (savedParkingSpaceInfo == null) {
continue;
}
@@ -170,6 +179,7 @@
paramIn.put("communityId", result.getCommunityId());
paramIn.put("ownerId", parkingSpace.getImportOwner().getOwnerId());
+ paramIn.put("userId", result.getUserId());
paramIn.put("carNum", parkingSpace.getCarNum());
paramIn.put("carBrand", parkingSpace.getCarBrand());
paramIn.put("carType", parkingSpace.getCarType());
@@ -178,17 +188,21 @@
paramIn.put("storeId", result.getStoreId());
paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
+ if("H".equals(parkingSpace.getSellOrHire())){
+ paramIn.put("cycles", "0");
+ }
+
String feeTypeCd = "1001".equals(parkingSpace.getTypeCd())
? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE;
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.queryFeeConfig?communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd;
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd+"&isDefault=T";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
continue;
}
- JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody());
- if(!configInfo.containsKey("additionalAmount")){
+ JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
+ if (!configInfo.containsKey("additionalAmount")) {
continue;
}
@@ -213,7 +227,7 @@
private ResponseEntity<String> savedRoomInfo(IPageData pd, List<ImportRoom> rooms, ComponentValidateResult result) {
String apiUrl = "";
JSONObject paramIn = null;
- ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛",HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
ImportOwner owner = null;
for (ImportRoom room : rooms) {
JSONObject savedRoomInfo = getExistsRoom(pd, result, room);
@@ -343,7 +357,7 @@
private ResponseEntity<String> savedOwnerInfo(IPageData pd, List<ImportOwner> owners, ComponentValidateResult result) {
String apiUrl = "";
JSONObject paramIn = null;
- ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛",HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
for (ImportOwner owner : owners) {
JSONObject savedOwnerInfo = getExistsOwner(pd, result, owner);
@@ -363,6 +377,7 @@
paramIn.put("link", owner.getTel());
paramIn.put("sex", owner.getSex());
paramIn.put("ownerTypeCd", "1001");
+ paramIn.put("idCard",owner.getIdCard());
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
if (responseEntity.getStatusCode() == HttpStatus.OK) {
savedOwnerInfo = getExistsOwner(pd, result, owner);
@@ -384,7 +399,7 @@
private ResponseEntity<String> savedFloorAndUnitInfo(IPageData pd, List<ImportFloor> floors, ComponentValidateResult result) {
String apiUrl = "";
JSONObject paramIn = null;
- ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛",HttpStatus.OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
for (ImportFloor importFloor : floors) {
paramIn = new JSONObject();
//鍏堜繚瀛� 妤兼爧淇℃伅
@@ -397,12 +412,13 @@
paramIn.put("userId", result.getUserId());
paramIn.put("name", importFloor.getFloorNum() + "鍙锋ゼ");
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ savedFloorInfo = getExistsFloor(pd, result, importFloor);
}
if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
continue;
}
- savedFloorInfo = getExistsFloor(pd, result, importFloor);
+
if (savedFloorInfo == null) {
continue;
@@ -411,7 +427,7 @@
paramIn.clear();
//鍒ゆ柇鍗曞厓淇℃伅鏄惁宸茬粡瀛樺湪锛屽鏋滃瓨鍦ㄥ垯涓嶄繚瀛樻暟鎹畊nit.queryUnits
JSONObject savedUnitInfo = getExistsUnit(pd, result, importFloor);
- if ( savedUnitInfo != null) {
+ if (savedUnitInfo != null) {
importFloor.setUnitId(savedUnitInfo.getString("unitId"));
continue;
}
@@ -426,7 +442,7 @@
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
//灏唘nitId 鍒峰叆ImportFloor瀵硅薄
- savedUnitInfo = getExistsUnit(pd, result, importFloor);
+ savedUnitInfo = getExistsUnit(pd, result, importFloor);
importFloor.setUnitId(savedUnitInfo.getString("unitId"));
}
@@ -507,6 +523,36 @@
}
/**
+ * 鏌ヨ瀛樺湪鐨勫仠杞﹀満
+ *
+ * @param pd
+ * @param result
+ * @param parkingSpace
+ * @return
+ */
+ private JSONObject getExistsParkingArea(IPageData pd, ComponentValidateResult result, ImportParkingSpace parkingSpace) {
+ String apiUrl = "";
+ ResponseEntity<String> responseEntity = null;
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingArea.listParkingAreas?page=1&row=1&communityId=" + result.getCommunityId()
+ + "&num=" + parkingSpace.getPaNum();
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+
+ JSONObject savedParkingAreaInfoResult = JSONObject.parseObject(responseEntity.getBody());
+
+ if (!savedParkingAreaInfoResult.containsKey("parkingAreas") || savedParkingAreaInfoResult.getJSONArray("parkingAreas").size() != 1) {
+ return null;
+ }
+
+ JSONObject savedParkingAreaInfo = savedParkingAreaInfoResult.getJSONArray("parkingAreas").getJSONObject(0);
+
+ return savedParkingAreaInfo;
+ }
+
+ /**
* 鏁版嵁鏍￠獙澶勭悊
*
* @param floors
@@ -533,25 +579,26 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importParkingSpace = new ImportParkingSpace();
- importParkingSpace.setPsNum(os[0].toString());
- importParkingSpace.setTypeCd(os[1].toString());
- importParkingSpace.setArea(Double.parseDouble(os[2].toString()));
- if(StringUtil.isNullOrNone(os[3])){
+ importParkingSpace.setPaNum(os[0].toString());
+ importParkingSpace.setPsNum(os[1].toString());
+ importParkingSpace.setTypeCd(os[2].toString());
+ importParkingSpace.setArea(Double.parseDouble(os[3].toString()));
+ if (StringUtil.isNullOrNone(os[4])) {
parkingSpaces.add(importParkingSpace);
continue;
}
- ImportOwner importOwner = getImportOwner(owners, os[3].toString());
+ ImportOwner importOwner = getImportOwner(owners, os[4].toString());
importParkingSpace.setImportOwner(importOwner);
if (importOwner != null) {
- importParkingSpace.setCarNum(os[4].toString());
- importParkingSpace.setCarBrand(os[5].toString());
- importParkingSpace.setCarType(os[6].toString());
- importParkingSpace.setCarColor(os[7].toString());
- importParkingSpace.setSellOrHire(os[8].toString());
+ importParkingSpace.setCarNum(os[5].toString());
+ importParkingSpace.setCarBrand(os[6].toString());
+ importParkingSpace.setCarType(os[7].toString());
+ importParkingSpace.setCarColor(os[8].toString());
+ importParkingSpace.setSellOrHire(os[9].toString());
}
parkingSpaces.add(importParkingSpace);
@@ -575,7 +622,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importRoom = new ImportRoom();
@@ -584,7 +631,7 @@
importRoom.setLayer(Integer.parseInt(os[3].toString()));
importRoom.setSection(os[4].toString());
importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
- if(StringUtil.isNullOrNone(os[6])){
+ if (StringUtil.isNullOrNone(os[6])) {
rooms.add(importRoom);
continue;
}
@@ -643,7 +690,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importOwner = new ImportOwner();
@@ -652,6 +699,7 @@
importOwner.setSex("鐢�".equals(os[2].toString()) ? "0" : "1");
importOwner.setAge(Integer.parseInt(os[3].toString()));
importOwner.setTel(os[4].toString());
+ importOwner.setIdCard(os[5].toString());
owners.add(importOwner);
}
}
@@ -673,7 +721,7 @@
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importFloor = new ImportFloor();
--
Gitblit v1.8.0