wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-2106): 版本更新记录personId不能为空

Browse Source
This commit is contained in:
chenwenjian 2024-04-12 13:41:38 +08:00
parent e1847e5fe5
commit d547a76cc3
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
banner/banner-api/src/main/java/cn/axzo/nanopart/api/response/PageApplicationVersionResp.java
View File

@ -23,6 +23,8 @@ import java.util.Date;
@AllArgsConstructor
public class PageApplicationVersionResp {
private Long id;
/**
* 版本号
*/

6
banner/banner-server/src/main/java/cn/axzo/nanopart/server/controller/ApplicationVersionController.java
View File

@ -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));
}
}

2
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/ApplicationVersionReadLogService.java
View File

@ -12,5 +12,5 @@ public interface ApplicationVersionReadLogService {
Long create(CreateApplicationVersionReadLogReq req);
ApplicationVersionReadLog getById(Long id);
ApplicationVersionReadLog getByIdWithPersonId(Long personId, Long id);
}

6
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionReadLogServiceImpl.java
View File

@ -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();
}
}

9
banner/banner-server/src/main/java/cn/axzo/nanopart/server/service/impl/ApplicationVersionServiceImpl.java
View File

@ -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);
}
/**