From c5cb75e69127ce6a2020be78e0a10f284e2091ca Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 02 一月 2020 23:56:42 +0800
Subject: [PATCH] 合并最新功能版本
---
WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 8c1e668..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,7 +1,8 @@
package com.java110.web.components.assetImport;
import com.java110.core.context.IPageData;
-import com.java110.web.controller.CallComponentController;
+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;
@@ -22,6 +23,9 @@
@Autowired
private IAssetImportSMO assetImportSMOImpl;
+ @Autowired
+ private IAssetExportSMO assetExportSMOImpl;
+
/**
* 娣诲姞搴旂敤鏁版嵁
*
@@ -33,6 +37,17 @@
return assetImportSMOImpl.importExcelData(pd,uploadFile);
}
+ /**
+ * 璧勪骇瀵煎嚭
+ *
+ * @param pd
+ * @return
+ * @throws Exception
+ */
+ public ResponseEntity<Object> exitCommunityData(IPageData pd) throws Exception {
+ return assetExportSMOImpl.exportExcelData(pd);
+ }
+
public IAssetImportSMO getAssetImportSMOImpl() {
return assetImportSMOImpl;
}
@@ -40,4 +55,12 @@
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