Przeglądaj źródła

Merge remote-tracking branch 'origin/master'

yumeng 1 rok temu
rodzic
commit
311450bfaf

+ 18 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/FirstDeliveryValidServiceImpl.java

@@ -2,6 +2,9 @@ package cn.com.ctop.toutiao.modules.material.service.impl;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.ExportExcelUtils;
+import cn.com.ctop.common.module.utils.LoadFileUtil;
+import cn.com.ctop.shiwan.modules.FileUtil;
+import cn.com.ctop.shiwan.modules.entity.ShiwanFileUpload;
 import cn.com.ctop.toutiao.modules.material.entity.FirstDeliveryValidMaterials;
 import cn.com.ctop.toutiao.modules.material.entity.FirstDeliveryValidRatio;
 import cn.com.ctop.toutiao.modules.material.mapper.FirstDeliveryValidMapper;
@@ -10,7 +13,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
+import com.monitorjbl.xlsx.StreamingReader;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.IOUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -19,11 +24,18 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 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 java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
 @Slf4j
 @Service
@@ -31,14 +43,17 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
 
     @Autowired
     private FirstDeliveryValidMapper deliveryValidMapper;
-
+    @Value("${zip.local.download-path}")
+    private String downloadPath;
 
     @Override
     public Result<Object> importExcelMaterials(MultipartFile file) throws Exception {
         List<FirstDeliveryValidMaterials> dataList = new ArrayList<>();
+        StringBuffer path = new StringBuffer();
         try {
             String fileName = file.getOriginalFilename();
             List<JSONObject> list = this.analysisFile(file, fileName);
+            LoadFileUtil.delFile(path.toString());
             for (JSONObject object : list) {
                 FirstDeliveryValidMaterials material = new FirstDeliveryValidMaterials(object);
                 if (!Check.isNull(material.getStatDate())) {
@@ -49,6 +64,8 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
         } catch (Exception e) {
             e.printStackTrace();
             throw new Exception("导入异常," + e.getMessage());
+        } finally {
+            LoadFileUtil.delFile(path.toString());
         }
         if (!Check.isNull(dataList)) {
             //根据当前年份和月份,删除旧数据
@@ -191,8 +208,6 @@ public class FirstDeliveryValidServiceImpl implements FirstDeliveryValidService
         page.setTotal(total);
         return Result.OK(page);
     }
-
-
     public static List<JSONObject> analysisFile(MultipartFile file, String fileName) throws Exception {
         JSONObject returnJson = new JSONObject();
         Workbook workbook = null;