From b497ff41e47f4ebe69b86f13f6972f34f33f4884 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 01 六月 2021 09:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 196 +++++++++++++++++++++++++++++--------------------
1 files changed, 116 insertions(+), 80 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
old mode 100644
new mode 100755
index bd23ca7..0447401
--- 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,10 +4,10 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.RoomDto;
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.*;
import org.apache.poi.ss.usermodel.Sheet;
@@ -22,7 +22,9 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -184,6 +186,7 @@
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);
}
@@ -204,6 +207,7 @@
paramIn.put("num", parkingSpace.getPsNum());
paramIn.put("area", parkingSpace.getArea());
paramIn.put("typeCd", parkingSpace.getTypeCd());
+ paramIn.put("parkingType", "1");
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -232,28 +236,12 @@
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));
+ paramIn.put("startTime", parkingSpace.getStartTime());
+ paramIn.put("endTime", parkingSpace.getEndTime());
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);
-//
-// if (responseEntity.getStatusCode() != HttpStatus.OK) {
-// continue;
-// }
-
-// JSONObject configInfo = JSONObject.parseObject(responseEntity.getBody()).getJSONArray("feeConfigs").getJSONObject(0);
-// if (!configInfo.containsKey("additionalAmount")) {
-// continue;
-// }
-
-// paramIn.put("receivedAmount", configInfo.getString("additionalAmount"));
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -296,7 +284,8 @@
paramIn.put("apartment", room.getSection());
paramIn.put("state", "2002");
paramIn.put("builtUpArea", room.getBuiltUpArea());
- paramIn.put("unitPrice", "1000.00");
+ paramIn.put("feeCoefficient", "1.00");
+ paramIn.put("roomType", "0".equals(room.getFloor().getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_SHOPS);
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
@@ -358,6 +347,8 @@
paramIn.put("configId", ttFee.getString("configId"));
paramIn.put("storeId", result.getStoreId());
paramIn.put("feeEndDate", room.getFeeEndDate().split("#")[feeIndex]);
+ paramIn.put("startTime", paramIn.getString("feeEndDate"));
+
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
}
@@ -379,7 +370,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.queryParkingSpaces?page=1&row=1&communityId=" + result.getCommunityId()
- + "&num=" + parkingSpace.getPsNum();
+ + "&num=" + parkingSpace.getPsNum() + "&areaNum=" + parkingSpace.getPaNum();
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -535,7 +526,9 @@
paramIn.put("communityId", result.getCommunityId());
paramIn.put("floorNum", importFloor.getFloorNum());
paramIn.put("userId", result.getUserId());
- paramIn.put("name", importFloor.getFloorNum() + "鍙锋ゼ");
+ 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);
}
@@ -563,6 +556,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瀵硅薄
@@ -716,7 +710,7 @@
importParkingSpace.setPsNum(os[1].toString());
importParkingSpace.setTypeCd(os[2].toString());
importParkingSpace.setArea(Double.parseDouble(os[3].toString()));
- if (StringUtil.isNullOrNone(os[4])) {
+ if (os.length < 5 || StringUtil.isNullOrNone(os[4])) {
parkingSpaces.add(importParkingSpace);
continue;
}
@@ -728,10 +722,42 @@
importParkingSpace.setCarType(os[7].toString());
importParkingSpace.setCarColor(os[8].toString());
importParkingSpace.setSellOrHire(os[9].toString());
+
+ String startTime = excelDoubleToDate(os[10].toString());
+ String endTime = excelDoubleToDate(os[11].toString());
+ Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+ Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+ importParkingSpace.setStartTime(startTime);
+ importParkingSpace.setEndTime(endTime);
}
parkingSpaces.add(importParkingSpace);
}
+ }
+
+ //瑙ｆ瀽Excel鏃ユ湡鏍煎紡
+ public static String excelDoubleToDate(String strDate) {
+ if (strDate.length() == 5) {
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Date tDate = DoubleToDate(Double.parseDouble(strDate));
+ return sdf.format(tDate);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return strDate;
+ }
+ }
+ return strDate;
+ }
+
+
+ //瑙ｆ瀽Excel鏃ユ湡鏍煎紡
+ public static Date DoubleToDate(Double dVal) {
+ Date tDate = new Date();
+ long localOffset = tDate.getTimezoneOffset() * 60000; //绯荤粺鏃跺尯鍋忕Щ 1900/1/1 鍒� 1970/1/1 鐨� 25569 澶�
+ tDate.setTime((long) ((dVal - 25569) * 24 * 3600 * 1000 + localOffset));
+
+ return tDate;
}
/**
@@ -747,39 +773,44 @@
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportRoom importRoom = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- Object[] os = oList.get(osIndex);
- if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
- continue;
- }
- if (StringUtil.isNullOrNone(os[0])) {
- continue;
- }
- Assert.hasValue(os[1], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾ゼ鏍嬬紪鍙蜂负绌�");
- Assert.hasValue(os[2], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽崟鍏冪紪鍙蜂负绌�");
- Assert.hasValue(os[3], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫ゼ灞備负绌�");
- Assert.hasValue(os[4], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫埛鍨嬩负绌�");
- Assert.hasValue(os[5], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽缓绛戦潰绉负绌�");
- if (!StringUtil.isNullOrNone(os[6])) {
- Assert.hasValue(os[7], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬭垂鐢ㄤ负绌�");
- Assert.hasValue(os[8], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛岃垂鐢ㄥ埌鏈熸椂闂翠负绌�");
- }
- importRoom = new ImportRoom();
- importRoom.setRoomNum(os[0].toString());
- importRoom.setFloor(getImportFloor(floors, os[1].toString(), os[2].toString()));
- importRoom.setLayer(Integer.parseInt(os[3].toString()));
- importRoom.setSection(os[4].toString());
- importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
+ try {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+ Assert.hasValue(os[1], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾ゼ鏍嬬紪鍙蜂负绌�");
+ Assert.hasValue(os[2], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽崟鍏冪紪鍙蜂负绌�");
+ Assert.hasValue(os[3], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫ゼ灞備负绌�");
+ Assert.hasValue(os[4], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬫埛鍨嬩负绌�");
+ Assert.hasValue(os[5], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屽缓绛戦潰绉负绌�");
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
+ Assert.hasValue(os[7], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屾埧灞嬭垂鐢ㄤ负绌�");
+ Assert.hasValue(os[8], "鎴垮眿淇℃伅閫夐」涓�" + (osIndex + 1) + "琛岃垂鐢ㄥ埌鏈熸椂闂翠负绌�");
+ }
+ importRoom = new ImportRoom();
+ importRoom.setRoomNum(os[0].toString());
+ importRoom.setFloor(getImportFloor(floors, os[1].toString(), os[2].toString()));
+ importRoom.setLayer(Integer.parseInt(os[3].toString()));
+ importRoom.setSection(os[4].toString());
+ importRoom.setBuiltUpArea(Double.parseDouble(os[5].toString()));
- if (!StringUtil.isNullOrNone(os[6])) {
- importRoom.setRoomFeeId(os[7].toString());
- importRoom.setFeeEndDate(os[8].toString());
- }
- if (StringUtil.isNullOrNone(os[6])) {
+ if (os.length > 6 && !StringUtil.isNullOrNone(os[6])) {
+ importRoom.setRoomFeeId(os[7].toString());
+ importRoom.setFeeEndDate(os[8].toString());
+ }
+ if (os.length < 7 || StringUtil.isNullOrNone(os[6])) {
+ rooms.add(importRoom);
+ continue;
+ }
+ importRoom.setImportOwner(getImportOwner(owners, os[6].toString()));
rooms.add(importRoom);
- continue;
+ } catch (Exception e) {
+ logger.error("鎴垮眿鏁版嵁鏍￠獙澶辫触", e);
+ throw new IllegalArgumentException("鎴垮眿淇℃伅sheet涓" + (osIndex + 1) + "琛屾暟鎹敊璇紝璇锋鏌�" + e.getLocalizedMessage());
}
- importRoom.setImportOwner(getImportOwner(owners, os[6].toString()));
- rooms.add(importRoom);
}
}
@@ -891,35 +922,40 @@
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportOwner importOwner = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
- Object[] os = oList.get(osIndex);
- if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
- continue;
- }
- if (StringUtil.isNullOrNone(os[0])) {
- continue;
- }
- Assert.hasValue(os[0], "涓氫富淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屼笟涓荤紪鍙蜂负绌�");
- Assert.hasValue(os[1], "涓氫富淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屼笟涓诲悕绉颁负绌�");
- 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();
+ try {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+ Assert.hasValue(os[0], "涓氫富淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屼笟涓荤紪鍙蜂负绌�");
+ Assert.hasValue(os[1], "涓氫富淇℃伅閫夐」涓�" + (osIndex + 1) + "琛屼笟涓诲悕绉颁负绌�");
+ 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浣�,璇锋牳瀹�");
- }
+ 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());
- importOwner.setOwnerName(os[1].toString());
- importOwner.setSex("鐢�".equals(os[2].toString()) ? "0" : "1");
- importOwner.setAge(Integer.parseInt(age));
- importOwner.setTel(tel);
- importOwner.setIdCard(idCard);
- owners.add(importOwner);
+ String age = StringUtil.isNullOrNone(os[3]) ? CommonUtil.getAgeByCertId(idCard) : os[3].toString();
+ importOwner = new ImportOwner();
+ importOwner.setOwnerNum(os[0].toString());
+ importOwner.setOwnerName(os[1].toString());
+ importOwner.setSex("鐢�".equals(os[2].toString()) ? "0" : "1");
+ importOwner.setAge(Integer.parseInt(age));
+ importOwner.setTel(tel);
+ importOwner.setIdCard(idCard);
+ owners.add(importOwner);
+ } catch (Exception e) {
+ logger.error("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�", e);
+ throw new IllegalArgumentException("绗�" + (osIndex + 1) + "琛屾暟鎹嚭鐜伴棶棰�" + e.getLocalizedMessage(), e);
+ }
}
}
--
Gitblit v1.8.0