From 7c6e90dcb144f4c2dee4053ef6aa9531c23e5254 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 03 九月 2021 03:43:29 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 322 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 299 insertions(+), 23 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
old mode 100644
new mode 100755
index 362637f..a801bbc
--- 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
@@ -2,17 +2,32 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+
+import com.java110.config.properties.code.Java110Properties;
+import com.java110.core.client.FtpUploadTemplate;
+import com.java110.core.client.OssUploadTemplate;
+
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.RoomDto;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.fee.FeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetImport.IImportRoomFeeSMO;
+
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.ServiceConstant;
+import com.java110.utils.util.*;
+
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
+
import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
@@ -25,8 +40,11 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import org.thymeleaf.util.StringUtils;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -46,26 +64,87 @@
@Autowired
private RestTemplate restTemplate;
+ @Autowired
+ private FtpUploadTemplate ftpUploadTemplate;
+
+ @Autowired
+ private Java110Properties java110Properties;
+
+ @Autowired
+ private OssUploadTemplate ossUploadTemplate;
+
+
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
try {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ Assert.hasKeyAndValue(paramIn, "communityId", "璇锋眰涓湭鍖呭惈灏忓尯");
+ Assert.hasKeyAndValue(paramIn, "objType", "璇锋眰涓湭鍖呭惈璐圭敤瀵硅薄");
+
//InputStream is = uploadFile.getInputStream();
Workbook workbook = ImportExcelUtils.createWorkbook(uploadFile); //宸ヤ綔绨�
- List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
-
- //鑾峰彇妤间俊鎭�
- getRooms(workbook, rooms);
- // 淇濆瓨鏁版嵁
- return dealExcelData(pd, rooms, result);
+ if (FeeDto.PAYER_OBJ_TYPE_ROOM.equals(paramIn.getString("objType"))) {
+ List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
+ //鑾峰彇妤间俊鎭�
+ getRooms(workbook, rooms);
+ // 淇濆瓨鏁版嵁
+ return dealExcelData(pd, rooms, result);
+ }else{
+ List<ImportRoomFee> cars = new ArrayList<ImportRoomFee>();
+ //鑾峰彇妤间俊鎭�
+ getCars(workbook, cars);
+ // 淇濆瓨鏁版嵁
+ return dealExcelCarData(pd, cars, result);
+ }
} catch (Exception e) {
logger.error("瀵煎叆澶辫触 ", e);
return new ResponseEntity<String>("闈炲父鎶辨瓑锛屾偍濉啓鐨勬ā鏉挎暟鎹湁璇細" + e.getMessage(), HttpStatus.BAD_REQUEST);
}
+ }
+
+ @Override
+ public ResponseEntity<String> importFile(MultipartFile uploadFile) throws Exception {
+ try {
+ String fileName = "";
+ String ossSwitch = MappingCache.getValue(OSSUtil.DOMAIN, OSSUtil.OSS_SWITCH);
+ if (StringUtil.isEmpty(ossSwitch) || !OSSUtil.OSS_SWITCH_OSS.equals(ossSwitch)) {
+ fileName = ftpUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ } else {
+ fileName = ossUploadTemplate.upload(uploadFile, java110Properties.getFtpServer(),
+ java110Properties.getFtpPort(), java110Properties.getFtpUserName(),
+ java110Properties.getFtpUserPassword(), java110Properties.getFtpPath());
+ }
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(fileName, HttpStatus.OK);
+ return responseEntity;
+ } catch (Exception e) {
+ logger.error("涓婁紶鍚堝悓闄勪欢澶辫触 ", e);
+ return new ResponseEntity<String>("闈炲父鎶辨瓑锛屼笂浼犲悎鍚岄檮浠跺け璐ワ細" + e.getMessage(), HttpStatus.BAD_REQUEST);
+ }
+ }
+
+
+
+ @Override
+
+ public ResponseEntity<String> importTempData(IPageData pd) {
+ ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(paramIn,ImportRoomFee.class);
+ importRoomFee.setRoomId(paramIn.getString("objId"));
+ if(paramIn.containsKey("objType") && FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(paramIn.getString("objType"))){
+ importRoomFee.setContractId(paramIn.getString("objId"));
+ importRoomFee.setRoomId("");
+ }
+ List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
+ rooms.add(importRoomFee);
+ return dealExcelData(pd, rooms, result);
}
/**
@@ -87,6 +166,25 @@
return responseEntity;
}
+ /**
+ * 澶勭悊ExcelData鏁版嵁
+ *
+ * @param roomFees 鎴垮眿璐圭敤
+ */
+ private ResponseEntity<String> dealExcelCarData(IPageData pd,
+ List<ImportRoomFee> roomFees,
+
+ ComponentValidateResult result) {
+ ResponseEntity<String> responseEntity = null;
+ //淇濆瓨鍗曞厓淇℃伅 鍜� 妤兼爧淇℃伅
+ responseEntity = savedCarFees(pd, roomFees, result);
+
+ if (responseEntity == null || responseEntity.getStatusCode() != HttpStatus.OK) {
+ return responseEntity;
+ }
+
+ return responseEntity;
+ }
private ResponseEntity<String> savedRoomFees(IPageData pd, List<ImportRoomFee> roomFees, ComponentValidateResult result) {
@@ -94,28 +192,60 @@
throw new IllegalArgumentException("娌℃湁鏁版嵁闇�瑕佸鐞�");
}
- JSONObject data = JSONObject.parseObject(pd.getReqData());
- data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
- data.put("storeId", result.getStoreId());
- data.put("userId", result.getUserId());
+ 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"));
+ }
+
+ private ResponseEntity<String> savedCarFees(IPageData pd, List<ImportRoomFee> carFees, ComponentValidateResult result) {
+
+ if (carFees.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("storeId", result.getStoreId());
+ data.put("importFeeId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ data.put("userId", result.getUserId());
+ data.put("communityId", result.getCommunityId());
+ List<ImportRoomFee> tmpImportCarFees = new ArrayList<>();
+ for (int carIndex = 0; carIndex < carFees.size(); carIndex++) {
+ tmpImportCarFees.add(carFees.get(carIndex));
+ if (carIndex % DEFAULT_ADD_FEE_COUNT == 0 && carIndex != 0) {
+ createCarFee(pd, tmpImportCarFees, data, paramOut);
+
+ tmpImportCarFees = new ArrayList<>();
+ }
+ }
+ if (tmpImportCarFees != null && tmpImportCarFees.size() > 0) {
+
+ createCarFee(pd, tmpImportCarFees, data, paramOut);
+ }
+ return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛锛�" + paramOut.getString("successCount") + ",澶辫触锛�" + paramOut.getString("errorCount"));
}
/**
@@ -124,14 +254,84 @@
* @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);
+ if(!StringUtils.isEmpty(tmpImportRoomFee.get(0).getContractId())){
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importContractFees";
+ }
+
+ 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);
+ }
+
+ /**
+ * 鍒涘缓璐圭敤
+ *
+ * @param pd
+ * @param tmpImportCarFee
+ */
+ private void createCarFee(IPageData pd, List<ImportRoomFee> tmpImportCarFee, JSONObject data, JSONObject paramOut) {
+
+ int successCount = paramOut.getInteger("successCount");
+ int errorCount = paramOut.getInteger("errorCount");
+
+ JSONArray importCarFees = JSONArray.parseArray(JSONObject.toJSONString(tmpImportCarFee));
+ data.put("importCarFees", importCarFees);
+
+ String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importCarFees";
+
+ ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
+
+ if (HttpStatus.OK != responseEntity.getStatusCode()) {
+ errorCount += tmpImportCarFee.size();
+ paramOut.put("errorCount", errorCount);
+ return;
+ }
+
+ JSONObject resOut = JSONObject.parseObject(responseEntity.getBody());
+
+ if (ResultVo.CODE_OK != resOut.getInteger("code")) {
+ errorCount += tmpImportCarFee.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);
}
@@ -143,7 +343,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++) {
@@ -166,21 +366,97 @@
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);
}
}
+ /**
+ * 鑾峰彇 鎴垮眿淇℃伅
+ *
+ * @param workbook
+ * @param cars
+ */
+ private void getCars(Workbook workbook, List<ImportRoomFee> cars) {
+ Sheet sheet = null;
+ sheet = ImportExcelUtils.getSheet(workbook, "杞︿綅璐圭敤淇℃伅");
+ List<Object[]> oList = ImportExcelUtils.listFromSheet(sheet);
+ ImportRoomFee importRoomFee = null;
+ for (int osIndex = 0; osIndex < oList.size(); osIndex++) {
+ Object[] os = oList.get(osIndex);
+ if (osIndex == 0 || osIndex == 1) { // 绗竴琛屾槸 澶撮儴淇℃伅 鐩存帴璺宠繃
+ continue;
+ }
+ if (StringUtil.isNullOrNone(os[0])) {
+ continue;
+ }
+
+ //璐圭敤鍚嶇О娌℃湁濉啓锛岄粯璁よ烦杩�
+ if (StringUtil.isNullOrNone(os[1])) {
+ continue;
+ }
+ Assert.hasValue(os[2], (osIndex + 1) + "琛屽紑濮嬫椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[3], (osIndex + 1) + "琛岀粨鏉熸椂闂翠笉鑳戒负绌�");
+ Assert.hasValue(os[4], (osIndex + 1) + "琛岃垂鐢ㄤ笉鑳戒负绌�");
+
+//
+
+ String startTime = excelDoubleToDate(os[2].toString());
+ String endTime = excelDoubleToDate(os[3].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.setCarNum(os[0].toString());
+ importRoomFee.setFeeName(os[1].toString());
+ importRoomFee.setStartTime(startTime);
+ importRoomFee.setEndTime(endTime);
+ importRoomFee.setAmount(os[4].toString());
+ cars.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