Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit a5f04db9 by 孙长庆
Options

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

1 parent 5c4d0db5
Expand all
Inline Side-by-side
Showing 5 changed files with 15 additions and 21 deletions
nafmii-admin/src/main/java/org/nafmii/admin/user/controller/ImportExcelController.java
package org.nafmii.admin.user.controller; package org.nafmii.admin.user.controller;
import com.alibaba.excel.EasyExcel;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.admin.user.dto.ImportExcelDto;
import org.nafmii.admin.user.service.IImportExcelService; import org.nafmii.admin.user.service.IImportExcelService;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
...@@ -13,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -13,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.io.IOException;
@RestController @RestController
@RequestMapping("/nafmii/admin/import") @RequestMapping("/nafmii/admin/import")
...@@ -25,7 +23,7 @@ public class ImportExcelController { ...@@ -25,7 +23,7 @@ public class ImportExcelController {
@ApiOperation( value = "中心端批量导入Excel",notes = "中心端批量导入Excel") @ApiOperation( value = "中心端批量导入Excel",notes = "中心端批量导入Excel")
@PostMapping("/batchImportExcel") @PostMapping("/batchImportExcel")
@ResponseBody @ResponseBody
public ApiResponse batchImportExcel(MultipartFile file){ public ApiResponse batchImportExcel(MultipartFile file) throws IOException {
ApiResponse result = iImportExcelService.batchImportExcel(file); ApiResponse result = iImportExcelService.batchImportExcel(file);
return result; return result;
} }
......
nafmii-admin/src/main/java/org/nafmii/admin/user/dao/ImportExcelMapper.java
...@@ -2,10 +2,8 @@ package org.nafmii.admin.user.dao; ...@@ -2,10 +2,8 @@ package org.nafmii.admin.user.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.admin.user.dto.ImportExcelDto; import org.nafmii.admin.user.dto.ImportExcelDto;
import org.nafmii.admin.user.entity.CenterUserPO;
import java.util.List;
/** /**
* <p> * <p>
...@@ -16,14 +14,14 @@ import java.util.List; ...@@ -16,14 +14,14 @@ import java.util.List;
* @since 2021-04-27 * @since 2021-04-27
*/ */
@Mapper @Mapper
public interface ImportExcelMapper extends BaseMapper<CenterUserPO> { public interface ImportExcelMapper extends BaseMapper<ImportExcelDto> {
/** /**
* @author:suncq * @author:suncq
* @Function:中心端用户登陆 * @Function:批量导入EXCEL数据
* @date 2021/4/27 * @date 2021/5/6
* @ClassName: * @ClassName:
* @version: * @version:
* @remark: * @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; package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.ImportExcelDto;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.io.IOException;
/** /**
* <p> * <p>
* 中心端-用户表 服务类 * 中心端批量导入Excel
* </p> * </p>
* *
* @author suncq * @author suncq
...@@ -17,12 +16,12 @@ import java.util.List; ...@@ -17,12 +16,12 @@ import java.util.List;
public interface IImportExcelService { public interface IImportExcelService {
/** /**
* @author:suncq * @author:suncq
* @Function:中心端用户登陆 * @Function:中心端批量导入Excel
* @date 2021/4/27 * @date 2021/4/27
* @ClassName: * @ClassName:
* @version: * @version:
* @remark: * @remark:
*/ */
ApiResponse batchImportExcel(MultipartFile file); ApiResponse batchImportExcel(MultipartFile file) throws IOException;
} }
nafmii-admin/src/main/resources/mapper/ImportExcelMapper.xml
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
<mapper namespace="org.nafmii.admin.user.dao.ImportExcelMapper"> <mapper namespace="org.nafmii.admin.user.dao.ImportExcelMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="org.nafmii.admin.user.entity.ImportExcelPO"> <resultMap id="BaseResultMap" type="org.nafmii.admin.user.dto.ImportExcelDto">
<id column="ID" property="id" />
<result column="COLUMN1" property="column1" /> <result column="COLUMN1" property="column1" />
<result column="COLUMN2" property="column2" /> <result column="COLUMN2" property="column2" />
<result column="COLUMN3" property="column3" /> <result column="COLUMN3" property="column3" />
...@@ -13,9 +12,9 @@ ...@@ -13,9 +12,9 @@
<insert id ="insertExcelData" parameterType="org.nafmii.admin.user.dto.ImportExcelDto" > <insert id ="insertExcelData" parameterType="org.nafmii.admin.user.dto.ImportExcelDto" >
insert into IMPORT_EXCEL_TEST insert into IMPORT_EXCEL_TEST
(COLUMN1,COLUMN2,COLUMN3) (COLUMN1,COLUMN2,COLUMN3)
values(#{ImportExcelPO.column1}, values(#{data.column1},
#{ImportExcelPO.column2}, #{data.column2},
#{ImportExcelPO.column3}) #{data.column3})
</insert > </insert >
</mapper> </mapper>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!