From dc530361673f9ec6c1b16e389ab5d1b7748990a8 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 8 Apr 2022 18:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9D=A1=E6=AC=BE-=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FileSplitItemsEOServiceImpl.java     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 650a22b7c..2c24e1c03 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -1328,7 +1328,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             return Result.OK( msg, null);
         } catch (Exception e) {
             log.error(e.getMessage(),e);
-            return Result.error("导入失败");
+            return Result.error(1,"导入失败");
         }
     }
 
@@ -1426,23 +1426,23 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }else{
                     //删除原上传文件
                     FileUnZip.deleteDir(saveDirectory);
-                    return Result.error("没有可导入的数据,请检查!");
+                    return Result.error(1, "没有可导入的数据,请检查!");
                 }
             } catch (NoSuchElementException e){
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error("没有可导入的数据,请检查!");
+                return Result.error(1, "没有可导入的数据,请检查!");
             } catch (JeroBootException e){
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error(e.getMessage());
+                return Result.error(1, e.getMessage());
             } catch (Exception e) {
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error( "读取失败，请严格按照模板文件导入数据");
+                return Result.error( 1, "读取失败，请严格按照模板文件导入数据");
             }
         } catch (Exception e) {
             //删除原上传文件
             FileUnZip.deleteDir(saveDirectory);
-            return Result.error("读取失败，请严格按照模板文件导入数据");
+            return Result.error(1, "读取失败，请严格按照模板文件导入数据");
         }
     }
 
@@ -1451,6 +1451,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         OSSFile ossFile = ossFileService.getById(splitFileId);
         String url = ossFile.getUrl();
         MultipartFile mFile = createMfileByPath(url);
+
         // 新增拆分记录
         Date now = new Date();
         String infoId = UUID.randomUUID().toString().replace("-", "");
@@ -1458,7 +1459,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         sarFileSplitInfoEO.setSplitResult("成功");
         sarFileSplitInfoEO.setCreateTime(now);
         sarFileSplitInfoEO.setUpdateTime(now);
-        sarFileSplitInfoService.save(sarFileSplitInfoEO);
+
         // 添加条款总目录
         SarFileSplitMenuEO sarFileSplitMenuEO = new SarFileSplitMenuEO();
         String menuId = UUID.randomUUID().toString().replace("-", "");
@@ -1469,9 +1470,14 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         sarFileSplitMenuEO.setValidFlag(0);
         sarFileSplitMenuEO.setCreationTime(new Date());
         sarFileSplitMenuEO.setModifyTime(new Date());
-        sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
+
         // 导入文件
-        return importSplitItems(mFile, cut, menuId, infoId);
+        Result<?> result = importSplitItems(mFile, cut, menuId, infoId);
+        if(result.isSuccess()){
+            sarFileSplitInfoService.save(sarFileSplitInfoEO);
+            sarFileSplitMenuEOMapper.insertSelective(sarFileSplitMenuEO);
+        }
+        return result;
     }
 
     private MultipartFile createMfileByPath(String path) {