From 2fc8dd46527fbf2efd21e6a95ccc5efb099a7d69 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:19:31 +0800
Subject: [PATCH] 合并master
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/AssetImportSMOImpl.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 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 f5ca403..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;
@@ -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,8 +319,8 @@
}
assetImportLogDetailDto.setObjName(parkingSpace.getPaNum());
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
continue;
@@ -342,8 +335,8 @@
assetImportLogDetailDtos.add(assetImportLogDetailDto);
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
continue;
@@ -396,8 +389,8 @@
}
assetImportLogDetailDto.setObjName(parkingSpace.getCarNum());
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
} else {
@@ -409,16 +402,17 @@
assetImportLogDetailDto.setMessage(body.getString("msg"));
assetImportLogDetailDto.setObjName(parkingSpace.getCarNum());
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ 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;
@@ -608,8 +602,8 @@
}
assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
} else {
@@ -621,8 +615,8 @@
assetImportLogDetailDto.setMessage(body.getString("msg"));
assetImportLogDetailDto.setObjName(room.getRoomNum() + "瀹�");
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
}
@@ -926,8 +920,8 @@
}
assetImportLogDetailDto.setObjName(importFloor.getFloorNum() + "鏍�" + importFloor.getUnitNum() + "鍗曞厓");
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
} else {
@@ -939,8 +933,8 @@
assetImportLogDetailDto.setMessage(body.getString("msg"));
assetImportLogDetailDto.setObjName(importFloor.getFloorNum() + "鏍�" + importFloor.getUnitNum() + "鍗曞厓");
assetImportLogDetailDtos.add(assetImportLogDetailDto);
- failCount +=1;
- successCount = successCount >0? successCount -1:successCount;
+ failCount += 1;
+ successCount = successCount > 0 ? successCount - 1 : successCount;
assetImportLogDto.setSuccessCount(successCount);
assetImportLogDto.setErrorCount(failCount);
}
--
Gitblit v1.8.0