From 264b98625ec28a971278c2f6fb2763611ce20946 Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Tue, 23 Apr 2019 17:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/vcs/common/VcsHelper.java       |  6 +--
 .../src/main/java/com/fr/start/Designer.java  | 39 ++++++++++++-------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
index ee6135718..c5adecccf 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java
@@ -89,11 +89,11 @@ public class VcsHelper {
         return editingFilePath;
     }
 
-    public static boolean needSaveVersion(VcsEntity entity) {
+    public static boolean needDeleteVersion(VcsEntity entity) {
         if (entity == null) {
-            return true;
+            return false;
         }
-        return new Date().getTime() - entity.getTime().getTime() > DesignerEnvManager.getEnvManager().getSaveInterval() * MINUTE || StringUtils.isNotBlank(entity.getCommitMsg());
+        return new Date().getTime() - entity.getTime().getTime() < DesignerEnvManager.getEnvManager().getSaveInterval() * MINUTE && StringUtils.isBlank(entity.getCommitMsg());
     }
 
 
diff --git a/designer-realize/src/main/java/com/fr/start/Designer.java b/designer-realize/src/main/java/com/fr/start/Designer.java
index 16e9cd687..a2f6c92c7 100644
--- a/designer-realize/src/main/java/com/fr/start/Designer.java
+++ b/designer-realize/src/main/java/com/fr/start/Designer.java
@@ -292,22 +292,31 @@ public class Designer extends BaseDesigner {
      * 版本控制
      * @param jt
      */
-    private void dealWithVcs(JTemplate jt) {
-        String fileName = VcsHelper.getEditingFilename();
-        VcsEntity entity = WorkContext.getCurrent().get(VcsOperator.class).getLatestFileVersion(fileName);
-        int latestFileVersion = 0;
-        if (entity != null) {
-            latestFileVersion = entity.getVersion();
-        }
-        if (VcsHelper.needSaveVersion(entity)) {
-            if (jt.getEditingFILE() instanceof VcsCacheFileNodeFile) {
-                WorkContext.getCurrent().get(VcsOperator.class).saveVersionFromCache(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
-                String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
-                FileVersionTable.getInstance().updateModel(1, WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst("/", "")));
-            } else {
-                WorkContext.getCurrent().get(VcsOperator.class).saveVersion(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
+    private void dealWithVcs(final JTemplate jt) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                String fileName = VcsHelper.getEditingFilename();
+                VcsOperator operator = WorkContext.getCurrent().get(VcsOperator.class);
+                VcsEntity entity = operator.getFileVersionByIndex(fileName, 0);
+                int latestFileVersion = 0;
+                if (entity != null) {
+                    latestFileVersion = entity.getVersion();
+                }
+                if (jt.getEditingFILE() instanceof VcsCacheFileNodeFile) {
+                    operator.saveVersionFromCache(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
+                    String path = DesignerFrameFileDealerPane.getInstance().getSelectedOperation().getFilePath();
+                    FileVersionTable.getInstance().updateModel(1, WorkContext.getCurrent().get(VcsOperator.class).getVersions(path.replaceFirst("/", "")));
+                } else {
+                    operator.saveVersion(VcsHelper.CURRENT_USERNAME, fileName, StringUtils.EMPTY, latestFileVersion + 1);
+                }
+                VcsEntity oldEntity = WorkContext.getCurrent().get(VcsOperator.class).getFileVersionByIndex(fileName, 1);
+                if (VcsHelper.needDeleteVersion(oldEntity)) {
+                    operator.deleteVersion(oldEntity.getFilename(), oldEntity.getVersion());
+                }
+
             }
-        }
+        }).start();
 
     }