From d547a76cc302d5aab4a952c046e652b3b8b14940 Mon Sep 17 00:00:00 2001
From: chenwenjian <chenwenjian@axzo.cn>
Date: Fri, 12 Apr 2024 13:41:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2106):=20=E7=89=88=E6=9C=AC=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=B0=E5=BD=95personId=E4=B8=8D=E8=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/response/PageApplicationVersionResp.java         | 2 ++
 .../server/controller/ApplicationVersionController.java  | 6 ++++++
 .../server/service/ApplicationVersionReadLogService.java | 2 +-
 .../impl/ApplicationVersionReadLogServiceImpl.java       | 6 ++++--
 .../service/impl/ApplicationVersionServiceImpl.java      | 9 ++++++---
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java
index 5688270f..1cdef1ef 100644
--- a/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java
+++ b/banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java
@@ -23,6 +23,8 @@ import java.util.Date;
 @AllArgsConstructor
 public class PageApplicationVersionResp {
 
+    private Long id;
+
     /**
      * 版本号
      */
diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java
index ba539929..ddffbc96 100644
--- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java
+++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java
@@ -1,5 +1,6 @@
 package cn.axzo.nanopart.server.controller;
 
+import cn.axzo.framework.domain.ServiceException;
 import cn.axzo.framework.domain.web.result.ApiPageResult;
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.nanopart.api.ApplicationVersionApi;
@@ -15,6 +16,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Objects;
+
 /**
  * @author chenwenjian
  * @version 1.0
@@ -52,6 +55,9 @@ public class ApplicationVersionController implements ApplicationVersionApi {
 
     @Override
     public ApiResult<GetVersionUpdateRemindContentResp> getVersionUpdateRemindContent(GetVersionUpdateRemindContentReq req) {
+        if (Objects.isNull(req.getPersonId()) || req.getPersonId() == 0){
+            throw new ServiceException("personId不能为空");
+        }
         return ApiResult.ok(applicationVersionService.getVersionUpdateRemindContent(req));
     }
 }
diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/ApplicationVersionReadLogService.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/ApplicationVersionReadLogService.java
index 78aa3dce..1ec38e73 100644
--- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/ApplicationVersionReadLogService.java
+++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/ApplicationVersionReadLogService.java
@@ -12,5 +12,5 @@ public interface ApplicationVersionReadLogService {
 
     Long create(CreateApplicationVersionReadLogReq req);
 
-    ApplicationVersionReadLog getById(Long id);
+    ApplicationVersionReadLog getByIdWithPersonId(Long personId, Long id);
 }
diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionReadLogServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionReadLogServiceImpl.java
index 3538ca58..2ee6f45c 100644
--- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionReadLogServiceImpl.java
+++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionReadLogServiceImpl.java
@@ -28,10 +28,12 @@ public class ApplicationVersionReadLogServiceImpl extends ServiceImpl<Applicatio
     }
 
     @Override
-    public ApplicationVersionReadLog getById(Long id) {
+    public ApplicationVersionReadLog getByIdWithPersonId(Long personId, Long id) {
         return lambdaQuery()
                 .eq(ApplicationVersionReadLog::getIsDelete, 0)
-                .eq(ApplicationVersionReadLog::getId, id)
+                .eq(ApplicationVersionReadLog::getPersonId, personId)
+                .eq(ApplicationVersionReadLog::getVersionId, id)
+                .last("limit 1")
                 .one();
     }
 }
diff --git a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionServiceImpl.java b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionServiceImpl.java
index 4b41059e..9aa4174b 100644
--- a/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionServiceImpl.java
+++ b/banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionServiceImpl.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Objects;
 
@@ -107,6 +108,7 @@ public class ApplicationVersionServiceImpl extends ServiceImpl<ApplicationVersio
      * @param req {@link GetVersionUpdateRemindContentReq}
      * @return 对应端的版本更新记录信息 {@link GetVersionUpdateRemindContentResp}
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public GetVersionUpdateRemindContentResp getVersionUpdateRemindContent(GetVersionUpdateRemindContentReq req) {
         // 获取对应平台配置的版本信息
@@ -117,13 +119,13 @@ public class ApplicationVersionServiceImpl extends ServiceImpl<ApplicationVersio
                 .eq(StringUtils.isNotBlank(req.getVersion()), ApplicationVersion::getVersion, req.getVersion())
                 .orderByDesc(ApplicationVersion::getVersion)
                 .orderByDesc(ApplicationVersion::getReleaseTime)
-                .apply("limit 1")
+                .last("limit 1")
                 .one();
         if (Objects.isNull(version) || version.getRemind() == 0) {
             return null;
         }
         // 校验该用户是否已经提示
-        ApplicationVersionReadLog versionReadLog = applicationVersionReadLogService.getById(version.getId());
+        ApplicationVersionReadLog versionReadLog = applicationVersionReadLogService.getByIdWithPersonId(req.getPersonId(),version.getId());
         if (Objects.isNull(versionReadLog)) {
             // 该用户未提示
             applicationVersionReadLogService.create(CreateApplicationVersionReadLogReq.builder()
@@ -190,7 +192,8 @@ public class ApplicationVersionServiceImpl extends ServiceImpl<ApplicationVersio
                 .eq(Objects.nonNull(req.getPlatform()), ApplicationVersion::getPlatform, req.getPlatform())
                 .eq(Objects.nonNull(req.getOpSystem()), ApplicationVersion::getOpSystem, req.getOpSystem())
                 .eq(StringUtils.isNotBlank(req.getVersion()), ApplicationVersion::getVersion, req.getVersion())
-                .orderByDesc(ApplicationVersion::getVersion);
+                .orderByDesc(ApplicationVersion::getVersion)
+                .orderByDesc(ApplicationVersion::getReleaseTime);
     }
 
     /**