Bladeren bron

fix(增加文件错误检测)

yang G 5 jaren geleden
bovenliggende
commit
dc53ba9379

+ 7 - 5
src/main/java/com/mokamrp/privates/controller/WorkContactEmployeeController.java

@@ -140,12 +140,14 @@ public class WorkContactEmployeeController extends BaseController<WorkContactEmp
         Map<Integer, String> feild = new HashMap<>(2);
         feild.put(0,"fanId");
         feild.put(1,"tagNames");
-
+        List<Map<String,String>> row = new ArrayList<>();
         //调用工具类解析excel文件
-        System.out.println(file.getName());
-        List<Map<String,String>> row = Analysis.analysis(file,feild);
-        System.out.println(authUser.getId());
-        System.out.println(authUser.getName());
+        try {
+            row = Analysis.analysis(file,feild);
+        }catch (Exception e){
+            return AjaxResult.error(e.getMessage());
+        }
+
         Map<String, Object> resMap = WorkContactEmployeeService.batchSetNovelFanTags(row,authUser);
 
         return AjaxResult.success(resMap);

+ 3 - 1
src/main/java/com/mokamrp/privates/help/Analysis.java

@@ -29,7 +29,7 @@ public class Analysis {
      * @param file 上传的文件
      * @return 二维集合(第一重集合为行,第二重集合为列,每一行包含该行的列集合,列集合包含该行的全部单元格的值)
      */
-    public static ArrayList<Map<String,String>> analysis(MultipartFile file, Map<Integer, String> field) {
+    public static ArrayList<Map<String,String>> analysis(MultipartFile file, Map<Integer, String> field) throws IOException {
 
         ArrayList<Map<String,String>> row = new ArrayList<>();
         if(field.size()<=0){
@@ -78,9 +78,11 @@ public class Analysis {
         } catch (FileNotFoundException e) {
             e.printStackTrace();
             System.out.println("===================未找到文件======================");
+            throw e;
         } catch (IOException e) {
             e.printStackTrace();
             System.out.println("===================上传失败======================");
+            throw e;
         }
 
         return row;