Просмотр исходного кода

销售线索文件上传去除空格

yangzian 3 лет назад
Родитель
Сommit
dce3167eac

+ 2 - 0
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/listener/ImportExcelListener.java

@@ -47,6 +47,8 @@ public class ImportExcelListener extends AnalysisEventListener<Map<Integer, Stri
             if (StringUtils.isNotNull(mapKey)){
 
                 String keyStr = (String)mapKey;
+                keyStr.replace(" ","");
+                vlue = vlue.replace(" ","");
 
                 if (keyStr.contains("家ID")){
                     ObjectMap.put("sellerId",vlue);

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

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

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

@@ -86,13 +86,18 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
      * Return com.ruixuan.common.core.domain.ResultResponse
      */
     @Override
-    public ResultResponse importSaleExcelOrCsv(MultipartFile file, int salesLeadsType, Long uploadDate, Long createUserId) throws Exception{
+    public ResultResponse importSaleExcelOrCsv(MultipartFile file, int salesLeadsType, Long uploadDate, Long createUserId){
 
         List<Map<String,String>> dataList = new ArrayList<>();
 
         //文件类型
         String fileType = FileTypeUtils.gerFileTypeXlsOrCsv(file);
 
+        try {
+
+
+
+
         if (StringUtils.equals("excel",fileType)){
             //读取Excel
             EasyExcel.read(file.getInputStream(),null,
@@ -114,6 +119,16 @@ public class SaleClueInfoServiceImpl implements ISaleClueInfoService {
         ImportExcelListener.importDataList.clear();
         ImportExcelListener.importHeadList.clear();
 
+        }catch (Exception e){
+            //excel 清除监听数据
+            ImportExcelListener.importDataList.clear();
+            ImportExcelListener.importHeadList.clear();
+            e.printStackTrace();
+            log.error("上传文件出现了问题。",e.toString());
+            return ResultResponse.error(e.toString());
+        }
+
+
         return ResultResponse.successMsg("保存成功",null);
     }
 

+ 3 - 5
ruixuan-salesLeads/src/main/java/com.ruixuan.salesLeads/utils/CsvImportUtil.java

@@ -66,11 +66,9 @@ public class CsvImportUtil {
             Map<String,String> rowMap = rows.get(i).getFieldMap();
 
             rowMap.forEach((key,vlue)->{
-
-
-                System.out.println(key);
-
-                String keyStr = key;
+                //System.out.println(key);
+                String keyStr = key.replace(" ","");
+                vlue = vlue.replace(" ","");
 
                 if (StringUtils.isNotNull(keyStr)){