bug: excel导入修改

adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Cleanup;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
@@ -35,7 +36,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -279,7 +282,9 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl<InsideOutsideMe
         }
         Workbook workbook = null;
         try {
-            workbook = WorkbookFactory.create(excelFile);
+            @Cleanup
+            InputStream inputStream = new FileInputStream(excelFile);
+            workbook = WorkbookFactory.create(inputStream);
         } catch (IOException e) {
             FileUnZip.deleteDir(saveDirectory);
             return Result.error("导入失败,需要导入的数据有问题");

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsInformation/service/impl/SarLawsInformationServiceImpl.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation;
 import com.adc.da.slrs.sarLawsInformation.service.SarLawsInformationService;
 import com.adc.da.slrs.sarLawsInformation.dao.SarLawsInformationDao;
+import lombok.Cleanup;
 import lombok.SneakyThrows;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -40,7 +41,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -518,7 +521,9 @@ public class SarLawsInformationServiceImpl extends ServiceImpl<SarLawsInformatio
         }
         ImportParams importParams = new ImportParams();
         importParams.setTitleRows(1);
-        List<SarLawsInformation> sarLawsInformationList = ExcelImportUtil.importExcel(readImpExcelFile(zipEntryName).get(0), SarLawsInformation.class, importParams);
+        @Cleanup
+        InputStream inputStream = new FileInputStream(excelFile);
+        List<SarLawsInformation> sarLawsInformationList = ExcelImportUtil.importExcel(inputStream, SarLawsInformation.class, importParams);
         // 获取需要校验的字段
         List<TsDicType> firstMaterialTypeList = dicTypeService.selectAllDicTypeNameByDicCode("firstMaterialType");
         Set<String> firstMaterialTypeNameSet = firstMaterialTypeList.stream().map(TsDicType::getDicTypeName).collect(Collectors.toSet());

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/controller/SarLawsTopicController.java

@@ -150,7 +150,7 @@ public class SarLawsTopicController extends BaseController<SarLawsTopicVO> {
 
     @ApiOperation("Excel文件导入政策资料信息")
     @PostMapping("/importLawsTopicInfo")
-    public ResponseMessage<?> importLawsTopicInfo(@RequestParam(value = "file",required = false) MultipartFile file) throws ParseException {
+    public ResponseMessage<?> importLawsTopicInfo(@RequestParam(value = "file",required = false) MultipartFile file) throws Exception {
         if (file == null) {
             return Result.error("文件为空，请重新上传");
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/SarLawsTopicService.java

@@ -1,7 +1,6 @@
 package com.adc.da.slrs.sarLawsTopic.service;
 
 import com.adc.da.http.ResponseMessage;
-import com.adc.da.slrs.sarLawsInformation.entity.SarLawsInformation;
 import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic;
 import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopicVO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -30,5 +29,5 @@ public interface SarLawsTopicService extends IService<SarLawsTopic> {
 
     List<SarLawsTopicVO> getAllLawsTopic(SarLawsTopicVO sarLawsTopicVO);
 
-    ResponseMessage<?> importLawsTopicInfo(MultipartFile file);
+    ResponseMessage<?> importLawsTopicInfo(MultipartFile file) throws Exception;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsTopic/service/impl/SarLawsTopicServiceImpl.java

@@ -26,6 +26,7 @@ import com.adc.da.slrs.sarLawsTopic.entity.SarLawsTopic;
 import com.adc.da.slrs.sarLawsTopic.service.SarLawsTopicService;
 import com.adc.da.slrs.sarLawsTopic.dao.SarLawsTopicMapper;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Cleanup;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
@@ -37,8 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.io.File;
+import java.io.*;
-import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -239,7 +239,7 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
     }
 
     @Override
-    public ResponseMessage<?> importLawsTopicInfo(MultipartFile file) {
+    public ResponseMessage<?> importLawsTopicInfo(MultipartFile file) throws Exception {
         //获取文件全称
         String fileNameStr = file.getOriginalFilename();
         //获取最后.的位置
@@ -397,7 +397,10 @@ public class SarLawsTopicServiceImpl extends ServiceImpl<SarLawsTopicMapper, Sar
         ImportParams importParams = new ImportParams();
         importParams.setTitleRows(1);
         importParams.setHeadRows(2);
-        List<SarLawsTopicVO> lawsTopicVOList = ExcelImportUtil.importExcel(readImpExcelFile(zipEntryName).get(0), SarLawsTopicVO.class, importParams);
+        @Cleanup
+        InputStream inputStream = new FileInputStream(excelFile);
+        List<SarLawsTopicVO> lawsTopicVOList = ExcelImportUtil.importExcel(inputStream, SarLawsTopicVO.class, importParams);
+        excelFile.delete();
         // 去除空数据
         int index = 0;
         for (SarLawsTopicVO lawsTopicVO : lawsTopicVOList) {