From 95c301090d0a582dd9f43391d72d8c8b2cea9ee9 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期五, 06 八月 2021 11:54:21 +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 | 844 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 614 insertions(+), 230 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 14bf1ec..6d4377a 100755
--- 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,12 +4,23 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.smo.ISaveTransactionLogSMO;
import com.java110.dto.RoomDto;
-import com.java110.entity.assetImport.*;
+import com.java110.dto.assetImportLog.AssetImportLogDto;
+import com.java110.dto.assetImportLogDetail.AssetImportLogDetailDto;
+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.front.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 org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
@@ -41,6 +52,9 @@
@Autowired
private RestTemplate restTemplate;
+
+ @Autowired
+ private ISaveTransactionLogSMO saveTransactionLogSMOImpl;
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
@@ -140,24 +154,69 @@
JSONObject paramIn = null;
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
ImportOwner owner = null;
- for (ImportFee fee : fees) {
- JSONObject savedFeeConfigInfo = getExistsFee(pd, result, fee);
- if (savedFeeConfigInfo != null) {
- continue;
+
+ AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
+ assetImportLogDto.setSuccessCount(0L);
+ assetImportLogDto.setErrorCount(0L);
+ assetImportLogDto.setCommunityId(result.getCommunityId());
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
+ assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
+ long successCount = 0L;
+ long failCount = 0L;
+ AssetImportLogDetailDto assetImportLogDetailDto = null;
+ try {
+ for (ImportFee fee : fees) {
+ JSONObject savedFeeConfigInfo = getExistsFee(pd, result, fee);
+ if (savedFeeConfigInfo != null) {
+ successCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ }
+ //paramIn = new JSONObject();
+ //淇濆瓨 璐圭敤椤�
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.saveFeeConfig";
+
+ paramIn = JSONObject.parseObject(JSONObject.toJSONString(fee));
+ paramIn.put("communityId", result.getCommunityId());
+
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ /***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
+ failCount += 1;
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(fee.getFeeName());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(fee.getFeeName());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount += 1;
+ } else {
+ successCount += 1;
+ }
+ }
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
}
-
- //paramIn = new JSONObject();
- //淇濆瓨 璐圭敤椤�
-
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.saveFeeConfig";
-
- paramIn = JSONObject.parseObject(JSONObject.toJSONString(fee));
- paramIn.put("communityId", result.getCommunityId());
-
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- continue;
- }
+ } finally {
+ saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
}
return responseEntity;
@@ -176,75 +235,190 @@
JSONObject paramIn = null;
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();
- // 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
- if (savedParkingAreaInfo == null) {
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingArea.saveParkingArea";
+ AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
+ assetImportLogDto.setSuccessCount(0L);
+ assetImportLogDto.setErrorCount(0L);
+ assetImportLogDto.setCommunityId(result.getCommunityId());
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
+ assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
+ long successCount = 0L;
+ long failCount = 0L;
+ AssetImportLogDetailDto assetImportLogDetailDto = null;
+ try {
+ for (ImportParkingSpace parkingSpace : parkingSpaces) {
+ responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ 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) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ failCount += 1;
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(parkingSpace.getPaNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(parkingSpace.getPaNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ successCount += 1;
+ }
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ }
+
+ JSONObject savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
+ if (savedParkingSpaceInfo != null) {
+ continue;
+ }
+
+ 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());
- paramIn.put("num", parkingSpace.getPaNum());
+ paramIn.put("parkingType", "1");
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
- savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(parkingSpace.getPaNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(parkingSpace.getPaNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ }
+ }
+
+ savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
+ if (savedParkingSpaceInfo == null) {
+ continue;
+ }
+
+ //鏄惁鏈変笟涓讳俊鎭�
+ if (parkingSpace.getImportOwner() == null) {
+ continue;
+ }
+
+ paramIn.clear();
+
+ 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());
+ paramIn.put("carColor", parkingSpace.getCarColor());
+ paramIn.put("psId", savedParkingSpaceInfo.getString("psId"));
+ paramIn.put("storeId", result.getStoreId());
+ paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
+ paramIn.put("startTime", parkingSpace.getStartTime());
+ paramIn.put("endTime", parkingSpace.getEndTime());
+
+ if ("H".equals(parkingSpace.getSellOrHire())) {
+ paramIn.put("cycles", "0");
+ }
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ /***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(parkingSpace.getCarNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(parkingSpace.getCarNum());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ }
+ }
}
- if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
- continue;
- }
+ } catch (Exception e) {
+ saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
- JSONObject savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
- if (savedParkingSpaceInfo != null) {
- continue;
- }
-
- 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());
- paramIn.put("parkingType", "1");
-
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- continue;
- }
-
- savedParkingSpaceInfo = getExistsParkSpace(pd, result, parkingSpace);
- if (savedParkingSpaceInfo == null) {
- continue;
- }
-
- //鏄惁鏈変笟涓讳俊鎭�
- if (parkingSpace.getImportOwner() == null) {
- continue;
- }
-
- paramIn.clear();
-
- 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());
- paramIn.put("carColor", parkingSpace.getCarColor());
- paramIn.put("psId", savedParkingSpaceInfo.getString("psId"));
- paramIn.put("storeId", result.getStoreId());
- paramIn.put("sellOrHire", parkingSpace.getSellOrHire());
- paramIn.put("startTime", parkingSpace.getStartTime());
- paramIn.put("endTime", parkingSpace.getEndTime());
-
- if ("H".equals(parkingSpace.getSellOrHire())) {
- paramIn.put("cycles", "0");
- }
-
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.sellParkingSpace";
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
}
return responseEntity;
@@ -264,98 +438,200 @@
JSONObject paramIn = null;
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
ImportOwner owner = null;
- for (ImportRoom room : rooms) {
- JSONObject savedRoomInfo = getExistsRoom(pd, result, room);
- if (savedRoomInfo != null) {
- continue;
- }
+ AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
+ assetImportLogDto.setSuccessCount(0L);
+ assetImportLogDto.setErrorCount(0L);
+ assetImportLogDto.setCommunityId(result.getCommunityId());
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
+ assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
+ long successCount = 0L;
+ long failCount = 0L;
+ AssetImportLogDetailDto assetImportLogDetailDto = null;
+ try {
+ for (ImportRoom room : rooms) {
+ JSONObject savedRoomInfo = getExistsRoom(pd, result, room);
+ if (savedRoomInfo != null) {
+ continue;
+ }
- paramIn = new JSONObject();
+ paramIn = new JSONObject();
- //淇濆瓨 鎴垮眿
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/room.saveRoom";
+ //淇濆瓨 鎴垮眿
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/room.saveRoom";
- paramIn.put("communityId", result.getCommunityId());
- paramIn.put("unitId", room.getFloor().getUnitId());
- paramIn.put("roomNum", room.getRoomNum());
- paramIn.put("layer", room.getLayer());
- paramIn.put("section", "1");
- paramIn.put("apartment", room.getSection());
- paramIn.put("state", "2002");
- paramIn.put("builtUpArea", room.getBuiltUpArea());
- paramIn.put("feeCoefficient", "1.00");
- paramIn.put("roomSubType", room.getRoomSubType());
- paramIn.put("roomArea", room.getRoomArea());
- paramIn.put("roomRent", room.getRoomRent());
- paramIn.put("roomType", "0".equals(room.getFloor().getUnitNum()) ? RoomDto.ROOM_TYPE_SHOPS : RoomDto.ROOM_TYPE_SHOPS);
+ paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("unitId", room.getFloor().getUnitId());
+ paramIn.put("roomNum", room.getRoomNum());
+ paramIn.put("layer", room.getLayer());
+ paramIn.put("section", "1");
+ paramIn.put("apartment", room.getSection());
+ paramIn.put("state", "2002");
+ paramIn.put("builtUpArea", room.getBuiltUpArea());
+ paramIn.put("feeCoefficient", "1.00");
+ paramIn.put("roomSubType", room.getRoomSubType());
+ paramIn.put("roomArea", room.getRoomArea());
+ paramIn.put("roomRent", room.getRoomRent());
+ 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);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- continue;
- }
-
- savedRoomInfo = getExistsRoom(pd, result, room);
- if (savedRoomInfo == null) {
- continue;
- }
-
- if (room.getImportOwner() == null) {
- continue;
- }
- paramIn.clear();
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/room.sellRoom";
- paramIn.put("communityId", result.getCommunityId());
- paramIn.put("ownerId", room.getImportOwner().getOwnerId());
- paramIn.put("roomId", savedRoomInfo.getString("roomId"));
- paramIn.put("state", "2001");
- paramIn.put("storeId", result.getStoreId());
- if (!StringUtil.isEmpty(room.getRoomFeeId()) && "0".equals(room.getRoomFeeId())) {
- paramIn.put("feeEndDate", room.getFeeEndDate());
- }
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
- if (responseEntity.getStatusCode() != HttpStatus.OK) {
- continue;
- }
- //鍒涘缓璐圭敤
- if (StringUtil.isEmpty(room.getRoomFeeId()) || "0".equals(room.getRoomFeeId())) {
- continue;
- }
- String[] feeIds = room.getRoomFeeId().split("#");
-
- for (int feeIndex = 0; feeIndex < feeIds.length; feeIndex++) {
- String feeId = feeIds[feeIndex];
- ImportFee tmpFee = null;
- for (ImportFee fee : fees) {
- if (feeId.equals(fee.getId())) {
- tmpFee = fee;
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ failCount += 1;
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ successCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
}
}
- if (tmpFee == null) {
- continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ savedRoomInfo = getExistsRoom(pd, result, room);
+ if (savedRoomInfo == null) {
+ continue;
}
-
- JSONObject ttFee = getExistsFee(pd, result, tmpFee);
-
- if (ttFee == null) {
- continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ if (room.getImportOwner() == null) {
+ continue;
}
-
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.saveRoomCreateFee";
+ paramIn.clear();
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/room.sellRoom";
paramIn.put("communityId", result.getCommunityId());
- paramIn.put("locationTypeCd", "3000");
- paramIn.put("locationObjId", savedRoomInfo.getString("roomId"));
- paramIn.put("configId", ttFee.getString("configId"));
+ paramIn.put("ownerId", room.getImportOwner().getOwnerId());
+ paramIn.put("roomId", savedRoomInfo.getString("roomId"));
+ paramIn.put("state", "2001");
paramIn.put("storeId", result.getStoreId());
- paramIn.put("feeEndDate", room.getFeeEndDate().split("#")[feeIndex]);
- paramIn.put("startTime", paramIn.getString("feeEndDate"));
-
+ if (!StringUtil.isEmpty(room.getRoomFeeId()) && "0".equals(room.getRoomFeeId())) {
+ paramIn.put("feeEndDate", room.getFeeEndDate());
+ }
responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
- }
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ continue;
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ continue;
+ }
+ }
+ //鍒涘缓璐圭敤
+ if (StringUtil.isEmpty(room.getRoomFeeId()) || "0".equals(room.getRoomFeeId())) {
+ continue;
+ }
+ String[] feeIds = room.getRoomFeeId().split("#");
+ for (int feeIndex = 0; feeIndex < feeIds.length; feeIndex++) {
+ String feeId = feeIds[feeIndex];
+ ImportFee tmpFee = null;
+ for (ImportFee fee : fees) {
+ if (feeId.equals(fee.getId())) {
+ tmpFee = fee;
+ }
+ }
+
+ if (tmpFee == null) {
+ continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ }
+
+ JSONObject ttFee = getExistsFee(pd, result, tmpFee);
+
+ if (ttFee == null) {
+ continue;//娌℃湁璐圭敤椤癸紝鍙兘鍐欓敊浜�
+ }
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/fee.saveRoomCreateFee";
+ paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("locationTypeCd", "3000");
+ paramIn.put("locationObjId", savedRoomInfo.getString("roomId"));
+ 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);
+
+ if (responseEntity.getStatusCode() != HttpStatus.OK) {
+ /***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ }
+ }
+ }
+
+ }
+ } finally {
+ saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
}
return responseEntity;
@@ -473,37 +749,77 @@
String apiUrl = "";
JSONObject paramIn = null;
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
+ assetImportLogDto.setSuccessCount(0L);
+ assetImportLogDto.setErrorCount(0L);
+ assetImportLogDto.setCommunityId(result.getCommunityId());
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
+ assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
+ long successCount = 0L;
+ long failCount = 0L;
+ AssetImportLogDetailDto assetImportLogDetailDto = null;
+ try {
+ for (ImportOwner owner : owners) {
+ JSONObject savedOwnerInfo = getExistsOwner(pd, result, owner);
- for (ImportOwner owner : owners) {
- JSONObject savedOwnerInfo = getExistsOwner(pd, result, owner);
-
- if (savedOwnerInfo != null) {
- owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
- continue;
- }
- paramIn = new JSONObject();
-
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/owner.saveOwner";
-
- paramIn.put("communityId", result.getCommunityId());
- paramIn.put("userId", result.getUserId());
- paramIn.put("name", owner.getOwnerName());
- paramIn.put("age", owner.getAge());
- paramIn.put("link", owner.getTel());
- paramIn.put("sex", owner.getSex());
- paramIn.put("ownerTypeCd", "1001");
- paramIn.put("idCard", owner.getIdCard());
- paramIn.put("source","BatchImport");
- responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
-
- if (responseEntity.getStatusCode() == HttpStatus.OK) {
- JSONObject body = JSONObject.parseObject(responseEntity.getBody());
- if (body.containsKey("code") && body.getIntValue("code") != 0) {
- throw new IllegalArgumentException(body.getString("msg"));
+ if (savedOwnerInfo != null) {
+ owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
+ continue;
}
- savedOwnerInfo = getExistsOwner(pd, result, owner);
- owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
+ paramIn = new JSONObject();
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/owner.saveOwner";
+
+ paramIn.put("communityId", result.getCommunityId());
+ paramIn.put("userId", result.getUserId());
+ paramIn.put("name", owner.getOwnerName());
+ paramIn.put("age", owner.getAge());
+ paramIn.put("link", owner.getTel());
+ paramIn.put("sex", owner.getSex());
+ paramIn.put("ownerTypeCd", "1001");
+ paramIn.put("idCard", owner.getIdCard());
+ paramIn.put("source", "BatchImport");
+ responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(), apiUrl, HttpMethod.POST);
+
+ /***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
+ if (responseEntity.getStatusCode() == HttpStatus.OK) {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(owner.getOwnerName());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ throw new IllegalArgumentException(body.getString("msg"));
+ }
+ savedOwnerInfo = getExistsOwner(pd, result, owner);
+ owner.setOwnerId(savedOwnerInfo.getString("ownerId"));
+ successCount += 1;
+ } else {
+ failCount += 1;
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(owner.getOwnerName());
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ }
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
}
+ } finally {
+ saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
}
return responseEntity;
@@ -521,53 +837,121 @@
String apiUrl = "";
JSONObject paramIn = null;
ResponseEntity<String> responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
- for (ImportFloor importFloor : floors) {
- paramIn = new JSONObject();
- //鍏堜繚瀛� 妤兼爧淇℃伅
- JSONObject savedFloorInfo = getExistsFloor(pd, result, importFloor);
- // 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
- if (savedFloorInfo == null) {
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/floor.saveFloor";
+
+ AssetImportLogDto assetImportLogDto = new AssetImportLogDto();
+ assetImportLogDto.setSuccessCount(0L);
+ assetImportLogDto.setErrorCount(0L);
+ assetImportLogDto.setCommunityId(result.getCommunityId());
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
+ assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
+ long successCount = 0L;
+ long failCount = 0L;
+ AssetImportLogDetailDto assetImportLogDetailDto = null;
+ try {
+ for (ImportFloor importFloor : floors) {
+ paramIn = new JSONObject();
+ //鍏堜繚瀛� 妤兼爧淇℃伅
+ JSONObject savedFloorInfo = getExistsFloor(pd, result, importFloor);
+ // 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
+ if (savedFloorInfo == null) {
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/floor.saveFloor";
+ paramIn.put("communityId", result.getCommunityId());
+ 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);
+ }
+
+ /***************************************瀵煎叆鏃ュ織璁板綍****************************************************/
+ if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ failCount += 1;
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(importFloor.getFloorNum() + "鏍�");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ continue;
+ } else {
+ successCount += 1;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ }
+
+
+ if (savedFloorInfo == null) {
+ continue;
+ }
+ importFloor.setFloorId(savedFloorInfo.getString("floorId"));
+ paramIn.clear();
+ //鍒ゆ柇鍗曞厓淇℃伅鏄惁宸茬粡瀛樺湪锛屽鏋滃瓨鍦ㄥ垯涓嶄繚瀛樻暟鎹畊nit.queryUnits
+ JSONObject savedUnitInfo = getExistsUnit(pd, result, importFloor);
+ if (savedUnitInfo != null) {
+ importFloor.setUnitId(savedUnitInfo.getString("unitId"));
+ continue;
+ }
+
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.saveUnit";
+
paramIn.put("communityId", result.getCommunityId());
- paramIn.put("floorNum", importFloor.getFloorNum());
- paramIn.put("userId", result.getUserId());
- paramIn.put("name", importFloor.getFloorNum() + "鏍�");
- paramIn.put("floorArea", 1.00);
-
+ paramIn.put("floorId", savedFloorInfo.getString("floorId"));
+ 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);
- savedFloorInfo = getExistsFloor(pd, result, importFloor);
- }
- if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
- continue;
- }
-
-
- if (savedFloorInfo == null) {
- continue;
- }
- importFloor.setFloorId(savedFloorInfo.getString("floorId"));
- paramIn.clear();
- //鍒ゆ柇鍗曞厓淇℃伅鏄惁宸茬粡瀛樺湪锛屽鏋滃瓨鍦ㄥ垯涓嶄繚瀛樻暟鎹畊nit.queryUnits
- JSONObject savedUnitInfo = getExistsUnit(pd, result, importFloor);
- if (savedUnitInfo != null) {
+ /****************************** 寮�濮嬭褰曞け璐ユ棩蹇� *******************************/
+ if (responseEntity != null && responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ if (Assert.isJsonObject(responseEntity.getBody())) {
+ JSONObject paramOut = JSONObject.parseObject(responseEntity.getBody());
+ assetImportLogDetailDto.setState(paramOut.getString("code"));
+ assetImportLogDetailDto.setMessage(paramOut.getString("msg"));
+ } else {
+ assetImportLogDetailDto.setState("F");
+ assetImportLogDetailDto.setMessage(responseEntity.getBody());
+ }
+ assetImportLogDetailDto.setObjName(importFloor.getFloorNum() + "鏍�" + importFloor.getUnitNum() + "鍗曞厓");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ } else {
+ JSONObject body = JSONObject.parseObject(responseEntity.getBody());
+ if (body.containsKey("code") && body.getIntValue("code") != 0) {
+ assetImportLogDetailDto = new AssetImportLogDetailDto();
+ assetImportLogDetailDto.setCommunityId(assetImportLogDto.getCommunityId());
+ assetImportLogDetailDto.setState(body.getString("code"));
+ assetImportLogDetailDto.setMessage(body.getString("msg"));
+ assetImportLogDetailDto.setObjName(importFloor.getFloorNum() + "鏍�" + importFloor.getUnitNum() + "鍗曞厓");
+ assetImportLogDetailDtos.add(assetImportLogDetailDto);
+ failCount +=1;
+ successCount = successCount >0? successCount -1:successCount;
+ assetImportLogDto.setSuccessCount(successCount);
+ assetImportLogDto.setErrorCount(failCount);
+ }
+ }
+ //灏唘nitId 鍒峰叆ImportFloor瀵硅薄
+ savedUnitInfo = getExistsUnit(pd, result, importFloor);
importFloor.setUnitId(savedUnitInfo.getString("unitId"));
- continue;
+
}
-
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.saveUnit";
-
- paramIn.put("communityId", result.getCommunityId());
- paramIn.put("floorId", savedFloorInfo.getString("floorId"));
- 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瀵硅薄
- savedUnitInfo = getExistsUnit(pd, result, importFloor);
- importFloor.setUnitId(savedUnitInfo.getString("unitId"));
-
+ } finally {
+ saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
}
return responseEntity;
}
--
Gitblit v1.8.0