From 36b892dfbba6cbdb90583804dbe3396357c87e7a Mon Sep 17 00:00:00 2001
From: gaojiabao <syxy@soft.com>
Date: Fri, 10 Feb 2023 11:40:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F=20=E4=B8=89=E5=A4=A9?=
 =?UTF-8?q?=E5=86=85=E6=98=BE=E7=A4=BA=20=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PersonCollectEOServiceImpl.java      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
index 7b96410a..5b1e7d98 100644
--- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java
@@ -21,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.awt.*;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 
@@ -142,6 +144,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
             List<String> ids = new ArrayList<>(Arrays.asList(modeType.split(",")));
             wrapper.in("collect_type",ids);
         }
+        wrapper.orderByDesc("creation_Time");
 
         if (pageNo != null) {
             basePage.setPage(pageNo);
@@ -156,6 +159,22 @@ public class PersonCollectEOServiceImpl extends ServiceImpl<PersonCollectEODao,
 
 
         IPage<TsPersonCollect> page = this.page(new Page<>(basePage.getPage(), basePage.getPageSize()), wrapper);
+        //三天以内收藏的 标题名称后面加 new 一小时3600000  一天时间戳 为 86400000
+         long newTime = 86400000;
+         Date date = new Date();
+         long time = date.getTime();
+
+
+        for (TsPersonCollect data : page.getRecords()){
+             long creationTime = data.getCreationTime().getTime();
+             if(creationTime + newTime == time || creationTime + newTime > time){
+               StringBuffer sb = new StringBuffer();
+                 sb.append("<span style=\'color:red\'>"+"(new)"+"</span>").append(data.getCollectTitle());
+                 data.setCollectTitle(sb.toString());
+             }
+        }
+
+
         return Result.success(page);
     }