From 98dea7202b894cdee246c5b15e02d1805ac046a8 Mon Sep 17 00:00:00 2001
From: "alex.sung" <alex.sung@fanruan.com>
Date: Fri, 17 May 2019 14:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E4=B8=8BNPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messagecollect/impl/AbstractSendDataToCloud.java     | 4 +++-
 .../messagecollect/impl/FocusPointMessageUploader.java   | 9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java
index da98e47784..77f370d9d0 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/AbstractSendDataToCloud.java
@@ -98,9 +98,11 @@ public abstract class AbstractSendDataToCloud implements XMLable {
     }
 
     private <T> void generateThisPageFile(DataList<T> points) {
-        File file = null;
         try {
             JSONArray jsonArray = dealWithSendFunctionContent(points);
+            if (jsonArray == null) {
+                return;
+            }
             //生成json文件
             fileEntityBuilder.generateFile(jsonArray, getFileEntityBuilder().getFolderName());
         } catch (Exception e) {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java
index 214806c2e6..b2c788423a 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/impl/FocusPointMessageUploader.java
@@ -38,6 +38,9 @@ public class FocusPointMessageUploader extends AbstractSendDataToCloud {
 
     @Override
     public <T> JSONArray dealWithSendFunctionContent(DataList<T> focusPoints) {
+        if (focusPoints == null) {
+            return null;
+        }
         JSONArray ja = new JSONArray();
         for(T t:focusPoints.getList()){
             FocusPoint focusPoint = (FocusPoint)t;
@@ -59,9 +62,9 @@ public class FocusPointMessageUploader extends AbstractSendDataToCloud {
         MessageCollectUtils.readXMLFile(instance, getLastTimeFile());
         long currentTime = new Date().getTime();
         long lastTime = MessageCollectUtils.getLastTimeMillis(this.lastTime);
-        if (currentTime - lastTime <= DELTA) {
-            return;
-        }
+//        if (currentTime - lastTime <= DELTA) {
+//            return;
+//        }
         try {
             generatePath();
             queryData(currentTime, lastTime, FocusPoint.class);