diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java index f2384130..372afbf8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esinspectplan/service/impl/ProcessEsInspectPlanServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.BeanCopyUtils; import com.jero.common.util.ImportExcelUtil; +import com.jero.common.util.IntekeyUtils; import com.jero.modules.activiti.process.esinspectplan.common.EsInspectPlanCommon; import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlan; import com.jero.modules.activiti.process.esinspectplan.entity.ProcessEsInspectPlanOpinion; @@ -215,7 +216,8 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { // 获取上传文件对象 - MultipartFile file = entity.getValue(); + // 解密excel + MultipartFile file = IntekeyUtils.autoDecryptFile(entity.getValue()); ImportParams params = new ImportParams(); params.setNeedSave(true); params.setHeadRows(1); @@ -286,7 +288,7 @@ public class ProcessEsInspectPlanServiceImpl extends ServiceImpl fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { // 获取上传文件对象 - MultipartFile file = entity.getValue(); + MultipartFile file = IntekeyUtils.autoDecryptFile(entity.getValue()); ImportParams params = new ImportParams(); params.setNeedSave(true); params.setHeadRows(1); diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index e6ea63b6..6c7bc91c 100644 --- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -155,6 +155,32 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl parameter){ List itemValEOList = (List) parameter.get("itemValEOList"); @@ -1596,9 +1622,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> datas = result; if(datas!=null &&!datas.isEmpty()){ - try { + // 将excel文件解密 + InputStream inputStream = null; + if (ENCRYPT_ENABLE) { + inputStream = IntekeyUtils.decryptFile(DECRYPT_URL, DECRYPT_APP_CODE, DECRYPT_SECRET_KEY, null, + new MockMultipartFile( + excelfile.getName(), + excelfile.getName(), + (String) null, + Files.newInputStream(excelfile.toPath()))); + } else { + inputStream = Files.newInputStream(excelfile.toPath()); + } + try (XSSFWorkbook workbook=new XSSFWorkbook(inputStream)){ //获取全部sheet页中表格 - XSSFWorkbook workbook=new XSSFWorkbook(new FileInputStream(excelfile)); XSSFSheet sheet=null; List getSheetTableList = new ArrayList(); for (int i = 1; i < workbook.getNumberOfSheets(); i++) {//获取每个Sheet表