From 18dcf51511adffe8a0d4ebf7eb07d9ec50b37885 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 17 九月 2020 13:11:54 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
index 9810d17..7104860 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -4,20 +4,12 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
-import com.java110.entity.assetImport.ImportFee;
-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.assetImport.*;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IAssetImportSMO;
import com.java110.utils.constant.FeeTypeConstant;
import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.CommonUtil;
-import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.ImportExcelUtils;
-import com.java110.utils.util.StringUtil;
+import com.java110.utils.util.*;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
@@ -183,7 +175,7 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
ImportOwner owner = null;
for (ImportParkingSpace parkingSpace : parkingSpaces) {
-
+ responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
JSONObject savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
paramIn = new JSONObject();
// 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
@@ -240,26 +232,28 @@
paramIn.put("psId", savedParkingSpaceInfo.getString("psId"));
paramIn.put("storeId", result.getStoreId());
paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
+ paramIn.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ paramIn.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
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/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd + "&isDefault=T";
- responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+// 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/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;
+// }
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- continue;
- }
+// JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
+// if (!configInfo.containsKey("additionalAmount")) {
+// continue;
+// }
- JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
- if (!configInfo.containsKey("additionalAmount")) {
- continue;
- }
-
- paramIn.put("receivedAmount", configInfo.getString("additionalAmount"));
+// paramIn.put("receivedAmount", configInfo.getString("additionalAmount"));
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -302,7 +296,7 @@
paramIn.put("apartment", room.getSection());
paramIn.put("state", "2002");
paramIn.put("builtUpArea", room.getBuiltUpArea());
- paramIn.put("unitPrice", "1000.00");
+ paramIn.put("feeCoefficient", "1.00");
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -508,7 +502,7 @@
if (responseEntity.getStatusCode() == HttpStatus.OK) {
JSONObject body = JSONObject.parseObject(responseEntity.getBody());
- if(body.containsKey("code") && body.getIntValue("code") != 0){
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
throw new IllegalArgumentException(body.getString("msg"));
}
savedOwnerInfo = getExistsOwner(pd, result, owner);
@@ -542,6 +536,8 @@
paramIn.put("floorNum", importFloor.getFloorNum());
paramIn.put("userId", result.getUserId());
paramIn.put("name", importFloor.getFloorNum() + "鍙锋ゼ");
+ paramIn.put("floorArea", 1.00);
+
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
savedFloorInfo = getExistsFloor(pd, result, importFloor);
}
@@ -569,6 +565,7 @@
paramIn.put("unitNum", importFloor.getUnitNum());
paramIn.put("layerCount", importFloor.getLayerCount());
paramIn.put("lift", importFloor.getLift());
+ paramIn.put("unitArea", 1.00);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
//灏唘nitId 鍒峰叆ImportFloor瀵硅薄
@@ -909,6 +906,14 @@
Assert.hasValue(os[2], "涓氫富淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屼笟涓绘�у埆涓虹┖");
String tel = StringUtil.isNullOrNone(os[4]) ? "19999999999" : os[4].toString();
String idCard = StringUtil.isNullOrNone(os[5]) ? "10000000000000000001" : os[5].toString();
+
+ if (os[4].toString().length() > 11) {
+ throw new IllegalArgumentException(os[1].toString() + " 鐨勬墜鏈哄彿瓒呰繃11浣�,璇锋牳瀹�");
+ }
+ if (os[5].toString().length() > 18) {
+ throw new IllegalArgumentException(os[1].toString() + " 鐨勮韩浠借瘉瓒呰繃18浣�,璇锋牳瀹�");
+ }
+
String age = StringUtil.isNullOrNone(os[3]) ? CommonUtil.getAgeByCertId(idCard) : os[3].toString();
importOwner = new ImportOwner();
importOwner.setOwnerNum(os[0].toString());
--
Gitblit v1.8.0