From f108a5f84002544cf26443f6880e8379f5de0ef8 Mon Sep 17 00:00:00 2001
From: wxyclub <tjzdwxy@163.com>
Date: Wed, 27 Sep 2023 17:43:41 +0800
Subject: [PATCH] =?UTF-8?q?add:=20=E6=8B=86=E5=88=86=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/NewsFeedController.java        | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java
index 5141223e..942e81fc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/NewsFeed/controller/NewsFeedController.java
@@ -1,11 +1,9 @@
 package com.adc.da.slrs.NewsFeed.controller;
 
 import com.adc.da.base.web.BaseController;
-import com.adc.da.http.PageInfo;
 import com.adc.da.slrs.NewsFeed.entity.NewsFeed;
 import com.adc.da.slrs.NewsFeed.page.NewsFeedPage;
 import com.adc.da.slrs.NewsFeed.service.Impl.NewsFeedServiceImpl;
-import com.adc.da.slrs.msgDynamicInfo.entity.MsgDynamicInfoEO;
 import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,7 +18,12 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -42,9 +45,15 @@ public class NewsFeedController extends BaseController<NewsFeed> {
         iPage.setCurrent(page.getPage());
         iPage.setSize(page.getPageSize());
         List<String> list = new ArrayList<>();
-        if("GNWBZFG".equals(page.getMessageType())){
+        QueryWrapper<NewsFeed> queryWrapper = new QueryWrapper<>();
+        if("GNBZFG".equals(page.getMessageType())){
             list.add("hc99551723c");
-        }else if("ZYBZFG".equals(page.getMessageType())){
+            queryWrapper.eq("RESOURCE_TYPE","INLAND");
+        }else if ("GWBZFG".equals(page.getMessageType())){
+            list.add("hc99551723c");
+            queryWrapper.eq("RESOURCE_TYPE","FOREIGN");
+        }
+        else if("ZYBZFG".equals(page.getMessageType())){
             list.add("hya6gay4vx");
             list.add("8rjsx83ows");
             list.add("ncb6osftj8");
@@ -52,7 +61,7 @@ public class NewsFeedController extends BaseController<NewsFeed> {
         }else if("QYBZFB".equals(page.getMessageType())){
             list.add("6jnqba2mby");
         }
-        QueryWrapper queryWrapper = new QueryWrapper();
+
         queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardId()),"STANDARD_ID",page.getStandardId());
         queryWrapper.eq(StringUtils.isNotEmpty(page.getStandardName()),"STANDARD_NAME",page.getStandardName());
         queryWrapper.eq("MESSAGE_TYPE",page.getMessageType());
@@ -61,6 +70,17 @@ public class NewsFeedController extends BaseController<NewsFeed> {
         }
         queryWrapper.orderByDesc("RENEW_TIME");
         IPage<NewsFeed> newsFeedList =  newsFeedService.page(iPage,queryWrapper);
+        // 标准名称或标准编号后三天之内直接显示（new），修改标准名称
+        List<NewsFeed> records = newsFeedList.getRecords();
+        for (NewsFeed record : records) {
+            LocalDate localDate = LocalDate.now().plusDays(-3);
+            Instant instant = localDate.atTime(LocalTime.MIDNIGHT).atZone(ZoneId.systemDefault()).toInstant();
+            Date date = Date.from(instant);
+            if (record.getRenewTime().compareTo(date) >= 0) {
+                record.setStandardName(record.getStandardName() + "(new)");
+            }
+        }
+        newsFeedList.setRecords(records);
         return Result.success(newsFeedList);
     }