From ad7328e959e7ad92b1f0a1d549423df4717c56bb Mon Sep 17 00:00:00 2001
From: hades <oypx.gr@gmail.com>
Date: Fri, 29 Apr 2022 11:43:03 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-70682=20cid=E8=AE=BE=E7=BD=AE=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=9A=90=E8=97=8F=E6=97=B6=20=E6=82=AC=E6=B5=AE?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=BF=98=E6=98=AF=E6=9C=89=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A0=87=E8=AE=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/mainframe/alphafine/AlphaFineUtil.java  |  6 ++----
 .../manager/impl/ProductNewsSearchManager.java     | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java
index 66210cddc6..0d23a6fc97 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/AlphaFineUtil.java
@@ -1,10 +1,8 @@
 package com.fr.design.mainframe.alphafine;
 
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.mainframe.alphafine.model.ProductNews;
 import com.fr.design.mainframe.alphafine.search.manager.impl.ProductNewsSearchManager;
 import com.fr.stable.StringUtils;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -57,7 +55,7 @@ public class AlphaFineUtil {
 
     public static boolean unread() {
         Set<Long> readSet = DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().getReadSet();
-        List<ProductNews> productNewsList = ProductNewsSearchManager.getInstance().getCachedProductNewsList();
-        return !productNewsList.isEmpty() && (readSet.size() != productNewsList.size());
+        Set<Long> idSet = ProductNewsSearchManager.getInstance().getIdSet();
+        return !idSet.isEmpty() && !readSet.containsAll(idSet);
     }
 }
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ProductNewsSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ProductNewsSearchManager.java
index 655eec2c89..205735ab33 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ProductNewsSearchManager.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ProductNewsSearchManager.java
@@ -16,7 +16,9 @@ import java.awt.Image;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -30,6 +32,12 @@ public class ProductNewsSearchManager {
 
     private List<ProductNews> productNewsList = new ArrayList<>();
 
+    /**
+     * 单独记录一份cid的唯一id 用来判断是否已读
+     */
+    private Set<Long> idSet = new HashSet<>();
+
+
     private ScheduledExecutorService service;
 
     private ProductNewsSearchManager() {
@@ -71,6 +79,7 @@ public class ProductNewsSearchManager {
 
     public List<ProductNews> getProductNewsList() throws Exception {
         productNewsList = new ArrayList<>();
+        idSet = new HashSet<>();
         String jsonStr = HttpToolbox.get(AlphaFineConstants.ALPHA_CID);
         AlphaFineHelper.checkCancel();
         JSONObject cidJSON = JSONFactory.createJSON(JSON.OBJECT, jsonStr);
@@ -88,6 +97,7 @@ public class ProductNewsSearchManager {
             // 推送时间check
             if (productNews.getPushDate().before(currentDate)) {
                 productNewsList.add(productNews);
+                idSet.add(productNews.getId());
             }
         }
         return productNewsList;
@@ -97,6 +107,10 @@ public class ProductNewsSearchManager {
         return productNewsList;
     }
 
+    public Set<Long> getIdSet() {
+        return idSet;
+    }
+
     @Nullable
     private Image getCoverImage(String url) {
         try {