diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java index 0aea7c9e9..2d4e90fec 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectRelatedPersonnelController.java @@ -2,11 +2,9 @@ package com.jero.modules.project.controller; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.jero.modules.project.util.ExcelLangUtils; import com.jero.modules.system.entity.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -15,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -140,18 +137,13 @@ public class ProjectRelatedPersonnelController extends JeroController records = projectRelatedPersonnelService.disposeExportXls(id, projectId); - if (cut.equals(CutEnum.CN.getValue())) { - return projectRelatedPersonnelService.exportDataToXls(request, records, ProjectRelatedPersonnel.class, "相关人员名单", cut); - }else{ - return projectRelatedPersonnelService.exportDataToXls(request, records, ProjectRelatedPersonnel.class, "List of relevant personnel", cut); - } - + List records = projectRelatedPersonnelService.disposeExportXls(id, projectId,cut); + projectRelatedPersonnelService.exportDataToXls(cut,response,request,records); } /** @@ -160,14 +152,8 @@ public class ProjectRelatedPersonnelController extends JeroController queryPersonByProjectId(String projectId, String dutyTerritory); /**处理导出数据*/ - List disposeExportXls(String id,String projectId); + List disposeExportXls(String id,String projectId,String cut); /**导出excel*/ - ModelAndView exportDataToXls(HttpServletRequest request, List dataList, Class clazz, String title,String cut); + void exportDataToXls(String cut, HttpServletResponse response, HttpServletRequest request, List dataList); /**设置导出模板*/ - ModelAndView setExporTemplate(HttpServletRequest request, Class clazz, String title,String cut); + void exportTemplate(ProjectRelatedPersonnel projectRelatedPersonnel, HttpServletResponse response, HttpServletRequest request); Result importExcel(HttpServletRequest request, HttpServletResponse response, Class clazz, String projectId,String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 99c553c6e..82d0bfe0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -1,5 +1,7 @@ package com.jero.modules.project.service.impl; +import cn.afterturn.easypoi.excel.ExcelImportUtil; +import cn.afterturn.easypoi.excel.entity.ImportParams; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,7 +13,7 @@ import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; -import com.jero.modules.project.util.ExcelLangUtils; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysDictMapper; @@ -20,21 +22,28 @@ import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.poi.hssf.usermodel.HSSFCellStyle; +import org.apache.poi.hssf.usermodel.HSSFRichTextString; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.VerticalAlignment; +import org.apache.poi.ss.util.CellRangeAddress; import org.apache.shiro.SecurityUtils; -import org.jeecgframework.poi.excel.ExcelImportUtil; -import org.jeecgframework.poi.excel.def.NormalExcelConstants; -import org.jeecgframework.poi.excel.entity.ExportParams; -import org.jeecgframework.poi.excel.entity.ImportParams; -import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; -import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; +import java.io.OutputStream; import java.util.*; import java.util.stream.Collectors; @@ -62,6 +71,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl queryPageList(String projectId) { //查询数据 List result = projectRelatedPersonnelMapper.queryPageList(projectId); + //查标签内容里的责任领域数据 + List sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); //没有数据->新增所有责任领域,查询 - if(CollectionUtils.isEmpty(result)){ - //查标签内容里的责任领域数据 - List sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); + if(result.size() disposeExportXls(String id,String projectId){ + public List disposeExportXls(String id,String projectId,String cut){ List records=null; if(StringUtils.isNotBlank(id)) {//多个id @@ -392,9 +406,10 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl idList = Arrays.asList(id.split(",")); - for (String midId : idList) { - records = queryById(midId); - } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("id",idList); + records = list(queryWrapper); + } else {//1个id records = queryById(id); } @@ -402,85 +417,224 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records,String cut) { + //查标签内容里的责任领域数据 + List sysDictItemValueList = sysDictItemMapper.selectItemsByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); + if (CollectionUtils.isNotEmpty(records)) { + List dutyTerritory = new ArrayList<>(); + for (ProjectRelatedPersonnel projectRelatedPersonnel : records) { + if (CutEnum.CN.getValue().equals(cut)) { + dutyTerritory = sysDictItemValueList.stream().filter(f -> f.getItemValue().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getItemText()).collect(Collectors.toList()); + } else { + dutyTerritory = sysDictItemValueList.stream().filter(f -> f.getItemValue().equals(projectRelatedPersonnel.getDutyTerritory())).map(e -> e.getEnName()).collect(Collectors.toList()); + } + projectRelatedPersonnel.setDutyTerritory(dutyTerritory.get(0)); + } + } + } /** * 根据查到的数据,导出excel * * @param request - */@Override - public ModelAndView exportDataToXls(HttpServletRequest request, List dataList, - Class clazz, String title,String cut) { - // Step.1 组装查询条件 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - // Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - ExportParams exportParams=null; + */ + @Override + public void exportDataToXls(String cut, HttpServletResponse response, HttpServletRequest request, List dataList) { + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String fileOriName = "法规清单导入模板.xls"; + String filePath = uploadpath + File.separator + fileOriName; try { - //中英切换 - if(CutEnum.CN.getValue().equals(cut)) { - exportParams=new ExportParams(title , null, title); - mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.CN.getValue())); - } - else { - exportParams=new ExportParams(title , null, title); - mv.addObject(NormalExcelConstants.CLASS, ExcelLangUtils.chooseLang(clazz, CutEnum.EN.getValue())); + String titleOne = ""; + if(CutEnum.CN.getValue().equals(cut)){ + titleOne = "*责任领域,*法规工程师,*工程接口人,*认证工程师,备注"; + }else{ + titleOne = "*Responsible Field,*Regulation Engineer,*Engineering Interface,*Homologation Engineer,Comments"; } - mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 + //创建临时文件夹 + File nowFile = new File(filePath); + if (nowFile.exists()) { + nowFile.delete(); + } + nowFile.mkdirs(); + HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板"); + sheet.setDefaultColumnWidth(16);//列宽 + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setWrapText(true);//自动换行 + cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 + HSSFCellStyle cellStyleTemp = workbook.createCellStyle(); + cellStyleTemp.setWrapText(true);//自动换行 - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, dataList); - return mv; - }catch(Exception e){ - throw new JeroBootException("出现异常,请重新登录"); + int startLine = 0; + int endLine = 4; + //合并单元格 + CellRangeAddress region1 = + new CellRangeAddress(1, 1, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 + sheet.addMergedRegion(region1); + + String explainInfo= null; + + if(CutEnum.CN.getValue().equals(cut)){ + explainInfo = "填写说明\n" + + "1.导入数据从第四行开始\n" + + "2.所有带*号的字段必须填写\n"+ + "3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" + + "4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" + + "5.编号,子标题,WVTA ID,备注,填写文本内容\n" + + "6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx"; + }else{ + explainInfo = "filling explanation\n" + + "1.import data starts at the fourth line\n" + + "2.all fields marked with * must be filled in\n"+ + "3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" + + "4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" + + "5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" + + "6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx"; + } + HSSFRichTextString explain=new HSSFRichTextString(explainInfo); + + //表头 + Row row = sheet.createRow(0);//开始创建标题行 + String[] headerArr = titleOne.split(","); + for (int m = 0; m < headerArr.length; m++) { + row.createCell(m).setCellValue(headerArr[m]); + } + + Row rowExplain = sheet.createRow(1); + short height = (short) (7 * 252); + rowExplain.setHeight((short) height); + Cell cell = rowExplain.createCell(0); + cell.setCellValue(explain); + cell.setCellStyle(cellStyleTemp); + + //设置导出数据 + if(CollectionUtils.isNotEmpty(dataList)) { + for (int j = 2; j < dataList.size()+2; j++) { + Row dataRow = sheet.createRow(j); + dataRow.createCell(0).setCellValue(dataList.get(j - 2).getDutyTerritory()); + dataRow.createCell(1).setCellValue(dataList.get(j - 2).getLawEngineerName()); + dataRow.createCell(2).setCellValue(dataList.get(j - 2).getEngineeringInterfacePersonName()); + dataRow.createCell(3).setCellValue(dataList.get(j - 2).getCertificationEngineerName()); + dataRow.createCell(4).setCellValue(dataList.get(j - 2).getRemark()); + + } + } + response.setHeader("Content-Disposition", + "attachment; filename=\"" + fileOriName + ".xls"); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + } catch (Exception e) { + e.printStackTrace(); + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); } } + /** * 导出excel模板 * */ @Override - public ModelAndView setExporTemplate(HttpServletRequest request, Class clazz, String title,String cut){ - List records=new ArrayList<>(); -// ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); - // Step.1 组装查询条件 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - ExportParams exportParams=null; - // Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + public void exportTemplate(ProjectRelatedPersonnel projectRelatedPersonnel, HttpServletResponse response, HttpServletRequest request) { + OutputStream os = null; + HSSFWorkbook workbook = new HSSFWorkbook(); + String fileOriName = "法规清单导入模板.xls"; + String filePath = uploadpath + File.separator + fileOriName; try { - //中英切换模板 - if(CutEnum.CN.getValue().equals(cut)) { - //projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getName()); - exportParams=new ExportParams(title , null, title); + String titleOne = ""; + if(CutEnum.CN.getValue().equals(projectRelatedPersonnel.getCut())){ + titleOne = "*责任领域,*法规工程师,*工程接口人,*认证工程师,备注"; }else{ - //projectRelatedPersonnel.setDutyTerritory(ExportTemplateEnum.DUTY_TERRITORY_FIELD_of_PRODUCTION.getValue()); - exportParams=new ExportParams(title , null, title); + titleOne = "*Responsible Field,*Regulation Engineer,*Engineering Interface,*Homologation Engineer,Comments"; } - //查标签内容里的责任领域数据 - List dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue()); - //新建相关人员表里的责任领域数据 - if (CollectionUtils.isNotEmpty(dictItemNameList)) { - for (String dictItemName : dictItemNameList) { - ProjectRelatedPersonnel projectRelatedPersonnel=new ProjectRelatedPersonnel(); - projectRelatedPersonnel.setDutyTerritory(dictItemName); - records.add(projectRelatedPersonnel); - } + + //创建临时文件夹 + File nowFile = new File(filePath); + if (nowFile.exists()) { + nowFile.delete(); } - mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下 - mv.addObject(NormalExcelConstants.CLASS, clazz);//!!!!这里设置中英切换 - mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST,records); - return mv; - }catch(Exception e){ - throw new JeroBootException("出现异常,请重新登录"); + nowFile.mkdirs(); + HSSFSheet sheet = workbook.createSheet("虚拟清单导入模板"); + sheet.setDefaultColumnWidth(16);//列宽 + HSSFCellStyle cellStyle = workbook.createCellStyle(); + cellStyle.setWrapText(true);//自动换行 + cellStyle.setAlignment(HorizontalAlignment.CENTER);//垂直居中 + cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);//水平居中 + + HSSFCellStyle cellStyleTemp = workbook.createCellStyle(); + cellStyleTemp.setWrapText(true);//自动换行 + + int startLine = 0; + int endLine = 4; + //合并单元格 + CellRangeAddress region1 = + new CellRangeAddress(1, 1, startLine, endLine); //参数1：起始行 参数2：终止行 参数3：起始列 参数4：终止列 + sheet.addMergedRegion(region1); + + String explainInfo= null; + + if(CutEnum.CN.getValue().equals(projectRelatedPersonnel.getCut())){ + explainInfo = "填写说明\n" + + "1.导入数据从第四行开始\n" + + "2.所有带*号的字段必须填写\n"+ + "3.认证类型,认证级别,实施类别,交付物类型,发起人,责任人,字段是单选属性,必须和系统中的对应字段选项相匹配\n" + + "4.责任领域,字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n" + + "5.编号,子标题,WVTA ID,备注,填写文本内容\n" + + "6.交付物模板字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.docx,则应填写AAA/B.docx"; + }else{ + explainInfo = "filling explanation\n" + + "1.import data starts at the fourth line\n" + + "2.all fields marked with * must be filled in\n"+ + "3.certification type,certification level,implementation category,type of deliverables,initiator,person liable,Fields are radio attributes that must match the corresponding field option in the system\n" + + "4.area of responsibility, field is a multi-select attribute and must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n" + + "5.serial number,subtitle,WVTA ID,remarks,Fill in the text\n" + + "6.deliverable template,When filling in the field, you need to create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. If b. diocx is stored under the AAA standard number, enter AAA/B. diocx"; + } + HSSFRichTextString explain=new HSSFRichTextString(explainInfo); + + //表头 + Row row = sheet.createRow(0);//开始创建标题行 + String[] headerArr = titleOne.split(","); + for (int m = 0; m < headerArr.length; m++) { + row.createCell(m).setCellValue(headerArr[m]); + } + + Row rowExplain = sheet.createRow(1); + short height = (short) (7 * 252); + rowExplain.setHeight((short) height); + Cell cell = rowExplain.createCell(0); + cell.setCellValue(explain); + cell.setCellStyle(cellStyleTemp); + + response.setHeader("Content-Disposition", + "attachment; filename=\"" + fileOriName + ".xls"); + response.setContentType("application/force-download"); + response.flushBuffer(); + os = response.getOutputStream(); + workbook.write(os); + } catch (Exception e) { + e.printStackTrace(); + throw new JeroBootException("下载文件失败，请重试"); + } finally { + IOUtils.closeQuietly(os); } + } + + + + /** * 导入excel数据 * @@ -543,7 +697,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl dictItemNameList = sysDictMapper.queryDictNameByCode(DictCodeEnum.DUTY_TERRITORY.getValue()); List sysDictItemValueList = sysDictItemMapper.selectItemValueByDictCode(DictCodeEnum.DUTY_TERRITORY.getValue()); if(!sysDictItemValueList.contains(projectRelatedPersonnel.getDutyTerritory())){ if (CutEnum.CN.getValue().equals(cut)) { @@ -628,7 +781,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl engineeringInterfacePersonUsers = new ArrayList<>(); + List engineeringInterfacePersonUsers = new ArrayList<>(); if (StringUtils.isNotBlank(projectRelatedPersonnel.getEngineeringInterfacePersonName())){ List engineeringInterfacePersonNameList = Arrays.asList(projectRelatedPersonnel.getEngineeringInterfacePersonName().split(",")); if (CollectionUtils.isNotEmpty(engineeringInterfacePersonNameList) && StringUtils.isNotBlank(engineeringInterfacePersonNameList.get(0))) { @@ -788,4 +941,6 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl