From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java b/WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java
index 1c6259a..03c4500 100644
--- a/WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java
@@ -1,14 +1,15 @@
package com.java110.web.components.assetImport;
import com.java110.core.context.IPageData;
-import com.java110.web.controller.CallComponentController;
-import com.java110.web.smo.app.IAddAppSMO;
+import com.java110.front.controller.CallComponentController;
+import com.java110.web.smo.assetExport.IAssetExportSMO;
+import com.java110.web.smo.assetImport.IAssetImportSMO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
/**
* 娣诲姞搴旂敤缁勪欢
@@ -18,25 +19,48 @@
private final static Logger logger = LoggerFactory.getLogger(CallComponentController.class);
+
@Autowired
- private IAddAppSMO addAppSMOImpl;
+ private IAssetImportSMO assetImportSMOImpl;
+
+ @Autowired
+ private IAssetExportSMO assetExportSMOImpl;
/**
* 娣诲姞搴旂敤鏁版嵁
+ *
* @param pd 椤甸潰鏁版嵁灏佽
* @return ResponseEntity 瀵硅薄
*/
- public ResponseEntity<String> importData(IPageData pd){
+ public ResponseEntity<String> importData(IPageData pd, MultipartFile uploadFile) throws Exception{
- logger.debug("璇锋眰鍙傛暟涓猴細%s", pd.getReqData());
- return new ResponseEntity<String>("鎴愬姛", HttpStatus.OK);
+ return assetImportSMOImpl.importExcelData(pd,uploadFile);
}
- public IAddAppSMO getAddAppSMOImpl() {
- return addAppSMOImpl;
+ /**
+ * 璧勪骇瀵煎嚭
+ *
+ * @param pd
+ * @return
+ * @throws Exception
+ */
+ public ResponseEntity<Object> exitCommunityData(IPageData pd) throws Exception {
+ return assetExportSMOImpl.exportExcelData(pd);
}
- public void setAddAppSMOImpl(IAddAppSMO addAppSMOImpl) {
- this.addAppSMOImpl = addAppSMOImpl;
+ public IAssetImportSMO getAssetImportSMOImpl() {
+ return assetImportSMOImpl;
+ }
+
+ public void setAssetImportSMOImpl(IAssetImportSMO assetImportSMOImpl) {
+ this.assetImportSMOImpl = assetImportSMOImpl;
+ }
+
+ public IAssetExportSMO getAssetExportSMOImpl() {
+ return assetExportSMOImpl;
+ }
+
+ public void setAssetExportSMOImpl(IAssetExportSMO assetExportSMOImpl) {
+ this.assetExportSMOImpl = assetExportSMOImpl;
}
}
--
Gitblit v1.8.0