合并最新功能版本

wuxw

2020-01-02 c5cb75e69127ce6a2020be78e0a10f284e2091ca

 WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java

@@ -1,21 +1,15 @@
package com.java110.web.components.assetImport;

import com.java110.common.util.ImportExcelUtils;
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.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
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;

import java.io.InputStream;

/**
 * 添加应用组件
@@ -29,6 +23,9 @@
    @Autowired
    private IAssetImportSMO assetImportSMOImpl;

    @Autowired
    private IAssetExportSMO assetExportSMOImpl;

    /**
     * 添加应用数据
     *
@@ -40,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;
    }
@@ -47,4 +55,12 @@
    public void setAssetImportSMOImpl(IAssetImportSMO assetImportSMOImpl) {
        this.assetImportSMOImpl = assetImportSMOImpl;
    }

    public IAssetExportSMO getAssetExportSMOImpl() {
        return assetExportSMOImpl;
    }

    public void setAssetExportSMOImpl(IAssetExportSMO assetExportSMOImpl) {
        this.assetExportSMOImpl = assetExportSMOImpl;
    }
}