From c31adbb22831a525a639fef5dfc08225dbf5f105 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 25 九月 2019 20:52:36 +0800
Subject: [PATCH] 优化 车位出租
---
WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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..cd0f028 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
@@ -134,7 +134,7 @@
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 savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
@@ -147,6 +147,7 @@
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.saveParkingSpace";
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 +158,7 @@
}
savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
- if (savedParkingSpaceInfo != null) {
+ if (savedParkingSpaceInfo == null) {
continue;
}
@@ -187,8 +188,8 @@
continue;
}
- JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody());
- if(!configInfo.containsKey("additionalAmount")){
+ JSONObject configInfo = JSONArray.parseArray(responseEntity.getBody()).getJSONObject(0);
+ if (!configInfo.containsKey("additionalAmount")) {
continue;
}
@@ -213,7 +214,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 +344,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);
@@ -384,7 +385,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();
//鍏堜繚瀛� 妤兼爧淇℃伅
@@ -411,7 +412,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 +427,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"));
}
@@ -533,14 +534,14 @@
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])){
+ if (StringUtil.isNullOrNone(os[3])) {
parkingSpaces.add(importParkingSpace);
continue;
}
@@ -575,7 +576,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importRoom = new ImportRoom();
@@ -584,7 +585,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 +644,7 @@
if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importOwner = new ImportOwner();
@@ -673,7 +674,7 @@
continue;
}
- if(StringUtil.isNullOrNone(os[0])){
+ if (StringUtil.isNullOrNone(os[0])) {
continue;
}
importFloor = new ImportFloor();
--
Gitblit v1.8.0