diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java index b9704312d..1bea21731 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/async/PartyTask.java @@ -1,34 +1,54 @@ package com.elink.esua.epdc.async; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; +import com.alibaba.fastjson.JSON; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.config.StreamUtils; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; +import com.elink.esua.epdc.excel.PartyMembersExcel; import com.elink.esua.epdc.service.PartyMembersService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import java.io.File; import java.util.List; /** - * @author: qushutong - * @Date: 2019/10/24 16:00 - * @Description: 党员导入异步 + * @author: qushutong + * @Date: 2019/10/24 16:00 + * @Description: 党员导入异步 */ @Component public class PartyTask { + @Autowired private PartyMembersService partyMembersService; /*** * 批量插入党员 - * @param list + * @param file * @return void * @author qushutong * @date 2019/10/24 16:02 */ @Async - public void insertPartyList(List< PartyMembersDTO > list){ - partyMembersService.saveList(list); + public void insertPartyList(MultipartFile file) { + File f = StreamUtils.conversionFile(file); + ImportParams importParams = new ImportParams(); + try { + List partyList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams); + partyMembersService.saveList(partyList); + for (PartyMembersExcel partyMembers : partyList) { + System.out.println("从Excel导入数据到数据库的详细为 :{}" + JSON.toJSONString(partyMembers)); + } + System.out.println("从Excel导入数据一共 {} 行 " + partyList.size()); + } catch (Exception e1) { + throw new RuntimeException("导入失败:{}" + e1.getMessage()); + } } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java index e96ad4061..cf39c417b 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/PartyMembersController.java @@ -139,28 +139,8 @@ public class PartyMembersController { * @date 2019/10/24 14:55 */ @PostMapping("importExcel") - public String importExcel(@RequestParam("file") MultipartFile file) { - File f = StreamUtils.conversionFile(file); - - ImportParams importParams = new ImportParams(); - // 数据处理 - importParams.setHeadRows(1); - importParams.setTitleRows(0); - - try { - List partyList = ExcelImportUtil.importExcel(f, PartyMembersExcel.class, importParams); - if (false) { - partyTask.insertPartyList(new ArrayList<>()); - } - - for (PartyMembersExcel partyMembers : partyList) { - System.out.println("从Excel导入数据到数据库的详细为 :{}" + JSON.toJSONString(partyMembers)); - //TODO 将导入的数据做保存数据库操作 - } - System.out.println("从Excel导入数据一共 {} 行 " + partyList.size()); - } catch (Exception e1) { - throw new RuntimeException("导入失败:{}" + e1.getMessage()); - } - return "导入成功"; + public Result importExcel(@RequestParam("file") MultipartFile file) { + partyTask.insertPartyList(file); + return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java index a803b1d18..a3e9bea34 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; +import com.elink.esua.epdc.excel.PartyMembersExcel; import java.util.List; import java.util.Map; @@ -50,10 +51,10 @@ public interface PartyMembersService extends BaseService { /*** * 批量插入 - * @param list + * @param partyList * @return void * @author qushutong * @date 2019/10/24 14:58 */ - void saveList(List list); + void saveList(List partyList); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java index da5e03ddc..9280c9d27 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java @@ -33,6 +33,7 @@ import com.elink.esua.epdc.dao.PartyMembersDao; import com.elink.esua.epdc.dto.PartyMembersDTO; import com.elink.esua.epdc.dto.PartyTagRelationDTO; import com.elink.esua.epdc.entity.PartyMembersEntity; +import com.elink.esua.epdc.excel.PartyMembersExcel; import com.elink.esua.epdc.redis.PartyMembersRedis; import com.elink.esua.epdc.service.PartyMembersService; import com.elink.esua.epdc.service.PartyTagRelationService; @@ -152,8 +153,8 @@ public class PartyMembersServiceImpl extends BaseServiceImpl list) { - List partyMembersEntityList = ConvertUtils.sourceToTarget(list, PartyMembersEntity.class); + public void saveList(List partyList) { + List partyMembersEntityList = ConvertUtils.sourceToTarget(partyList, PartyMembersEntity.class); insertBatch(partyMembersEntityList); }