FormDataDto 移动到domain中， 批量导入开始

boman-web-core/src/main/java/com/boman/web/core/domain/FormDataDto.java → boman-api/boman-domain/src/main/java/com.boman.domain/dto/FormDataDto.java

@@ -1,4 +1,4 @@
-package com.boman.web.core.domain;
+package com.boman.domain.dto;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.annotation.JSONField;

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

@@ -0,0 +1,33 @@
+package com.boman.domain.dto;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.Serializable;
+
+/**
+ * @author shiqian
+ * @date 2021年06月08日 09:14
+ **/
+public class ImportExcelDto implements Serializable {
+
+
+    private MultipartFile multipartFile;
+
+    private String tableName;
+
+    public MultipartFile getMultipartFile() {
+        return multipartFile;
+    }
+
+    public void setMultipartFile(MultipartFile multipartFile) {
+        this.multipartFile = multipartFile;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName;
+    }
+}

boman-modules/boman-file/pom.xml

@@ -65,6 +65,13 @@
             <groupId>com.boman</groupId>
             <artifactId>boman-common-swagger</artifactId>
         </dependency>
+
+        <!--        远程调用 web-core-->
+        <dependency>
+            <groupId>com.boman</groupId>
+            <artifactId>boman-api-web-core</artifactId>
+            <version>2.5.0-SNAPSHOT</version>
+        </dependency>
         
     </dependencies>
 

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

@@ -0,0 +1,58 @@
+package com.boman.file.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.web.domain.AjaxResult;
+import com.boman.domain.dto.ImportExcelDto;
+import com.boman.file.service.ISysFileService;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author shiqian
+ * @date 2021年06月07日 16:24
+ **/
+@RestController
+@RequestMapping("/common/file")
+public class ExcelController {
+
+    @Resource
+    private ISysFileService fileService;
+
+    /**
+     * 功能描述:
+     *
+     * @param multipartFile multipartFile
+     * @return void
+     */
+//    @PostMapping("/import")
+//    public static AjaxResult importExcel(MultipartFile multipartFile) {
+//        File file = FileUploadUtils.multipartFile2File(multipartFile);
+//        EasyExcel.read(file, JSONObject.class, new ExcelListener<JSONObject>()).sheet().headRowNumber(1).doRead();
+//        FileUploadUtils.delete(file);
+//        return AjaxResult.success();
+//    }
+
+
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @param dto MultipartFile 和 tableName
+     * @return void
+     */
+    @PostMapping("/import")
+    public AjaxResult importExcelCommon(@RequestBody ImportExcelDto dto) {
+        MultipartFile multipartFile = dto.getMultipartFile();
+        String tableName = dto.getTableName();
+        List<JSONObject> result = fileService.importExcelCommon(multipartFile, tableName);
+        return AjaxResult.success(result);
+    }
+
+
+
+}

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

@@ -1,5 +1,6 @@
 package com.boman.file.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -9,6 +10,7 @@ import com.github.tobato.fastdfs.domain.fdfs.StorePath;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * FastDFS 文件存储
@@ -52,4 +54,16 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
     public String uploadFileBase64(String base64) throws IOException {
         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) {
+        return null;
+    }
 }

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

@@ -1,8 +1,10 @@
 package com.boman.file.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * 文件上传接口
@@ -27,4 +29,13 @@ public interface ISysFileService
      * @return java.lang.String
      */
     String uploadFileBase64(String base64) throws IOException;
+
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @param multipartFile multipartFile
+     * @param tableName     tableName
+     * @return java.util.List<com.alibaba.fastjson.JSONObject>
+     */
+    List<JSONObject> importExcelCommon(MultipartFile multipartFile, String tableName) throws Exception;
 }

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

@@ -1,13 +1,20 @@
 package com.boman.file.service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.boman.common.core.utils.SecurityUtils;
+import com.boman.common.core.utils.obj.ObjectUtils;
+import com.boman.common.core.utils.poi.ExcelUtil;
+import com.boman.file.utils.FileUploadUtils;
+import com.boman.system.api.domain.SysUser;
 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 com.boman.file.utils.FileUploadUtils;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 本地文件存储
@@ -64,4 +71,25 @@ public class LocalSysFileServiceImpl implements ISysFileService
         String name = FileUploadUtils.upload(localFilePath, multipartFile);
         return domain + localFilePrefix + name;
     }
+
+    /**
+     * 功能描述: 通用的导入接口
+     *
+     * @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 {
+        Objects.requireNonNull(multipartFile, "multipartFile is empty");
+        ObjectUtils.requireNonNull(tableName, "tableName is empty");
+
+        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);
+
+
+        return null;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.boman.file.service;
 
+import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -9,6 +10,7 @@ import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Minio 文件存储
@@ -55,4 +57,16 @@ public class MinioSysFileServiceImpl implements ISysFileService
     public String uploadFileBase64(String base64) throws IOException {
         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) {
+        return null;
+    }
 }

boman-modules/boman-file/src/main/java/com/boman/file/utils/FileUploadUtils.java

@@ -8,7 +8,6 @@ import com.boman.common.core.exception.file.FileNameLengthLimitExceededException
 import com.boman.common.core.exception.file.FileSizeLimitExceededException;
 import com.boman.common.core.exception.file.InvalidExtensionException;
 import com.boman.common.core.utils.DateUtils;
-import com.boman.common.core.utils.IdUtils;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.file.MimeTypeUtils;
 import sun.misc.BASE64Decoder;
@@ -218,4 +217,43 @@ public class FileUploadUtils
         }
     }
 
+    /**
+     * 功能描述: multipartFile转换成file
+     *
+     * @param multipartFile multipartFile
+     * @return java.io.File
+     */
+    public static File multipartFile2File(MultipartFile multipartFile) {
+        File file = new File("TEMP_FILE_PATH" + multipartFile.getOriginalFilename());
+        transferTo(multipartFile, file);
+        return file;
+    }
+
+    /**
+     * 以流的形式存到服务器
+     *
+     * @param multipartFile multipartFile
+     * @param newFile       newFile
+     */
+    private static void transferTo(MultipartFile multipartFile, File newFile) {
+        try {
+            if (!newFile.getParentFile().exists()) {
+                newFile.getParentFile().mkdirs();
+            }
+            multipartFile.transferTo(newFile);
+        } catch (Exception ignored) {
+        }
+    }
+
+    /**
+     * 功能描述: 删除临时文件
+     *
+     * @param file file
+     */
+    public static void delete(File file) {
+        if (file != null) {
+            file.delete();
+        }
+    }
+
 }

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

@@ -1,12 +1,8 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.attendance.AttendanceService;
-import com.boman.web.core.service.common.ICommonService;
-import org.gavaghan.geodesy.GlobalCoordinates;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

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

@@ -1,7 +1,7 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.common.ICommonService;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -1,7 +1,7 @@
 package com.boman.web.core.controller;
 
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.TableServiceCmdService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,6 +7,7 @@ import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 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;

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

@@ -22,7 +22,7 @@ import com.boman.jflow.api.RemoteJflowService;
 import com.boman.system.api.RemoteMenuService;
 import com.boman.system.api.domain.SysMenu;
 import com.boman.web.core.domain.ActionType;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.domain.RowResult;
 import com.boman.web.core.domain.TableContext;
 import com.boman.web.core.service.delete.IBaseDeleteService;
@@ -36,12 +36,10 @@ import com.google.common.collect.Lists;
 import org.apache.commons.lang3.BooleanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.annotation.Async;
 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;

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceService.java

@@ -2,8 +2,7 @@ package com.boman.web.core.service.attendance;
 
 import com.alibaba.fastjson.JSONObject;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.FormDataDto;
-import org.gavaghan.geodesy.GlobalCoordinates;
+import com.boman.domain.dto.FormDataDto;
 
 import java.util.List;
 

boman-web-core/src/main/java/com/boman/web/core/service/attendance/AttendanceServiceImpl.java

@@ -1,15 +1,11 @@
 package com.boman.web.core.service.attendance;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.common.core.constant.Constants;
 import com.boman.common.core.utils.DateUtils;
-import com.boman.common.core.utils.StringUtils;
 import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.core.web.domain.AjaxResult;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.common.ICommonService;
-import org.aspectj.weaver.loadtime.Aj;
-import org.gavaghan.geodesy.GlobalCoordinates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -19,7 +15,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.locks.Condition;
 
 import static com.boman.common.core.utils.obj.ObjectUtils.ifNullSetEmpty;
 import static com.boman.common.core.utils.obj.ObjectUtils.requireNonNull;

boman-web-core/src/main/java/com/boman/web/core/service/common/CommonServiceImpl.java

@@ -4,10 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.boman.common.redis.RedisKey;
 import com.boman.common.redis.service.RedisService;
 import com.boman.domain.GenTable;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.service.select.IBaseSelectService;
-import com.boman.web.core.utils.ColumnUtils;
 import com.boman.web.core.utils.IdUtils;
 import org.springframework.stereotype.Service;
 

boman-web-core/src/main/java/com/boman/web/core/service/common/ICommonService.java

@@ -1,7 +1,7 @@
 package com.boman.web.core.service.common;
 
 import com.alibaba.fastjson.JSONObject;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 
 import java.util.List;
 

boman-web-core/src/main/java/com/boman/web/core/service/select/BaseSelectServiceImpl.java

@@ -6,7 +6,7 @@ import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.common.redis.RedisKey;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.mapper.StandardlyMapper;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.utils.ColumnUtils;

boman-web-core/src/main/java/com/boman/web/core/service/select/IBaseSelectService.java

@@ -3,7 +3,7 @@ package com.boman.web.core.service.select;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.GenTableColumn;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 
 import java.util.List;
 

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

@@ -16,7 +16,7 @@ import com.boman.system.api.domain.SysMenu;
 import com.boman.system.api.domain.SysRole;
 import com.boman.system.api.domain.SysUser;
 import com.boman.system.api.model.LoginUser;
-import com.boman.web.core.domain.FormDataDto;
+import com.boman.domain.dto.FormDataDto;
 import com.boman.web.core.service.common.ICommonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;