From c083b87a2635d9b48dd95cb441d7a7c5c9258abe Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 四月 2021 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 65 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 3 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 1ae929c..286e9de 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
@@ -2,18 +2,31 @@
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.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;
@@ -49,6 +62,16 @@
@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 {
@@ -82,6 +105,42 @@
}
}
+ @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"));
+ List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
+ rooms.add(importRoomFee);
+ return dealExcelData(pd, rooms, result);
+ }
+
/**
* 澶勭悊ExcelData鏁版嵁
*
@@ -107,9 +166,9 @@
* @param roomFees 鎴垮眿璐圭敤
*/
private ResponseEntity<String> dealExcelCarData(IPageData pd,
- List<ImportRoomFee> roomFees,
+ List<ImportRoomFee> roomFees,
- ComponentValidateResult result) {
+ ComponentValidateResult result) {
ResponseEntity<String> responseEntity = null;
//淇濆瓨鍗曞厓淇℃伅 鍜� 妤兼爧淇℃伅
responseEntity = savedCarFees(pd, roomFees, result);
@@ -178,7 +237,7 @@
}
if (tmpImportCarFees != null && tmpImportCarFees.size() > 0) {
- createRoomFee(pd, tmpImportCarFees, data, paramOut);
+ createCarFee(pd, tmpImportCarFees, data, paramOut);
}
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鎴愬姛锛�" + paramOut.getString("successCount") + ",澶辫触锛�" + paramOut.getString("errorCount"));
}
--
Gitblit v1.8.0