浏览代码

关闭流

zx 3 月之前
父节点
当前提交
931a1b9c66

+ 17 - 2
ruoyi-powerdistribution/src/main/java/com/ruoyi/powerdistribution/controller/PdmVehicleDrivingRecordController.java

@@ -38,7 +38,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 施工车辆行驶记录Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-01-21
  */
@@ -122,8 +122,12 @@ public class PdmVehicleDrivingRecordController extends BaseController
     }
     @PostMapping("/import")
     public AjaxResult importExcel(HttpServletRequest request, MultipartFile file) {
+        InputStreamReader inputStreamReader =null;
+        CSVReader csvReader = null;
            try {
-               CSVReader csvReader = new CSVReader(new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8));
+               inputStreamReader = new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8);
+               csvReader = new CSVReader(inputStreamReader);
+               //CSVReader csvReader = new CSVReader(new InputStreamReader(file.getInputStream(), StandardCharsets.UTF_8));
                String[] nextLine;
                int i = 0;
                List<PdmVehicleDrivingRecord> dataList = new ArrayList<>();
@@ -146,6 +150,17 @@ public class PdmVehicleDrivingRecordController extends BaseController
                pdmVehicleDrivingRecordService.batchAdd(dataList);
            }catch(Exception e){
                return  AjaxResult.error("导入失败,请检查文件");
+           }finally {
+               try {
+                   if(inputStreamReader!=null) {
+                       inputStreamReader.close();
+                   }
+                   if(csvReader!=null){
+                       csvReader.close();
+                   }
+               }catch (Exception e){
+                   logger.error(e.getMessage());
+               }
            }
            return AjaxResult.success();
     }