From 4ca8a2f800119b559c1995858645f2d8d5e846e9 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 27 Sep 2023 14:17:03 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A8=E6=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/standard/controller/LawsNewsFeedController.java   | 7 +++++--
 .../laws/standard/mapper/xml/LawsNewsFeedMapper.xml        | 1 +
 .../laws/standard/service/ILawsNewsFeedService.java        | 2 +-
 .../standard/service/impl/LawsNewsFeedServiceImpl.java     | 7 +++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java
index 9783ed52..47cf37e8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java
@@ -3,6 +3,7 @@ package com.jero.modules.laws.standard.controller;
 import java.util.*;
 
 import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.Translation;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.ResultCommon;
@@ -142,8 +143,10 @@ public class LawsNewsFeedController extends JeroController<LawsNewsFeed, ILawsNe
     @AutoLog(value = "动态消息-通过id查询")
     @ApiOperation(value = "动态消息-通过id查询", notes = "动态消息-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<LawsNewsFeed> queryById(@RequestParam(name = "id") String id) {
-        LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id);
+    @Translation
+    public Result<LawsNewsFeed> queryById(@RequestParam(name = "id") String id,
+                                          @RequestParam(name = "type") String type) {
+        LawsNewsFeed lawsNewsFeed = lawsNewsFeedService.queryById(id, type);
         return Result.OK(lawsNewsFeed);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
index 87b6cc8a..274d413e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/mapper/xml/LawsNewsFeedMapper.xml
@@ -32,5 +32,6 @@
         <if test="param.dynamicHeading != null and param.dynamicHeading != ''">
            AND lnf.dynamic_heading LIKE CONCAT('%', #{param.dynamicHeading}, '%')
         </if>
+        ORDER BY create_time DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
index 5447d2f4..993ffcb8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsNewsFeedService.java
@@ -62,5 +62,5 @@ public interface ILawsNewsFeedService extends IService<LawsNewsFeed> {
 	 * @param id
 	 * @return
 	 */
-    LawsNewsFeed queryById(String id);
+    LawsNewsFeed queryById(String id, String type);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
index ac8dde88..cf1cfbaf 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java
@@ -208,13 +208,16 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl<LawsNewsFeedMapper, Law
 	 * @return
 	 */
 	@Override
-    public LawsNewsFeed queryById(String id) {
+    public LawsNewsFeed queryById(String id, String type) {
 		LawsNewsFeed lawsNewsFeed = getById(id);
 		if (Objects.isNull(lawsNewsFeed)) {
 			throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
 		}
 		// 阅读次数加1
-		lawsNewsFeed.setReadCount(lawsNewsFeed.getReadCount() + 1);
+		if ("query".equals(type)) {
+			lawsNewsFeed.setReadCount(lawsNewsFeed.getReadCount() + 1);
+			updateById(lawsNewsFeed);
+		}
         return lawsNewsFeed;
     }
 }