From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +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 | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 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 717f9ca..2a1c128 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
@@ -8,19 +8,12 @@
import com.java110.dto.RoomDto;
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.assetImport.*;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IAssetImportSMO;
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 com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
@@ -159,7 +152,7 @@
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
assetImportLogDto.setCommunityId(result.getCommunityId());
- assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_FEE_IMPORT);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
long successCount = 0L;
@@ -239,7 +232,7 @@
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
assetImportLogDto.setCommunityId(result.getCommunityId());
- assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_AREA_PARKING_IMPORT);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
long successCount = 0L;
@@ -247,7 +240,7 @@
AssetImportLogDetailDto assetImportLogDetailDto = null;
try {
for (ImportParkingSpace parkingSpace : parkingSpaces) {
- responseEntity = new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ responseEntity = ResultVo.success();
JSONObject savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
paramIn = new JSONObject();
// 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
@@ -326,6 +319,10 @@
}
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());
@@ -336,6 +333,10 @@
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;
@@ -388,6 +389,10 @@
}
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) {
@@ -397,12 +402,17 @@
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);
}
}
}
} catch (Exception e) {
+ logger.error("瀵煎叆杞︿綅寮傚父", e);
saveTransactionLogSMOImpl.saveAssetImportLog(assetImportLogDto);
-
+ throw e;
}
return responseEntity;
@@ -426,7 +436,7 @@
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
assetImportLogDto.setCommunityId(result.getCommunityId());
- assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_ROOM_IMPORT);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
long successCount = 0L;
@@ -592,6 +602,10 @@
}
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) {
@@ -601,10 +615,12 @@
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);
}
}
- assetImportLogDto.setSuccessCount(successCount);
- assetImportLogDto.setErrorCount(failCount);
}
}
@@ -731,7 +747,7 @@
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
assetImportLogDto.setCommunityId(result.getCommunityId());
- assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_OWENR_IMPORT);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
long successCount = 0L;
@@ -820,7 +836,7 @@
assetImportLogDto.setSuccessCount(0L);
assetImportLogDto.setErrorCount(0L);
assetImportLogDto.setCommunityId(result.getCommunityId());
- assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_HISTORY_FEE_IMPORT);
+ assetImportLogDto.setLogType(AssetImportLogDto.LOG_TYPE_FLOOR_UNIT_IMPORT);
List<AssetImportLogDetailDto> assetImportLogDetailDtos = new ArrayList<>();
assetImportLogDto.setAssetImportLogDetailDtos(assetImportLogDetailDtos);
long successCount = 0L;
@@ -863,19 +879,6 @@
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(importFloor.getFloorNum() + "鏍�");
- assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount += 1;
- assetImportLogDto.setSuccessCount(successCount);
- assetImportLogDto.setErrorCount(failCount);
- continue;
- }
successCount += 1;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
@@ -917,6 +920,10 @@
}
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) {
@@ -926,6 +933,10 @@
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瀵硅薄
--
Gitblit v1.8.0