From cf37a13627515874ea14a7b135cf62c3c3d3c7d9 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 21 九月 2021 11:51:45 +0800
Subject: [PATCH] 优化代码功能
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
index b07419f..6dc694d 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -3,17 +3,24 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
+import com.java110.api.smo.assetImport.IAssetImportSMO;
import com.java110.core.context.IPageData;
import com.java110.core.smo.ISaveTransactionLogSMO;
import com.java110.dto.RoomDto;
import com.java110.dto.assetImportLog.AssetImportLogDto;
import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto;
-import com.java110.entity.assetImport.*;
+import com.java110.dto.owner.OwnerDto;
+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.component.ComponentValidateResult;
-import com.java110.api.smo.assetImport.IAssetImportSMO;
-import com.java110.utils.constant.ServiceConstant;
-import com.java110.utils.util.*;
+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.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -772,9 +779,13 @@
paramIn.put("age", owner.getAge());
paramIn.put("link", owner.getTel());
paramIn.put("sex", owner.getSex());
- paramIn.put("ownerTypeCd", "1001");
+ paramIn.put("ownerTypeCd", owner.getOwnerTypeCd());
paramIn.put("idCard", owner.getIdCard());
paramIn.put("source", "BatchImport");
+ if (!OwnerDto.OWNER_TYPE_CD_OWNER.equals(owner.getOwnerTypeCd())) {
+ //鏌ヨ涓氫富ID
+ paramIn.put("ownerId", getOwnerId(owners, owner));
+ }
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
/***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
@@ -818,6 +829,15 @@
}
return responseEntity;
+ }
+
+ private String getOwnerId(List<ImportOwner> owners, ImportOwner owner) {
+ for (ImportOwner owner1 : owners) {
+ if (owner1.getOwnerNum().equals(owner.getParentOwnerId())) {
+ return owner1.getOwnerId();
+ }
+ }
+ throw new IllegalArgumentException("璇峰皢涓氫富鎴愬憳鏀惧埌涓氫富鍚庨潰,鎴栬�呬笟涓绘垚鍛樻湭鎵惧埌瀵瑰簲鐨勪笟涓�");
}
/**
@@ -1006,7 +1026,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
apiUrl = "owner.queryOwners?page=1&row=1&communityId=" + result.getCommunityId()
- + "&ownerTypeCd=1001&name=" + importOwner.getOwnerName() + "&link=" + importOwner.getTel();
+ + "&ownerTypeCd=" + importOwner.getOwnerTypeCd() + "&name=" + importOwner.getOwnerName() + "&link=" + importOwner.getTel();
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1327,6 +1347,8 @@
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();
+ String ownerTypeCd = StringUtil.isNullOrNone(os[6]) ? "1001" : os[6].toString();
+ String parentOwnerId = StringUtil.isNullOrNone(os[7]) ? os[0].toString() : os[7].toString();
if (os[4].toString().length() > 11) {
throw new IllegalArgumentException(os[1].toString() + " 鐨勬墜鏈哄彿瓒呰繃11浣�,璇锋牳瀹�");
@@ -1343,6 +1365,8 @@
importOwner.setAge(Integer.parseInt(age));
importOwner.setTel(tel);
importOwner.setIdCard(idCard);
+ importOwner.setOwnerTypeCd(ownerTypeCd);
+ importOwner.setParentOwnerId(parentOwnerId);
owners.add(importOwner);
} catch (Exception e) {
logger.error("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�", e);
--
Gitblit v1.8.0