From 28443f0c163bc298d006015392f62a2f810764ab Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Wed, 5 Apr 2017 17:42:38 +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=E9=98=B2=E6=AD=A2=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/mainframe/JTemplate.java    |  3 --
 .../templateinfo/TemplateInfoCollector.java   | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/JTemplate.java b/designer_base/src/com/fr/design/mainframe/JTemplate.java
index d6dc2f0b1..37769cdbe 100644
--- a/designer_base/src/com/fr/design/mainframe/JTemplate.java
+++ b/designer_base/src/com/fr/design/mainframe/JTemplate.java
@@ -117,9 +117,6 @@ public abstract class JTemplate<T extends IOFile, U extends BaseUndoState<?>> ex
         }
     }
     private void collectInfo() {  // 执行收集操作
-        if (template.getTemplateID() == null) {  // 旧模板
-            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 39a7e22ab..3cbc557f8 100644
--- a/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
+++ b/designer_base/src/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java
@@ -15,9 +15,7 @@ import org.json.JSONObject;
 
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
+import java.util.*;
 
 /**
  * 做模板的过程和耗时收集，辅助类
@@ -27,6 +25,7 @@ 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,6 +35,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
     @SuppressWarnings("unchecked")
     private TemplateInfoCollector() {
         templateInfoList = new HashMap<>();
+        removedTemplates = new ListSet<>();
         setDesignerOpenDate();
     }
 
@@ -77,12 +77,15 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         return instance;
     }
 
-    private static boolean shouldCollectInfo() {
+    private boolean shouldCollectInfo(T t) {
+        if (t.getTemplateID() == null || instance.removedTemplates.contains(t.getTemplateID())) {  // 旧模板
+            return false;
+        }
         return DesignerEnvManager.getEnvManager().isJoinProductImprove() && FRContext.isChineseEnv();
     }
 
-    public static void appendProcess(String log) {
-        if (!shouldCollectInfo()) {
+    public void appendProcess(T t, String log) {
+        if (!shouldCollectInfo(t)) {
             return;
         }
         // 获取当前编辑的模板
@@ -148,7 +151,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
      */
     @SuppressWarnings("unchecked")
     public void collectInfo(T t, JTemplate jt, long openTime, long saveTime) {
-        if (!shouldCollectInfo()) {
+        if (!shouldCollectInfo(t)) {
             return;
         }
 
@@ -232,7 +235,7 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
             if (sendSingleTemplateInfo(consumingUrl, jsonConsumingMap) && sendSingleTemplateInfo(processUrl, jsonProcessMap)) {
                 // 清空记录
                 FRLogger.getLogger().info("successfully send " + templateInfo.get("templateID"));
-                templateInfoList.remove(templateInfo.get("templateID"));
+                removeFromTemplateInfoList(templateInfo.get("templateID"));
             }
         }
         saveInfo();
@@ -284,12 +287,18 @@ public class TemplateInfoCollector<T extends IOFile> implements Serializable {
         }
         // 删除测试模板
         for (String key : testTemplateKeys) {
-            templateInfoList.remove(key);
-//            System.out.println(key + " is removed...");
+            removeFromTemplateInfoList(key);
         }
         return completeTemplatesInfo;
     }
 
+    private void removeFromTemplateInfoList(String key) {
+        templateInfoList.remove(key);
+        removedTemplates.add(key);
+        FRLogger.getLogger().info(key + " is removed...");
+        FRLogger.getLogger().info("removedTemplates: " + removedTemplates);
+    }
+
     @SuppressWarnings("unchecked")
     private boolean isTestTemplate(HashMap<String, Object> templateInfo) {
         HashMap<String, Object> processMap = (HashMap<String, Object>) templateInfo.get("processMap");