Przeglądaj źródła

feat:
修改标准项目库

18339543638 2 lat temu
rodzic
commit
d51c1c84fe

+ 9 - 1
tr-modules-api/tr-module-export-api/src/main/java/cn/tr/module/api/ExcelApi.java

@@ -4,6 +4,7 @@ import org.springframework.util.Base64Utils;
 
 import java.io.InputStream;
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * @ClassName : ExcelApi
@@ -31,13 +32,20 @@ public interface ExcelApi {
      */
     <T> byte[] doExportExcel(Class<T> aClass, Collection<T> data);
 
+    default  <T> String importExcel(String filename, InputStream inputStream, Class<T> aClass) throws Exception {
+        return importExcel(filename,inputStream,aClass,null);
+    }
+
     /**
      * 导入文件
      * @param filename    文件名称
      * @param inputStream 数据流
      * @param aClass      文件类
+     * @param  customObj  自定义参数
      * @return            导入记录id
      * @throws Exception
      */
-    <T> String importExcel(String filename, InputStream inputStream, Class<T> aClass) throws Exception;
+    <T> String importExcel(String filename, InputStream inputStream, Class<T> aClass, Map<String,Object> customObj) throws Exception;
+
+
 }

+ 4 - 2
tr-modules/tr-module-export/src/main/java/cn/tr/module/excel/provider/ExcelProvider.java

@@ -7,6 +7,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
 import java.util.Collection;
+import java.util.Map;
 
 /**
  * @ClassName : ExcelProvider
@@ -23,8 +24,9 @@ public class ExcelProvider implements ExcelApi {
         return excelService.exportExcel(aClass,data);
     }
 
+
     @Override
-    public <T> String importExcel(String filename, InputStream inputStream, Class<T> aClass) throws Exception {
-        return excelService.importExcel(filename,inputStream,aClass,null);
+    public <T> String importExcel(String filename, InputStream inputStream, Class<T> aClass, Map<String, Object> customObj) throws Exception {
+        return excelService.importExcel(filename,inputStream,aClass,customObj);
     }
 }