فهرست منبع

销售线索文件不支持多个文件上传

yangzian 3 سال پیش
والد
کامیت
edd388f29e

+ 9 - 9
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/controller/SaleClueInfoController.java

@@ -50,24 +50,24 @@ public class SaleClueInfoController extends BaseController {
 
 
 
-    @ApiOperation(value = "销售线索上传",notes = "swagger不支持上传,请使用postman上传,支持form-data。文件绑定参数为files,支持文件数组")
+    @ApiOperation(value = "销售线索上传",notes = "swagger不支持上传,请使用postman上传,支持form-data。文件绑定参数为file")
     @PostMapping(value = "/importSaleExcelOrCsv")
     public ResultResponse importSaleExcelOrCsv(
-                                      @ApiParam("文件数组") @RequestParam("files") List<MultipartFile> files,
+                                      @ApiParam("文件数组") @RequestParam("file") MultipartFile file,
                                       @ApiParam("销售线索类型1:50W低潜;2:50W中高潜;3:200W高潜;4:200W-500w;5:500W") @RequestParam("salesLeadsType") int salesLeadsType,
                                       @ApiParam("年-月") @RequestParam("uploadDate") String uploadDate,
                                       @ApiParam("创建人") @RequestParam("createUserId") Long createUserId
                                       ) throws Exception{
-        if (files.isEmpty()){
+        if (file.isEmpty()){
             return ResultResponse.error("文件不能为空,请选择文件!");
         }
-        for (MultipartFile file : files) {
-           if (!FileTypeUtils.fileNameSuffix(file)){
-               return ResultResponse.error("请上传正确格式的文件,支持扩展名.xls;.xlsx;.csv");
-           }
-        }
+
+       if (!FileTypeUtils.fileNameSuffix(file)){
+           return ResultResponse.error("请上传正确格式的文件,支持扩展名.xls;.xlsx;.csv");
+       }
+
         Long year = DateUtils.strDateToInt(uploadDate);
-        return saleClueInfoServiceImpl.importSaleExcelOrCsv(files,salesLeadsType,year,createUserId);
+        return saleClueInfoServiceImpl.importSaleExcelOrCsv(file,salesLeadsType,year,createUserId);
     }
 
 

+ 1 - 1
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/service/ISaleClueInfoService.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface ISaleClueInfoService {
 
 
-    ResultResponse importSaleExcelOrCsv(List<MultipartFile> files,int salesLeadsType,Long uploadDate,Long createUserId)throws Exception;
+    ResultResponse importSaleExcelOrCsv(MultipartFile file,int salesLeadsType,Long uploadDate,Long createUserId)throws Exception;
 
 
     ResultResponse selectSaleClueInfoList(String sellerName, Long uploadDate, String distributionSaleFlag, String industryId, String fansType,String state, Long userId)throws Exception;

+ 25 - 25
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/service/impl/SaleClueInfoServiceImpl.java

@@ -75,7 +75,7 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
      * Description: 销售线索添加
      * 支持excel 和 csv 文件上传
      *------------
-     * @param files
+     * @param file
      * @param salesLeadsType 销售线索类型1:50W低潜;2:50W中高潜;3:200W高潜;4:200W-500w;5:500W
      * @param uploadDate 时间 格式为202205
      * @param createUserId
@@ -83,34 +83,34 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
      * Return com.ruixuan.common.core.domain.ResultResponse
      */
     @Override
-    public ResultResponse importSaleExcelOrCsv(List<MultipartFile> files, int salesLeadsType, Long uploadDate, Long createUserId) throws Exception{
+    public ResultResponse importSaleExcelOrCsv(MultipartFile file, int salesLeadsType, Long uploadDate, Long createUserId) throws Exception{
 
         List<Map<String,String>> dataList = new ArrayList<>();
-        for (MultipartFile file : files) {
-            //文件类型
-            String fileType = FileTypeUtils.gerFileTypeXlsOrCsv(file);
-            if (StringUtils.equals("excel",fileType)){
-                //读取Excel
-                EasyExcel.read(file.getInputStream(),null,
-                            new ImportExcelListener()).sheet().headRowNumber(1).doRead();
-                //头 信息
-                //Map<Integer, String> headList = ImportExcelListener.importHeadList;
-                //结果集
-                dataList = ImportExcelListener.importDataList;
-
-            }
-
-            if (StringUtils.equals("csv",fileType)){
-                dataList = CsvImportUtil.readCSV(file);
-            }
-            //处理数据结果
-            resultData(dataList,salesLeadsType,createUserId);
-
-            //excel 清除监听数据
-            ImportExcelListener.importDataList.clear();
-            ImportExcelListener.importHeadList.clear();
+
+        //文件类型
+        String fileType = FileTypeUtils.gerFileTypeXlsOrCsv(file);
+
+        if (StringUtils.equals("excel",fileType)){
+            //读取Excel
+            EasyExcel.read(file.getInputStream(),null,
+                        new ImportExcelListener()).sheet().headRowNumber(1).doRead();
+            //头 信息
+            //Map<Integer, String> headList = ImportExcelListener.importHeadList;
+            //结果集
+            dataList = ImportExcelListener.importDataList;
+
         }
 
+        if (StringUtils.equals("csv",fileType)){
+            dataList = CsvImportUtil.readCSV(file);
+        }
+        //处理数据结果
+        resultData(dataList,salesLeadsType,createUserId);
+
+        //excel 清除监听数据
+        ImportExcelListener.importDataList.clear();
+        ImportExcelListener.importHeadList.clear();
+
         return ResultResponse.successMsg("保存成功",null);
     }