Commit 5c4d0db5 by zhoujinghao

导入相关代码优化

1 parent 21ee013b
...@@ -25,9 +25,8 @@ public class ImportExcelController { ...@@ -25,9 +25,8 @@ public class ImportExcelController {
@ApiOperation( value = "中心端批量导入Excel",notes = "中心端批量导入Excel") @ApiOperation( value = "中心端批量导入Excel",notes = "中心端批量导入Excel")
@PostMapping("/batchImportExcel") @PostMapping("/batchImportExcel")
@ResponseBody @ResponseBody
public ApiResponse batchImportExcel(MultipartFile file) throws Exception{ public ApiResponse batchImportExcel(MultipartFile file){
List<ImportExcelDto> list = EasyExcel.read(file.getInputStream()).sheet(0).head(ImportExcelDto.class).doReadSync(); ApiResponse result = iImportExcelService.batchImportExcel(file);
ApiResponse result = iImportExcelService.batchImportExcel(list);
return result; return result;
} }
} }
...@@ -25,5 +25,5 @@ public interface ImportExcelMapper extends BaseMapper<CenterUserPO> { ...@@ -25,5 +25,5 @@ public interface ImportExcelMapper extends BaseMapper<CenterUserPO> {
* @version: * @version:
* @remark: * @remark:
*/ */
int insertExcelData(List<ImportExcelDto> list); int insertExcelData(ImportExcelDto data);
} }
...@@ -2,6 +2,7 @@ package org.nafmii.admin.user.service; ...@@ -2,6 +2,7 @@ package org.nafmii.admin.user.service;
import org.nafmii.admin.user.dto.ImportExcelDto; 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 java.util.List; import java.util.List;
...@@ -22,6 +23,6 @@ public interface IImportExcelService { ...@@ -22,6 +23,6 @@ public interface IImportExcelService {
* @version: * @version:
* @remark: * @remark:
*/ */
ApiResponse batchImportExcel(List<ImportExcelDto> list); ApiResponse batchImportExcel(MultipartFile file);
} }
package org.nafmii.admin.user.service.impl; package org.nafmii.admin.user.service.impl;
import com.alibaba.excel.EasyExcel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nafmii.admin.user.dao.ImportExcelMapper; import org.nafmii.admin.user.dao.ImportExcelMapper;
import org.nafmii.admin.user.dto.ImportExcelDto; import org.nafmii.admin.user.dto.ImportExcelDto;
...@@ -18,7 +19,9 @@ import org.nafmii.admin.user.service.IImportExcelService; ...@@ -18,7 +19,9 @@ import org.nafmii.admin.user.service.IImportExcelService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -42,14 +45,26 @@ public class ImportExcelServiceImpl implements IImportExcelService { ...@@ -42,14 +45,26 @@ public class ImportExcelServiceImpl implements IImportExcelService {
private ImportExcelMapper importExcelMapper; private ImportExcelMapper importExcelMapper;
@Override @Override
public ApiResponse batchImportExcel(List<ImportExcelDto> list) { public ApiResponse batchImportExcel(MultipartFile file) {
int i = importExcelMapper.insertExcelData(list); List<ImportExcelDto> list = null;
try {
list = EasyExcel.read(file.getInputStream()).sheet(0).head(ImportExcelDto.class).doReadSync();
} catch (IOException e) {
e.printStackTrace();
}
log.info("导入后生成的数据源=============>"+list);
if (!list.isEmpty()) {
for (ImportExcelDto data : list) {
int i = importExcelMapper.insertExcelData(data);
if (i < 0) { if (i < 0) {
return new ApiResponse(ApiResponse.FAIL, ApiResponse.FAIL_TEXT); return new ApiResponse(ApiResponse.FAIL, ApiResponse.FAIL_TEXT);
} else { } else {
return new ApiResponse(ApiResponse.SUCCESS, ApiResponse.SUCCESS_TEXT); return new ApiResponse(ApiResponse.SUCCESS, ApiResponse.SUCCESS_TEXT);
} }
} }
}
return new ApiResponse(ApiResponse.FAIL, "导入时数据为空,导入失败");
}
public String importExcel(InputStream inputStream, String fileName) throws Exception { public String importExcel(InputStream inputStream, String fileName) throws Exception {
......
...@@ -10,15 +10,12 @@ ...@@ -10,15 +10,12 @@
<result column="COLUMN3" property="column3" /> <result column="COLUMN3" property="column3" />
</resultMap> </resultMap>
<insert id ="insertExcelData" parameterType="java.util.List" > <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 values(#{ImportExcelPO.column1},
<foreach collection ="list" item="ImportExcelPO" index= "index" separator =","> #{ImportExcelPO.column2},
( #{ImportExcelPO.column3})
#{ImportExcelPO.column1}, #{ImportExcelPO.column2},#{ImportExcelPO.column3}
)
</foreach >
</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!