From acb14e4abc643f05dd641b2b08e2b449132dfce2 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 23 十二月 2020 08:54:31 +0800
Subject: [PATCH] 优化 相关代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 113 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 71 insertions(+), 42 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
index 29da6f3..361ca6a 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
@@ -5,7 +5,7 @@
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.meterWater.ImportExportMeterWaterDto;
+import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
import com.java110.utils.constant.ServiceConstant;
@@ -58,7 +58,7 @@
Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile); //宸ヤ綔绨�
- List<ImportExportMeterWaterDto> rooms = new ArrayList<ImportExportMeterWaterDto>();
+ List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
//鑾峰彇妤间俊鎭�
getRooms(workbook, rooms);
@@ -72,14 +72,16 @@
/**
* 澶勭悊ExcelData鏁版嵁
+ *
+ * @param roomFees 鎴垮眿璐圭敤
*/
private ResponseEntity<String> dealExcelData(IPageData pd,
- List<ImportExportMeterWaterDto> rooms,
+ List<ImportRoomFee> roomFees,
ComponentValidateResult result) {
ResponseEntity<String> responseEntity = null;
//淇濆瓨鍗曞厓淇℃伅 鍜� 妤兼爧淇℃伅
- responseEntity = savedRoomFees(pd, rooms, result);
+ responseEntity = savedRoomFees(pd, roomFees, result);
if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
return responseEntity;
@@ -88,54 +90,76 @@
return responseEntity;
}
- private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportExportMeterWaterDto> rooms, ComponentValidateResult result) {
+ private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportRoomFee> roomFees, ComponentValidateResult result) {
- JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
- if (rooms.size() < 1) {
+ if (roomFees.size() < 1) {
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
+ JSONObject paramOut = new JSONObject();
+ paramOut.put("successCount", 0);
+ paramOut.put("errorCount", 0);
+
JSONObject data = JSONObject.parseObject(pd.getReqData());
- data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
data.put("storeId", result.getStoreId());
+ data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
data.put("userId", result.getUserId());
- data.put("configId", reqJson.getString("configId"));
- data.put("feeTypeCd", reqJson.getString("feeTypeCd"));
data.put("communityId", result.getCommunityId());
-
- List<ImportExportMeterWaterDto> tmpImportRoomFees = new ArrayList<>();
- for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
-
- tmpImportRoomFees.add(rooms.get(roomIndex));
-
+ List<ImportRoomFee> tmpImportRoomFees = new ArrayList<>();
+ for (int roomIndex = 0; roomIndex < roomFees.size(); roomIndex++) {
+ tmpImportRoomFees.add(roomFees.get(roomIndex));
if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
-
- createRoomFee(pd, tmpImportRoomFees, data);
+ createRoomFee(pd, tmpImportRoomFees, data, paramOut);
tmpImportRoomFees = new ArrayList<>();
}
}
if (tmpImportRoomFees != null && tmpImportRoomFees.size() > 0) {
- createRoomFee(pd, tmpImportRoomFees, data);
+ createRoomFee(pd, tmpImportRoomFees, data, paramOut);
}
- return ResultVo.success();
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛锛�" + paramOut.getString("successCount") + ",澶辫触锛�" + paramOut.getString("errorCount"));
}
/**
* 鍒涘缓璐圭敤
*
* @param pd
- * @param tmpImportRoomFees
+ * @param tmpImportRoomFee
*/
- private void createRoomFee(IPageData pd, List<ImportExportMeterWaterDto> tmpImportRoomFees, JSONObject data) {
+ private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data, JSONObject paramOut) {
- JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFees));
- data.put("importMeteWaterFees", importRoomFees);
+ int successCount = paramOut.getInteger("successCount");
+ int errorCount = paramOut.getInteger("errorCount");
- String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/meterWater/importMeterWater";
+ JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFee));
+ data.put("importRoomFees", importRoomFees);
- this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
+
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+
+ if (HttpStatus.OK != responseEntity.getStatusCode()) {
+ errorCount += tmpImportRoomFee.size();
+ paramOut.put("errorCount", errorCount);
+ return;
+ }
+
+ JSONObject resOut = JSONObject.parseObject(responseEntity.getBody());
+
+ if (ResultVo.CODE_OK != resOut.getInteger("code")) {
+ errorCount += tmpImportRoomFee.size();
+ paramOut.put("errorCount", errorCount);
+ return;
+ }
+
+ JSONObject resData = resOut.getJSONObject("data");
+
+ successCount += resData.getInteger("successCount");
+ errorCount += resData.getInteger("errorCount");
+
+ paramOut.put("successCount", successCount);
+ paramOut.put("errorCount", errorCount);
}
@@ -145,11 +169,11 @@
* @param workbook
* @param rooms
*/
- private void getRooms(Workbook workbook, List<ImportExportMeterWaterDto> rooms) {
+ private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
Sheet sheet = null;
sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
- ImportExportMeterWaterDto importRoomFee = null;
+ ImportRoomFee importRoomFee = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
Object[] os = oList.get(osIndex);
if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
@@ -158,29 +182,34 @@
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) + "鏈湡搴︽暟涓嶈兘涓虹┖");
- Assert.hasValue(os[6], (osIndex + 1) + "鏈湡搴︽暟鏃堕棿涓嶈兘涓虹┖");
+
+ //璐圭敤鍚嶇О娌℃湁濉啓锛岄粯璁よ烦杩�
+ if (StringUtil.isNullOrNone(os[4])) {
+ 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) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[6], (osIndex + 1) + "琛岃垂鐢ㄤ笉鑳戒负绌�");
//
String startTime = excelDoubleToDate(os[4].toString());
- String endTime = excelDoubleToDate(os[6].toString());
- Assert.isDate(startTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD hh:mm:ss 鏂囨湰鏍煎紡");
- Assert.isDate(endTime, DateUtil.DATE_FORMATE_STRING_A, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD hh:mm:ss 鏂囨湰鏍煎紡");
+ String endTime = excelDoubleToDate(os[5].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 鏂囨湰鏍煎紡");
- importRoomFee = new ImportExportMeterWaterDto();
+ importRoomFee = new ImportRoomFee();
importRoomFee.setFloorNum(os[0].toString());
importRoomFee.setUnitNum(os[1].toString());
importRoomFee.setRoomNum(os[2].toString());
- importRoomFee.setPreDegrees(os[3].toString());
- importRoomFee.setPreReadingTime(startTime);
- importRoomFee.setCurDegrees(endTime);
- importRoomFee.setCurReadingTime(os[6].toString());
+ importRoomFee.setFeeName(os[3].toString());
+ importRoomFee.setStartTime(startTime);
+ importRoomFee.setEndTime(endTime);
+ importRoomFee.setAmount(os[6].toString());
rooms.add(importRoomFee);
}
}
--
Gitblit v1.8.0