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 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