导入EXCEL添加读取合并单元格功能

nafmii-admin/src/main/java/org/nafmii/admin/user/controller/ImportExcelController.java

 package org.nafmii.admin.user.controller;
 
-import com.alibaba.excel.EasyExcel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.nafmii.admin.user.dto.ImportExcelDto;
 import org.nafmii.admin.user.service.IImportExcelService;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -13,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.io.IOException;
 
 @RestController
 @RequestMapping("/nafmii/admin/import")
@@ -25,7 +23,7 @@ public class ImportExcelController {
     @ApiOperation( value = "中心端批量导入Excel",notes = "中心端批量导入Excel")
     @PostMapping("/batchImportExcel")
     @ResponseBody
-    public ApiResponse batchImportExcel(MultipartFile file){
+    public ApiResponse batchImportExcel(MultipartFile file) throws IOException {
         ApiResponse result = iImportExcelService.batchImportExcel(file);
         return result;
     }

nafmii-admin/src/main/java/org/nafmii/admin/user/dao/ImportExcelMapper.java

@@ -2,10 +2,8 @@ package org.nafmii.admin.user.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.nafmii.admin.user.dto.ImportExcelDto;
-import org.nafmii.admin.user.entity.CenterUserPO;
-
-import java.util.List;
 
 /**
  * <p>
@@ -16,14 +14,14 @@ import java.util.List;
  * @since 2021-04-27
  */
 @Mapper
-public interface ImportExcelMapper extends BaseMapper<CenterUserPO> {
+public interface ImportExcelMapper extends BaseMapper<ImportExcelDto> {
     /**
      * @author:suncq
-     * @Function:中心端用户登陆
-     * @date 2021/4/27
+     * @Function:批量导入EXCEL数据
+     * @date 2021/5/6
      * @ClassName:
      * @version:
      * @remark:
      */
-    int insertExcelData(ImportExcelDto data);
+    int insertExcelData(@Param("data") ImportExcelDto data);
 }

nafmii-admin/src/main/java/org/nafmii/admin/user/service/IImportExcelService.java

 package org.nafmii.admin.user.service;
 
-import org.nafmii.admin.user.dto.ImportExcelDto;
 import org.nafmii.common.response.ApiResponse;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
+import java.io.IOException;
 
 /**
  * <p>
- * 中心端-用户表 服务类
+ * 中心端批量导入Excel
  * </p>
  *
  * @author suncq
@@ -17,12 +16,12 @@ import java.util.List;
 public interface IImportExcelService {
     /**
      * @author:suncq
-     * @Function:中心端用户登陆
+     * @Function:中心端批量导入Excel
      * @date 2021/4/27
      * @ClassName:
      * @version:
      * @remark:
      */
-    ApiResponse batchImportExcel(MultipartFile file);
+    ApiResponse batchImportExcel(MultipartFile file) throws IOException;
 
 }

nafmii-admin/src/main/resources/mapper/ImportExcelMapper.xml

@@ -3,8 +3,7 @@
 <mapper namespace="org.nafmii.admin.user.dao.ImportExcelMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.ImportExcelPO">
-        <id column="ID" property="id" />
+    <resultMap id="BaseResultMap" type="org.nafmii.admin.user.dto.ImportExcelDto">
         <result column="COLUMN1" property="column1" />
         <result column="COLUMN2" property="column2" />
         <result column="COLUMN3" property="column3" />
@@ -13,9 +12,9 @@
     <insert id ="insertExcelData" parameterType="org.nafmii.admin.user.dto.ImportExcelDto" >
         insert into IMPORT_EXCEL_TEST
         (COLUMN1,COLUMN2,COLUMN3)
-        values(#{ImportExcelPO.column1},
-        #{ImportExcelPO.column2},
-        #{ImportExcelPO.column3})
+        values(#{data.column1},
+        #{data.column2},
+        #{data.column3})
     </insert >
 
 </mapper>