通用导入成功

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteDeptService.java

@@ -1,7 +1,7 @@
 package com.boman.system.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteLogService.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.boman.common.core.constant.ServiceNameConstants;
 import com.boman.common.core.domain.R;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 import com.boman.system.api.factory.RemoteLogFallbackFactory;
 
 /**

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteMenuService.java

@@ -1,7 +1,7 @@
 package com.boman.system.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -19,7 +19,7 @@ public interface RemoteMenuService {
      * 功能描述: 根据userId查找此人的所有菜单
      *
      * @param userId userId
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     @GetMapping("/menu/listMenusByUserId/{userId}")
     List<SysMenu> listMenusByUserId(@PathVariable("userId") Long userId);

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteRoleDataService.java

@@ -21,7 +21,7 @@ public interface RemoteRoleDataService {
      * 功能描述: 根据userId查找此人的所有roleData
      *
      * @param idList idList
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     @PostMapping(value = "/roleData/listByRoleIdList")
     List<SysRoleData> listByRoleIdList(@RequestBody List<Long> idList);

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteSysMenuService.java

@@ -2,7 +2,7 @@ package com.boman.system.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

boman-api/boman-api-system/src/main/java/com/boman/system/api/RemoteUserService.java

@@ -1,6 +1,6 @@
 package com.boman.system.api;
 
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;

boman-api/boman-api-system/src/main/java/com/boman/system/api/factory/RemoteLogFallbackFactory.java

@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import com.boman.common.core.domain.R;
 import com.boman.system.api.RemoteLogService;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 import feign.hystrix.FallbackFactory;
 
 /**

boman-api/boman-api-system/src/main/java/com/boman/system/api/model/LoginUser.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 
 /**
  * 用户信息

boman-api/boman-api-web-core/src/main/java/com/boman/web/core/api/RemoteObjService.java

@@ -1,9 +1,13 @@
 package com.boman.web.core.api;
 
 import com.boman.common.core.constant.ServiceNameConstants;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author shiqian
@@ -21,5 +25,14 @@ public interface RemoteObjService {
      */
     @GetMapping("common/tableName/{tableName}/pkName/{pkName}")
     Long getMaxId(@PathVariable("tableName") String tableName, @PathVariable("pkName") String pkName);
+
+    /**
+     * 功能描述: 批量导入数据
+     *
+     * @param dto dto
+     * @return com.boman.common.core.web.domain.AjaxResult
+     */
+    @PostMapping("web-core/file/common/import")
+    AjaxResult importCommonData(@RequestBody ImportExcelDto dto);
 }
 

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysDept.java → boman-api/boman-domain/src/main/java/com.boman.domain/SysDept.java

@@ -1,4 +1,4 @@
-package com.boman.system.api.domain;
+package com.boman.domain;
 
 import java.util.ArrayList;
 import java.util.List;

boman-api/boman-domain/src/main/java/com.boman.domain/SysDictData.java

@@ -1,8 +1,9 @@
 package com.boman.domain;
 
-//import com.boman.common.core.constant.UserConstants;
-//import org.apache.commons.lang3.builder.ToStringBuilder;
-//import org.apache.commons.lang3.builder.ToStringStyle;
+import com.boman.common.core.annotation.Excel;
+import com.boman.common.core.constant.UserConstants;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 字典数据表 sys_dict_data
@@ -18,15 +19,15 @@ public class SysDictData extends BaseEntity
     private Long id;
 
     /** 字典排序 */
-//    @Excel(name = "字典排序", cellType = ColumnType.NUMERIC)
+    @Excel(name = "字典排序", cellType = Excel.ColumnType.NUMERIC)
     private Long dictSort;
 
     /** 字典标签 */
-//    @Excel(name = "字典标签")
+    @Excel(name = "字典标签")
     private String dictLabel;
 
     /** 字典键值 */
-//    @Excel(name = "字典键值")
+    @Excel(name = "字典键值")
     private String dictValue;
 
     /** 字典类型 */

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysMenu.java → boman-api/boman-domain/src/main/java/com.boman.domain/SysMenu.java

@@ -1,6 +1,5 @@
-package com.boman.system.api.domain;
+package com.boman.domain;
 
-import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysOperLog.java → boman-api/boman-domain/src/main/java/com.boman.domain/SysOperLog.java

@@ -1,4 +1,4 @@
-package com.boman.system.api.domain;
+package com.boman.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysRole.java → boman-api/boman-domain/src/main/java/com.boman.domain/SysRole.java

@@ -1,4 +1,4 @@
-package com.boman.system.api.domain;
+package com.boman.domain;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;

boman-api/boman-api-system/src/main/java/com/boman/system/api/domain/SysUser.java → boman-api/boman-domain/src/main/java/com.boman.domain/SysUser.java

@@ -1,4 +1,4 @@
-package com.boman.system.api.domain;
+package com.boman.domain;
 
 import java.util.Date;
 import java.util.List;

boman-api/boman-domain/src/main/java/com.boman.domain/dto/ImportExcelDto.java

@@ -1,8 +1,9 @@
 package com.boman.domain.dto;
 
-import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.fastjson.JSONObject;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author shiqian
@@ -10,19 +11,10 @@ import java.io.Serializable;
  **/
 public class ImportExcelDto implements Serializable {
 
-
-    private MultipartFile multipartFile;
+    private List<JSONObject> dataList;
 
     private String tableName;
 
-    public MultipartFile getMultipartFile() {
-        return multipartFile;
-    }
-
-    public void setMultipartFile(MultipartFile multipartFile) {
-        this.multipartFile = multipartFile;
-    }
-
     public String getTableName() {
         return tableName;
     }
@@ -30,4 +22,12 @@ public class ImportExcelDto implements Serializable {
     public void setTableName(String tableName) {
         this.tableName = tableName;
     }
+
+    public List<JSONObject> getDataList() {
+        return dataList;
+    }
+
+    public void setDataList(List<JSONObject> dataList) {
+        this.dataList = dataList;
+    }
 }

boman-auth/src/main/java/com/boman/auth/service/SysLoginService.java

@@ -11,7 +11,7 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.system.api.RemoteLogService;
 import com.boman.system.api.RemoteUserService;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
 /**

boman-common/boman-common-core/pom.xml

@@ -107,6 +107,12 @@
             <artifactId>swagger-annotations</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-domain</artifactId>
+            <version>2.5.0-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
 </project>

boman-common/boman-common-core/src/main/java/com/boman/common/core/utils/poi/ExcelUtil.java

@@ -1,46 +1,6 @@
 package com.boman.common.core.utils.poi;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.annotation.Excel;
 import com.boman.common.core.annotation.Excel.ColumnType;
 import com.boman.common.core.annotation.Excel.Type;
@@ -50,11 +10,32 @@ import com.boman.common.core.utils.DateUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.file.FileTypeUtils;
 import com.boman.common.core.utils.file.ImageUtils;
+import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.reflect.ReflectUtils;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.SysDictData;
+import com.boman.domain.SysUser;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Excel相关处理
- * 
+ *
  * @author ruoyi
  */
 public class ExcelUtil<T>
@@ -141,7 +122,7 @@ public class ExcelUtil<T>
 
     /**
      * 对excel表单默认第一个索引名转换成list
-     * 
+     *
      * @param is 输入流
      * @return 转换后集合
      */
@@ -152,7 +133,7 @@ public class ExcelUtil<T>
 
     /**
      * 对excel表单指定表格索引名转换成list
-     * 
+     *
      * @param sheetName 表格索引名
      * @param is 输入流
      * @return 转换后集合
@@ -184,22 +165,7 @@ public class ExcelUtil<T>
         if (rows > 0)
         {
             // 定义一个map用于存放excel列的序号和field.
-            Map<String, Integer> cellMap = new HashMap<String, Integer>();
-            // 获取表头
-            Row heard = sheet.getRow(0);
-            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
-            {
-                Cell cell = heard.getCell(i);
-                if (StringUtils.isNotNull(cell))
-                {
-                    String value = this.getCellValue(heard, i).toString();
-                    cellMap.put(value, i);
-                }
-                else
-                {
-                    cellMap.put(null, i);
-                }
-            }
+            Map<String, Integer> cellMap = getHead(sheet);
             // 有数据时才处理 得到类的所有field.
             Field[] allFields = clazz.getDeclaredFields();
             // 定义一个map用于存放列的序号和field.
@@ -310,9 +276,150 @@ public class ExcelUtil<T>
         return list;
     }
 
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param is        输入流
+     * @return 转换后集合
+     */
+    public List<JSONObject> importCommonExcel(String sheetName, InputStream is, List<GenTableColumn> columns) throws Exception {
+        List<JSONObject> dataList = new ArrayList<>(16);
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        Sheet sheet = getSheet(sheetName);
+        int rows = sheet.getPhysicalNumberOfRows();
+        if (rows < 0) {
+            return Collections.emptyList();
+        }
+
+        Map<String, Integer> cellMap = getHead(sheet);
+        Map<Integer, GenTableColumn> fieldsMap = new HashMap<>(16);
+        for (GenTableColumn column : columns) {
+            for (Map.Entry<String, Integer> entry : cellMap.entrySet()) {
+                if (entry.getKey().equals(column.getColumnComment())) {
+                    Integer sort = cellMap.get(entry.getKey());
+                    fieldsMap.put(sort, column);
+                }
+            }
+        }
+
+        // 往data中赋值
+        for (int i = 1; i < rows; i++) {
+            Row row = sheet.getRow(i);
+            JSONObject data = new JSONObject();
+            for (Map.Entry<Integer, GenTableColumn> entry : fieldsMap.entrySet()) {
+                GenTableColumn column = entry.getValue();
+                String columnName = column.getColumnName();
+                Object value = this.getCellValue(row, entry.getKey());
+                value = handleFK(column.getColumnName(), value, columns);
+                data.put(columnName, value);
+            }
+
+            dataList.add(data);
+        }
+
+        return dataList;
+    }
+
+    private Sheet getSheet(String sheetName) throws IOException {
+        Sheet sheet;
+        if (StringUtils.isNotEmpty(sheetName)) {
+            // 如果指定sheet名,则取指定sheet中的内容.
+            sheet = wb.getSheet(sheetName);
+        } else {
+            // 如果传入的sheet名不存在则默认指向第1个sheet.
+            sheet = wb.getSheetAt(0);
+        }
+
+        if (sheet == null) {
+            throw new IOException("文件sheet不存在");
+        }
+        return sheet;
+    }
+
+    private Map<String, Integer> getHead(Sheet sheet) {
+        // 定义一个map用于存放excel列的序号和field.
+        Map<String, Integer> cellMap = new HashMap<>();
+        // 获取表头
+        Row heard = sheet.getRow(0);
+        for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+            Cell cell = heard.getCell(i);
+            if (StringUtils.isNotNull(cell)) {
+                String value = this.getCellValue(heard, i).toString();
+                cellMap.put(value, i);
+            } else {
+                cellMap.put(null, i);
+            }
+        }
+        return cellMap;
+    }
+
+    private Object getValueByFieldType(Object val, Field field, Class<?> fieldType) {
+        if (String.class == fieldType) {
+            String s = Convert.toStr(val);
+            if (StringUtils.endsWith(s, ".0")) {
+                val = StringUtils.substringBefore(s, ".0");
+            } else {
+                String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                if (StringUtils.isNotEmpty(dateFormat)) {
+                    val = DateUtils.parseDateToStr(dateFormat, (Date) val);
+                } else {
+                    val = Convert.toStr(val);
+                }
+            }
+        } else if ((Integer.TYPE == fieldType || Integer.class == fieldType) && StringUtils.isNumeric(Convert.toStr(val))) {
+            val = Convert.toInt(val);
+        } else if (Long.TYPE == fieldType || Long.class == fieldType) {
+            val = Convert.toLong(val);
+        } else if (Double.TYPE == fieldType || Double.class == fieldType) {
+            val = Convert.toDouble(val);
+        } else if (Float.TYPE == fieldType || Float.class == fieldType) {
+            val = Convert.toFloat(val);
+        } else if (BigDecimal.class == fieldType) {
+            val = Convert.toBigDecimal(val);
+        } else if (Date.class == fieldType) {
+            if (val instanceof String) {
+                val = DateUtils.parseDate(val);
+            } else if (val instanceof Double) {
+                val = DateUtil.getJavaDate((Double) val);
+            }
+        } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
+            val = Convert.toBool(val, false);
+        }
+        return val;
+    }
+
+    private String getColumnNameByFieldName(String columnComment, Object value, List<GenTableColumn> columns) {
+        for (GenTableColumn column : columns) {
+            if (columnComment.equals(column.getColumnComment())) {
+                return column.getColumnName();
+            }
+        }
+
+        throw new IllegalArgumentException(String.format("表格中的 [%s] 列, 不在数据库表中, 检查是否出现错误", columnComment));
+    }
+
+
+    private Object handleFK(String columnName, Object value, List<GenTableColumn> columns) {
+        for (GenTableColumn column : columns) {
+            if (columnName.equals(column.getColumnName())) {
+                if (ObjectUtils.isEmpty(column.getDictType())) {
+                    continue;
+                }
+
+                List<SysDictData> dictDataList = column.getSysDictData();
+                SysDictData sysDictData = ObjectUtils.filterOne(dictDataList, dict -> dict.getDictLabel().equals(String.valueOf(value)));
+                return sysDictData.getDictValue();
+            }
+        }
+
+        return value;
+    }
+
     /**
      * 对list数据源将其里面的数据导入到excel表单
-     * 
+     *
      * @param response 返回数据
      * @param list 导出数据集合
      * @param sheetName 工作表的名称
@@ -329,7 +436,7 @@ public class ExcelUtil<T>
 
     /**
      * 对list数据源将其里面的数据导入到excel表单
-     * 
+     *
      * @param sheetName 工作表的名称
      * @return 结果
      */
@@ -343,7 +450,7 @@ public class ExcelUtil<T>
 
     /**
      * 对list数据源将其里面的数据导入到excel表单
-     * 
+     *
      * @return 结果
      */
     public void exportExcel(OutputStream outputStream)
@@ -406,7 +513,7 @@ public class ExcelUtil<T>
 
     /**
      * 填充excel数据
-     * 
+     *
      * @param index 序号
      * @param row 单元格行
      */
@@ -433,7 +540,7 @@ public class ExcelUtil<T>
 
     /**
      * 创建表格样式
-     * 
+     *
      * @param wb 工作薄对象
      * @return 样式列表
      */
@@ -471,7 +578,7 @@ public class ExcelUtil<T>
         headerFont.setColor(IndexedColors.WHITE.getIndex());
         style.setFont(headerFont);
         styles.put("header", style);
-        
+
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
@@ -515,7 +622,7 @@ public class ExcelUtil<T>
 
     /**
      * 设置单元格信息
-     * 
+     *
      * @param value 单元格值
      * @param attr 注解相关
      * @param cell 单元格信息
@@ -543,7 +650,7 @@ public class ExcelUtil<T>
             }
         }
     }
-    
+
     /**
      * 获取画布
      */
@@ -653,7 +760,7 @@ public class ExcelUtil<T>
 
     /**
      * 设置 POI XSSFSheet 单元格提示
-     * 
+     *
      * @param sheet 表单
      * @param promptTitle 提示标题
      * @param promptContent 提示内容
@@ -676,7 +783,7 @@ public class ExcelUtil<T>
 
     /**
      * 设置某些列的值只能输入预制的数据,显示下拉框.
-     * 
+     *
      * @param sheet 要设置的sheet.
      * @param textlist 下拉框显示的内容
      * @param firstRow 开始行
@@ -710,7 +817,7 @@ public class ExcelUtil<T>
 
     /**
      * 解析导出值 0=男,1=女,2=未知
-     * 
+     *
      * @param propertyValue 参数值
      * @param converterExp 翻译注解
      * @param separator 分隔符
@@ -747,7 +854,7 @@ public class ExcelUtil<T>
 
     /**
      * 反向解析值 男=0,女=1,未知=2
-     * 
+     *
      * @param propertyValue 参数值
      * @param converterExp 翻译注解
      * @param separator 分隔符
@@ -831,7 +938,7 @@ public class ExcelUtil<T>
 
     /**
      * 获取bean中的属性值
-     * 
+     *
      * @param vo 实体对象
      * @param field 字段
      * @param excel 注解
@@ -862,7 +969,7 @@ public class ExcelUtil<T>
 
     /**
      * 以类的属性的get方法方法形式获取值
-     * 
+     *
      * @param o
      * @param name
      * @return value
@@ -911,7 +1018,7 @@ public class ExcelUtil<T>
         this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());
         this.maxHeight = getRowHeight();
     }
-    
+
     /**
      * 根据注解获取最大行高
      */
@@ -947,7 +1054,7 @@ public class ExcelUtil<T>
 
     /**
      * 创建工作表
-     * 
+     *
      * @param sheetNo sheet数量
      * @param index 序号
      */
@@ -968,7 +1075,7 @@ public class ExcelUtil<T>
 
     /**
      * 获取单元格值
-     * 
+     *
      * @param row 获取的行
      * @param column 获取单元格列号
      * @return 单元格值

boman-common/boman-common-datascope/src/main/java/com/boman/common/datascope/aspect/DataScopeAspect.java

@@ -13,8 +13,8 @@ import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.web.domain.BaseEntity;
 import com.boman.common.datascope.annotation.DataScope;
 import com.boman.common.security.service.TokenService;
-import com.boman.system.api.domain.SysRole;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
 /**

boman-common/boman-common-log/src/main/java/com/boman/common/log/aspect/LogAspect.java

@@ -27,7 +27,7 @@ import com.boman.common.core.utils.ip.IpUtils;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessStatus;
 import com.boman.common.log.service.AsyncLogService;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 
 /**
  * 操作日志记录处理

boman-common/boman-common-log/src/main/java/com/boman/common/log/service/AsyncLogService.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.boman.system.api.RemoteLogService;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 
 /**
  * 异步调用日志服务

boman-common/boman-common-security/src/main/java/com/boman/common/security/feign/FeignRequestInterceptor.java

@@ -31,6 +31,14 @@ public class FeignRequestInterceptor implements RequestInterceptor
             {
                 requestTemplate.header(CacheConstants.DETAILS_USER_ID, userId);
             }
+            String token = headers.get(CacheConstants.HEADER);
+            if (StringUtils.isEmpty(token)) {
+                token = headers.get(CacheConstants.HEADER.toLowerCase());
+            }
+            if (StringUtils.isNotEmpty(token))
+            {
+                requestTemplate.header(CacheConstants.HEADER, token);
+            }
             String userName = headers.get(CacheConstants.DETAILS_USERNAME);
             if (StringUtils.isNotEmpty(userName))
             {

boman-modules/boman-file/pom.xml

@@ -72,7 +72,13 @@
             <artifactId>boman-api-web-core</artifactId>
             <version>2.5.0-SNAPSHOT</version>
         </dependency>
-        
+
+        <!--         RuoYi redis-->
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-common-redis</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

boman-modules/boman-file/src/main/java/com/boman/file/RuoYFileApplication.java

@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.boman.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * 文件服务
@@ -12,6 +13,7 @@ import com.boman.common.swagger.annotation.EnableCustomSwagger2;
  */
 @EnableCustomSwagger2
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@EnableFeignClients(basePackages = {"com.boman"})
 public class RuoYFileApplication
 {
     public static void main(String[] args)

boman-modules/boman-file/src/main/java/com/boman/file/controller/ExcelController.java

@@ -42,13 +42,12 @@ public class ExcelController {
     /**
      * 功能描述: 通用的导入接口
      *
-     * @param dto MultipartFile 和 tableName
+     * @param multipartFile MultipartFile
+     * @param tableName     tableName
      * @return void
      */
     @PostMapping("/import")
-    public AjaxResult importExcelCommon(@RequestBody ImportExcelDto dto) {
-        MultipartFile multipartFile = dto.getMultipartFile();
-        String tableName = dto.getTableName();
+    public AjaxResult importExcelCommon(MultipartFile multipartFile, String tableName) throws Exception {
         List<JSONObject> result = null;
         try {
             result = fileService.importExcelCommon(multipartFile, tableName);

boman-modules/boman-file/src/main/java/com/boman/file/service/FastDfsSysFileServiceImpl.java

@@ -1,6 +1,7 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.domain.dto.ImportExcelDto;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -63,7 +64,19 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
      * @return java.util.List<com.alibaba.fastjson.JSONObject>
      */
     @Override
-    public List<JSONObject> importExcelCommon(MultipartFile multipartFile, String tableName) {
+    public List<JSONObject> importExcelCommon(ImportExcelDto dto) {
+        return null;
+    }
+
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @param multipartFile multipartFile
+     * @param tableName     tableName
+     * @return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public List<JSONObject> importExcelCommon(MultipartFile multipartFile, String tableName) throws Exception {
         return null;
     }
 }

boman-modules/boman-file/src/main/java/com/boman/file/service/ISysFileService.java

@@ -1,6 +1,7 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -30,6 +31,15 @@ public interface ISysFileService
      */
     String uploadFileBase64(String base64) throws IOException;
 
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @param multipartFile multipartFile
+     * @param tableName     tableName
+     * @return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    List<JSONObject> importExcelCommon(ImportExcelDto dto) throws Exception;
+
     /**
      * 功能描述: 通用的导入接口
      *

boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -1,17 +1,24 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.utils.SecurityUtils;
+import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.utils.poi.ExcelUtil;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.common.redis.RedisKey;
+import com.boman.common.redis.service.RedisService;
+import com.boman.domain.GenTable;
+import com.boman.domain.GenTableColumn;
+import com.boman.domain.dto.ImportExcelDto;
 import com.boman.file.utils.FileUploadUtils;
-import com.boman.system.api.domain.SysUser;
+import com.boman.web.core.api.RemoteObjService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
 import java.util.Objects;
@@ -26,6 +33,12 @@ import java.util.Objects;
 @RefreshScope
 public class LocalSysFileServiceImpl implements ISysFileService
 {
+
+    @Resource
+    private RemoteObjService remoteObjService;
+    @Resource
+    private RedisService redisService;
+
     /**
      * 资源映射路径 前缀
      */
@@ -84,12 +97,29 @@ public class LocalSysFileServiceImpl implements ISysFileService
         Objects.requireNonNull(multipartFile, "multipartFile is empty");
         ObjectUtils.requireNonNull(tableName, "tableName is empty");
 
+        GenTable genTable = redisService.getCacheObject(RedisKey.TABLE_INFO + tableName);
+        List<GenTableColumn> columns = genTable.getColumns();
+
         ExcelUtil<JSONObject> util = new ExcelUtil<>(JSONObject.class);
-        List<JSONObject> list = util.importExcel(multipartFile.getInputStream());
-        String operName = SecurityUtils.getUsername();
-//        String message = userService.importUser(list, updateSupport, operName);
+        List<JSONObject> list = util.importCommonExcel("", multipartFile.getInputStream(), columns);
+
+        ImportExcelDto dto = new ImportExcelDto();
+        dto.setDataList(list);
+        dto.setTableName(tableName);
+
+        AjaxResult ajaxResult = remoteObjService.importCommonData(dto);
+
 
+        return null;
+    }
 
+    /**f
+     * 功能描述: 通用的导入接口
+     *
+     * @param dto@return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public List<JSONObject> importExcelCommon(ImportExcelDto dto) throws Exception {
         return null;
     }
 }

boman-modules/boman-file/src/main/java/com/boman/file/service/MinioSysFileServiceImpl.java

@@ -1,6 +1,7 @@
 package com.boman.file.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.boman.domain.dto.ImportExcelDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -66,7 +67,19 @@ public class MinioSysFileServiceImpl implements ISysFileService
      * @return java.util.List<com.alibaba.fastjson.JSONObject>
      */
     @Override
-    public List<JSONObject> importExcelCommon(MultipartFile multipartFile, String tableName) {
+    public List<JSONObject> importExcelCommon(ImportExcelDto dto) {
+        return null;
+    }
+
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @param multipartFile multipartFile
+     * @param tableName     tableName
+     * @return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    @Override
+    public List<JSONObject> importExcelCommon(MultipartFile multipartFile, String tableName) throws Exception {
         return null;
     }
 }

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -1,11 +1,9 @@
 package com.boman.gen.service;
 
-import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.lang.reflect.Array;
 import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,7 +20,7 @@ import com.boman.domain.TableSql;
 
 import com.boman.gen.mapper.GenTableRelationMapper;
 import com.boman.system.api.RemoteSysMenuService;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import org.apache.commons.io.IOUtils;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
@@ -49,9 +47,6 @@ import com.boman.gen.util.GenUtils;
 import com.boman.gen.util.VelocityInitializer;
 import com.boman.gen.util.VelocityUtils;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
 /**
  * 业务 服务层实现
  *

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysDeptController.java

@@ -21,7 +21,7 @@ import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 import com.boman.system.service.ISysDeptService;
 
 /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysMenuController.java

@@ -2,7 +2,7 @@ package com.boman.system.controller;
 
 import java.util.List;
 
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysOperlogController.java

@@ -18,7 +18,7 @@ import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 import com.boman.system.service.ISysOperLogService;
 
 /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysProfileController.java

@@ -21,7 +21,7 @@ import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.service.TokenService;
 import com.boman.system.api.RemoteFileService;
 import com.boman.domain.SysFile;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 import com.boman.system.service.ISysUserService;
 

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysRoleController.java

@@ -22,7 +22,7 @@ import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.api.domain.SysRole;
+import com.boman.domain.SysRole;
 import com.boman.system.service.ISysRoleService;
 
 /**

boman-modules/boman-system/src/main/java/com/boman/system/controller/SysUserController.java

@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 import com.boman.system.service.*;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,8 +32,8 @@ import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.common.log.annotation.Log;
 import com.boman.common.log.enums.BusinessType;
 import com.boman.common.security.annotation.PreAuthorize;
-import com.boman.system.api.domain.SysRole;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 
 /**

boman-modules/boman-system/src/main/java/com/boman/system/domain/vo/TreeSelect.java

@@ -4,9 +4,9 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 
 /**
  * Treeselect树结构实体类

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysDeptMapper.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 
 /**
  * 部门管理 数据层

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysMenuMapper.java

@@ -2,7 +2,7 @@ package com.boman.system.mapper;
 
 import java.util.List;
 
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -142,7 +142,7 @@ public interface SysMenuMapper
      * 功能描述: 根据roleId查找的叶子结点去匹配所对应的菜单树
      *
      * @param roleId roleId
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     List<SysMenu> listTreeByRoleId(@Param("roleId") Long roleId);
 }

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysOperLogMapper.java

@@ -2,7 +2,7 @@ package com.boman.system.mapper;
 
 import java.util.List;
 
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 
 /**
  * 操作日志 数据层

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysRoleMapper.java

@@ -2,7 +2,7 @@ package com.boman.system.mapper;
 
 import java.util.List;
 
-import com.boman.system.api.domain.SysRole;
+import com.boman.domain.SysRole;
 
 /**
  * 角色表 数据层

boman-modules/boman-system/src/main/java/com/boman/system/mapper/SysUserMapper.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 
 /**
  * 用户表 数据层

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysDeptService.java

@@ -2,8 +2,7 @@ package com.boman.system.service;
 
 import java.util.List;
 
-import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.system.api.domain.SysDept;
+import com.boman.domain.SysDept;
 import com.boman.system.domain.vo.TreeSelect;
 
 /**

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysMenuService.java

@@ -6,7 +6,7 @@ import java.util.Set;
 
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import com.boman.system.domain.vo.RouterVo;
 import com.boman.system.domain.vo.TreeSelect;
 
@@ -41,7 +41,7 @@ public interface ISysMenuService
      *
      * @param allMenus 所有的
      * @param menu     父节点吧
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     List<SysMenu> getChildList(List<SysMenu> allMenus, SysMenu menu);
 
@@ -65,7 +65,7 @@ public interface ISysMenuService
      * 功能描述: 根据菜单id，找到此菜单以及子菜单下所有的叶子节点
      *
      * @param menuId menuId
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     List<SysMenu> allLeafNodeById(Long menuId);
 

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysOperLogService.java

@@ -1,7 +1,7 @@
 package com.boman.system.service;
 
 import java.util.List;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 
 /**
  * 操作日志 服务层

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysRoleService.java

@@ -3,7 +3,7 @@ package com.boman.system.service;
 import java.util.List;
 import java.util.Set;
 
-import com.boman.system.api.domain.SysRole;
+import com.boman.domain.SysRole;
 
 /**
  * 角色业务层

boman-modules/boman-system/src/main/java/com/boman/system/service/ISysUserService.java

@@ -2,7 +2,7 @@ package com.boman.system.service;
 
 import java.util.List;
 
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 
 /**
  * 用户 业务层

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysDeptServiceImpl.java

@@ -6,17 +6,15 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.common.core.web.domain.AjaxResult;
 import com.google.common.collect.Lists;
-import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.boman.common.core.constant.UserConstants;
 import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.datascope.annotation.DataScope;
-import com.boman.system.api.domain.SysDept;
-import com.boman.system.api.domain.SysRole;
+import com.boman.domain.SysDept;
+import com.boman.domain.SysRole;
 import com.boman.system.domain.vo.TreeSelect;
 import com.boman.system.mapper.SysDeptMapper;
 import com.boman.system.mapper.SysRoleMapper;

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysMenuServiceImpl.java

@@ -9,7 +9,7 @@ import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
 import com.boman.domain.RoleEnum;
 import com.boman.domain.constant.GlobalBtn;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,16 +19,9 @@ import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.array.ArrayUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
-import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.common.redis.RedisKey;
-import com.boman.common.redis.service.RedisService;
-import com.boman.domain.GenTable;
-import com.boman.domain.RoleEnum;
-import com.boman.domain.constant.GlobalBtn;
 import com.boman.domain.dto.RoleMenuDto;
-import com.boman.system.api.domain.SysMenu;
-import com.boman.system.api.domain.SysRole;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 import com.boman.system.domain.SysRoleMenu;
 import com.boman.system.domain.vo.MetaVo;
 import com.boman.system.domain.vo.RouterVo;
@@ -37,20 +30,11 @@ import com.boman.system.mapper.SysMenuMapper;
 import com.boman.system.mapper.SysRoleMapper;
 import com.boman.system.mapper.SysRoleMenuMapper;
 import com.boman.system.service.ISysMenuService;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.apache.commons.lang3.BooleanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.boman.common.core.utils.obj.ObjectUtils.*;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.*;
-import static com.boman.domain.constant.FormDataConstant.COLON;
 
 /**
  * 菜单 业务层处理
@@ -148,7 +132,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * 功能描述: 根据菜单id，找到此菜单以及子菜单下所有的叶子节点
      *
      * @param menuId menuId
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     @Override
     public List<SysMenu> allLeafNodeById(Long menuId) {
@@ -549,7 +533,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      *
      * @param allMenus 所有的
      * @param menu     父节点
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     @Override
     public List<SysMenu> getChildList(List<SysMenu> allMenus, SysMenu menu) {

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysOperLogServiceImpl.java

@@ -3,7 +3,7 @@ package com.boman.system.service.impl;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.boman.system.api.domain.SysOperLog;
+import com.boman.domain.SysOperLog;
 import com.boman.system.mapper.SysOperLogMapper;
 import com.boman.system.service.ISysOperLogService;
 

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysPermissionServiceImpl.java

@@ -5,7 +5,7 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 import com.boman.system.service.ISysMenuService;
 import com.boman.system.service.ISysPermissionService;
 import com.boman.system.service.ISysRoleService;

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleMenuServiceImpl.java

@@ -4,7 +4,7 @@ import com.boman.common.core.utils.aop.ProxyUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
 import com.boman.domain.constant.TableNameConst;
 import com.boman.domain.dto.RoleMenuDto;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
 import com.boman.system.domain.SysRoleMenu;
 import com.boman.system.mapper.SysRoleMenuMapper;
 import com.boman.system.service.ISysMenuService;
@@ -12,7 +12,6 @@ import com.boman.web.core.api.RemoteObjService;
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.aop.framework.AopContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
@@ -107,7 +106,7 @@ public class SysRoleMenuServiceImpl implements ISysRoleMenuService{
      *
      * @param head     A M D......
      * @param menuList menuList
-     * @return java.util.List<com.boman.system.api.domain.SysMenu>
+     * @return java.util.List<com.boman.domain.SysMenu>
      */
     private List<SysMenu> buildBtnByHead(List<String> head, List<SysMenu> menuList) {
         List<SysMenu> result = Lists.newArrayListWithCapacity(menuList.size());

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysRoleServiceImpl.java

@@ -13,7 +13,7 @@ import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.utils.SpringUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.datascope.annotation.DataScope;
-import com.boman.system.api.domain.SysRole;
+import com.boman.domain.SysRole;
 import com.boman.system.domain.SysRoleDept;
 import com.boman.system.domain.SysRoleMenu;
 import com.boman.system.mapper.SysRoleDeptMapper;

boman-modules/boman-system/src/main/java/com/boman/system/service/impl/SysUserServiceImpl.java

@@ -15,8 +15,8 @@ import com.boman.common.core.exception.CustomException;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.datascope.annotation.DataScope;
-import com.boman.system.api.domain.SysRole;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 import com.boman.system.domain.SysPost;
 import com.boman.system.domain.SysUserPost;
 import com.boman.system.domain.SysUserRole;

boman-web-core/src/main/java/com/boman/web/core/controller/ImportExportExcelController.java

@@ -0,0 +1,36 @@
+package com.boman.web.core.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.ImportExcelDto;
+import com.boman.web.core.service.excel.IImportExportExcelService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author shiqian
+ * @date 2021年06月08日 09:31
+ **/
+@RequestMapping("web-core/file/common")
+@RestController
+public class ImportExportExcelController {
+
+
+    @Resource
+    private IImportExportExcelService service;
+
+    @PostMapping("/import")
+    public AjaxResult importCommonData(@RequestBody ImportExcelDto dto) {
+        List<JSONObject> dataList = dto.getDataList();
+        String tableName = dto.getTableName();
+        service.importCommonData(tableName, dataList);
+        return AjaxResult.success();
+    }
+
+
+}

boman-web-core/src/main/java/com/boman/web/core/domain/TableContext.java

@@ -10,7 +10,7 @@ import com.boman.domain.constant.GlobalBtn;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.system.api.RemoteMenuService;
 import com.boman.system.api.RemoteRoleDataService;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.service.common.ICommonService;

boman-web-core/src/main/java/com/boman/web/core/service/TableServiceCmdService.java

@@ -3,6 +3,7 @@ package com.boman.web.core.service;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.constant.CacheConstants;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.collection.CollectionUtils;
@@ -10,6 +11,7 @@ import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.web.domain.AjaxResult;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
+import com.boman.common.security.service.TokenService;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 import com.boman.domain.SysDictData;
@@ -20,7 +22,8 @@ import com.boman.gen.api.RemoteGenTableColumnService;
 import com.boman.gen.api.RemoteGenTableService;
 import com.boman.jflow.api.RemoteJflowService;
 import com.boman.system.api.RemoteMenuService;
-import com.boman.system.api.domain.SysMenu;
+import com.boman.domain.SysMenu;
+import com.boman.system.api.model.LoginUser;
 import com.boman.web.core.domain.ActionType;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.domain.RowResult;
@@ -30,6 +33,8 @@ import com.boman.web.core.service.save.IBaseSaveService;
 import com.boman.web.core.service.select.IBaseSelectService;
 import com.boman.web.core.service.submit.IBaseSubmitService;
 import com.boman.web.core.service.update.IBaseUpdateService;
+import com.boman.web.core.utils.BillRuleUtils;
+import com.boman.web.core.utils.ColumnUtils;
 import com.boman.web.core.utils.IdUtils;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
@@ -40,6 +45,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.sql.Timestamp;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
@@ -109,7 +115,15 @@ public class TableServiceCmdService {
         AjaxResult result;
         // 新增
         if (ActionType.INSERT.equals(context.getActionType())) {
+            List<GenTableColumn> columns = context.getColumns();
             Long maxId = IdUtils.getMaxId(dto.getTable(), pkName);
+            ColumnUtils.packUpdateByAndTime(columns, commitData, new Timestamp(System.currentTimeMillis()), true);
+            // 处理默认值
+            handlerDefaultValue(commitData, columns);
+            // 如果有单据、按照单据编号规则
+            buildBillRule(context.getTableName(), commitData, columns);
+
+            commitData.put(context.getPkName(), maxId);
             RowResult rowResult = saveService.insertRow(context, maxId);
             if (RowResult.checkSuccess(rowResult)) {
                 LOGGER.info("保存成功，封装到数据库的数据为: {}", JSON.toJSONString(rowResult.getData()));
@@ -815,5 +829,48 @@ public class TableServiceCmdService {
         AjaxResult ajaxResult = remoteGenTableColumnService.listColumnsByTableId(table.getId());
         return ajaxResult;
     }
+
+    /**
+     * 功能描述: 新增的时候处理默认值， 从redis中拿到存在token中的userEnv对象，根据数据库中存的默认值的key，和userEnv中的key做比对，
+     * 从中取出作为字段的默认值，redis中存userEnv的位置：{@link TokenService#packUserEnv(com.boman.system.api.model.LoginUser))}
+     *
+     * @param commitData commitData
+     * @param columns 所有的列
+     */
+    private void handlerDefaultValue(JSONObject commitData, List<GenTableColumn> columns) {
+        String token = SecurityUtils.getToken();
+        LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token);
+        JSONObject userEnv = loginUser.getUserEnv();
+        for (GenTableColumn column : columns) {
+            // 有默认值的列, 并且前台传过来的key中不包含
+            if (isNotEmpty(column.getDefaultValue()) && !commitData.containsKey(column.getColumnName())) {
+                String dbDefaultValue = column.getDefaultValue();
+                String defaultValue = ColumnUtils.parseVariables(dbDefaultValue);
+                String variables = dbDefaultValue.equalsIgnoreCase(defaultValue) ? dbDefaultValue : userEnv.getString(defaultValue);
+                commitData.put(column.getColumnName(), variables);
+            }
+        }
+    }
+
+    /*
+     * 功能描述: 单据规则
+     *
+     * @param commitData commitData
+     * @param allColumns allColumns
+     * @return void
+     */
+    private void buildBillRule(String tableName, JSONObject commitData, List<GenTableColumn> allColumns) {
+        requireNonNull(tableName, "tableName is empty");
+        for (GenTableColumn column : allColumns) {
+            String columnName = column.getColumnName();
+            String seqName = column.getSeqName();
+            if (isEmpty(seqName)) {
+                continue;
+            }
+
+            String rule = BillRuleUtils.getRules(tableName, seqName, columnName);
+            commitData.put(columnName, rule);
+        }
+    }
 }
 

boman-web-core/src/main/java/com/boman/web/core/service/excel/IImportExportExcelService.java

@@ -0,0 +1,21 @@
+package com.boman.web.core.service.excel;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+
+/**
+ * @author shiqian
+ * @date 2021年06月08日 09:59
+ **/
+public interface IImportExportExcelService {
+
+    /**
+     * 功能描述: 批量导入数据
+     *
+     * @param tableName tableName
+     * @param dataList  需要保存的数据
+     * @return void
+     */
+    void importCommonData(String tableName, List<JSONObject> dataList);
+}

boman-web-core/src/main/java/com/boman/web/core/service/excel/ImportExportExcelServiceImpl.java

@@ -0,0 +1,59 @@
+package com.boman.web.core.service.excel;
+
+import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.FormDataDto;
+import com.boman.web.core.service.TableServiceCmdService;
+import com.boman.web.core.service.save.IBaseSaveService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.boman.common.core.utils.obj.ObjectUtils.*;
+
+/**
+ * @author shiqian
+ * @date 2021年06月08日 09:42
+ **/
+@Service
+public class ImportExportExcelServiceImpl implements IImportExportExcelService {
+
+    @Resource
+    private IBaseSaveService saveService;
+    @Resource
+    private TableServiceCmdService cmdService;
+
+
+    /**
+     * 功能描述: 批量导入数据
+     *
+     * @param tableName tableName
+     * @param dataList  需要保存的数据
+     * @return void
+     */
+    @Override
+    public void importCommonData(String tableName, List<JSONObject> dataList) {
+        requireNonNull(tableName, "tableName is empty");
+        requireNonNull(dataList, "dataList is empty");
+
+        List<String> result = new ArrayList<>(dataList.size());
+        FormDataDto dto = new FormDataDto();
+        dto.setTable(tableName);
+        dto.setObjId(-1L);
+        for (JSONObject data : dataList) {
+            dto.setFixedData(data);
+            AjaxResult ajaxResult = cmdService.objectSave(dto);
+            if (AjaxResult.checkSuccess(ajaxResult)) {
+                result.add("成功， data: " + data.toJSONString());
+            } else {
+                result.add("失败， data: " + data.toJSONString());
+            }
+        }
+
+        System.err.println(result);
+    }
+
+
+}

boman-web-core/src/main/java/com/boman/web/core/service/save/BaseSaveServiceImpl.java

@@ -35,8 +35,6 @@ public class BaseSaveServiceImpl implements IBaseSaveService {
 
     @Autowired
     private StandardlyMapper mapper;
-    @Autowired
-    private RedisService redisService;
 
     /**
      * 功能描述: 保存一行
@@ -47,16 +45,7 @@ public class BaseSaveServiceImpl implements IBaseSaveService {
      */
     @Override
     public RowResult insertRow(TableContext context, Long maxId) {
-        List<GenTableColumn> columns = context.getColumns();
         JSONObject commitData = context.getCommitData();
-        ColumnUtils.packUpdateByAndTime(columns, commitData, new Timestamp(System.currentTimeMillis()), true);
-        // 处理默认值
-        handlerDefaultValue(commitData, columns);
-        // 如果有单据、按照单据编号规则
-        buildBillRule(context.getTableName(), commitData, columns);
-
-        commitData.put(context.getPkName(), maxId);
-
         int ret = mapper.insert(context.getTableName(), commitData);
         if (ret > 0) {
             LOGGER.info("保存成功，保存的数据为：{}", commitData);
@@ -67,47 +56,4 @@ public class BaseSaveServiceImpl implements IBaseSaveService {
         return RowResult.error("失败");
     }
 
-    /**
-     * 功能描述: 新增的时候处理默认值， 从redis中拿到存在token中的userEnv对象，根据数据库中存的默认值的key，和userEnv中的key做比对，
-     * 从中取出作为字段的默认值，redis中存userEnv的位置：{@link TokenService#packUserEnv(com.boman.system.api.model.LoginUser)}
-     *
-     * @param commitData commitData
-     * @param columns 所有的列
-     */
-    private void handlerDefaultValue(JSONObject commitData, List<GenTableColumn> columns) {
-        String token = SecurityUtils.getToken();
-        LoginUser loginUser = redisService.getCacheObject(CacheConstants.LOGIN_TOKEN_KEY + token);
-        JSONObject userEnv = loginUser.getUserEnv();
-        for (GenTableColumn column : columns) {
-            // 有默认值的列, 并且前台传过来的key中不包含
-            if (isNotEmpty(column.getDefaultValue()) && !commitData.containsKey(column.getColumnName())) {
-                String dbDefaultValue = column.getDefaultValue();
-                String defaultValue = ColumnUtils.parseVariables(dbDefaultValue);
-                String variables = dbDefaultValue.equalsIgnoreCase(defaultValue) ? dbDefaultValue : userEnv.getString(defaultValue);
-                commitData.put(column.getColumnName(), variables);
-            }
-        }
-    }
-
-    /*
-     * 功能描述: 单据规则
-     *
-     * @param commitData commitData
-     * @param allColumns allColumns
-     * @return void
-     */
-    private void buildBillRule(String tableName, JSONObject commitData, List<GenTableColumn> allColumns) {
-        requireNonNull(tableName, "tableName is empty");
-        for (GenTableColumn column : allColumns) {
-            String columnName = column.getColumnName();
-            String seqName = column.getSeqName();
-            if (isEmpty(seqName)) {
-                continue;
-            }
-
-            String rule = BillRuleUtils.getRules(tableName, seqName, columnName);
-            commitData.put(columnName, rule);
-        }
-    }
-
 }

boman-web-core/src/main/java/com/boman/web/core/utils/AuthUtils.java

@@ -12,9 +12,9 @@ import com.boman.domain.constant.GlobalBtn;
 import com.boman.domain.exception.NoSuchFunctionException;
 import com.boman.system.api.RemoteMenuService;
 import com.boman.system.api.RemoteRoleDataService;
-import com.boman.system.api.domain.SysMenu;
-import com.boman.system.api.domain.SysRole;
-import com.boman.system.api.domain.SysUser;
+import com.boman.domain.SysMenu;
+import com.boman.domain.SysRole;
+import com.boman.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
 import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.common.ICommonService;