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 | 90 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 75 insertions(+), 15 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 bf81a61..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
@@ -26,7 +26,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;
/**
@@ -94,26 +96,29 @@
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
- JSONObject data = JSONObject.parseObject(pd.getReqData());
- data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ JSONObject paramOut = new JSONObject();
+ paramOut.put("successCount", 0);
+ paramOut.put("errorCount", 0);
+ JSONObject data = JSONObject.parseObject(pd.getReqData());
+ data.put("storeId", result.getStoreId());
+ data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ data.put("userId", result.getUserId());
+ data.put("communityId", result.getCommunityId());
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"));
}
/**
@@ -122,14 +127,39 @@
* @param pd
* @param tmpImportRoomFee
*/
- private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data) {
+ private void createRoomFee(IPageData pd, List<ImportRoomFee> tmpImportRoomFee, JSONObject data, JSONObject paramOut) {
+
+ int successCount = paramOut.getInteger("successCount");
+ int errorCount = paramOut.getInteger("errorCount");
JSONArray importRoomFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportRoomFee));
data.put("importRoomFees", importRoomFees);
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
- this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+ 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);
}
@@ -141,7 +171,7 @@
*/
private void getRooms(Workbook workbook, List<ImportRoomFee> rooms) {
Sheet sheet = null;
- sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿淇℃伅");
+ sheet = ImportExcelUtils.getSheet(workbook, "鎴垮眿璐圭敤淇℃伅");
List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
ImportRoomFee importRoomFee = null;
for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
@@ -164,21 +194,51 @@
Assert.hasValue(os[5], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
Assert.hasValue(os[6], (osIndex + 1) + "琛岃垂鐢ㄤ笉鑳戒负绌�");
- Assert.isDate(os[4].toString(), DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛屽紑濮嬫椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
- Assert.isDate(os[5].toString(), DateUtil.DATE_FORMATE_STRING_B, (osIndex + 1) + "琛岀粨鏉熸椂闂存牸寮忛敊璇� 璇峰～鍐橸YYY-MM-DD 鏂囨湰鏍煎紡");
+//
+
+ String startTime = excelDoubleToDate(os[4].toString());
+ 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 ImportRoomFee();
importRoomFee.setFloorNum(os[0].toString());
importRoomFee.setUnitNum(os[1].toString());
importRoomFee.setRoomNum(os[2].toString());
importRoomFee.setFeeName(os[3].toString());
- importRoomFee.setStartTime(os[4].toString());
- importRoomFee.setEndTime(os[5].toString());
+ importRoomFee.setStartTime(startTime);
+ importRoomFee.setEndTime(endTime);
importRoomFee.setAmount(os[6].toString());
rooms.add(importRoomFee);
}
}
+
+ //瑙ｆ瀽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;
+ }
+
public RestTemplate getRestTemplate() {
return restTemplate;
}
--
Gitblit v1.8.0