From cebfc9ef10d1c3411e4bc6a33e3b05d38b158e53 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Thu, 6 Apr 2017 12:47:09 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-1916=20=E6=A8=A1=E6=9D=BF=E8=80=97?=
 =?UTF-8?q?=E6=97=B6=3D=E3=80=8B=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E4=B8=8A=E4=BC=A0=E5=90=8E=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=A7=86=E4=B8=BA=E6=97=A7=E6=A8=A1=E6=9D=BF=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=94=B6=E9=9B=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/com/fr/design/mainframe/JTemplate.java   |  3 +++
 .../templateinfo/TemplateInfoCollector.java      | 16 +++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index 37769cdbe8..7c98fecd1f 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -117,6 +117,9 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         }
     }
     private void collectInfo() {  // 执行收集操作
+        if (openTime == 0) {  // 旧模板，不收集数据
+            return;
+        }
         long saveTime = System.currentTimeMillis();  // 保存模板的时间点
         tic.collectInfo(template, this, openTime, saveTime);
         openTime = saveTime;  // 更新 openTime，准备下一次计算
diff --git a/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java b/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
index 76d942e9a3..db1fe312ae 100644
--- a/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
+++ b/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
@@ -26,7 +26,6 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     private static final String FILE_NAME = "tplInfo.ser";
     private static TemplateInfoCollector instance;
     private HashMap<String, HashMap<String, Object>> templateInfoList;
-    private Set<String> removedTemplates;  // 已经从 templateInfoList 中删除过的 id 列表，防止重复收集数据
     private String designerOpenDate;  //设计器最近一次打开日期
     private static final int VALID_CELL_COUNT = 5;  // 有效报表模板的格子数
     private static final int VALID_WIDGET_COUNT = 5;  // 有效报表模板的控件数
@@ -36,7 +35,6 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     @SuppressWarnings("unchecked")
     private TemplateInfoCollector() {
         templateInfoList = new HashMap<>();
-        removedTemplates = new ListSet<>();
         setDesignerOpenDate();
     }
 
@@ -85,17 +83,15 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return instance;
     }
 
-    private boolean shouldCollectInfo(T t) {
-        if (FRContext.getCurrentEnv() instanceof RemoteEnv  // 远程设计不收集数据
-                || t.getTemplateID() == null
-                || instance.removedTemplates.contains(t.getTemplateID())) {  // 旧模板
+    private boolean shouldCollectInfo() {
+        if (FRContext.getCurrentEnv() instanceof RemoteEnv) {  // 远程设计不收集数据
             return false;
         }
         return DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
     }
 
-    public void appendProcess(T t, String log) {
-        if (!shouldCollectInfo(t)) {
+    public void appendProcess(String log) {
+        if (!shouldCollectInfo()) {
             return;
         }
         // 获取当前编辑的模板
@@ -161,7 +157,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     @SuppressWarnings("unchecked")
     public void collectInfo(T t, JTemplate jt, long openTime, long saveTime) {
-        if (!shouldCollectInfo(t)) {
+        if (!shouldCollectInfo()) {
             return;
         }
 
@@ -304,9 +300,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
 
     private void removeFromTemplateInfoList(String key) {
         templateInfoList.remove(key);
-        removedTemplates.add(key);
         FRLogger.getLogger().info(key + " is removed...");
-        FRLogger.getLogger().info("removedTemplates: " + removedTemplates);
     }
 
     @SuppressWarnings("unchecked")