From ad587e96abc2f05493ac7d13a09ebae81bb0dcb0 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期二, 09 四月 2024 16:17:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
index 9cfe666..d1ba976 100644
--- a/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
+++ b/rest/src/main/java/cn/stylefeng/rest/modular/user/controller/UserCenterController.java
@@ -13,9 +13,11 @@
import cn.stylefeng.guns.modular.business.dto.request.CustomerWxOpenIdLoginRequest;
import cn.stylefeng.guns.modular.business.entity.Help;
import cn.stylefeng.guns.modular.business.entity.MentalTestRecord;
+import cn.stylefeng.guns.modular.business.entity.Version;
import cn.stylefeng.guns.modular.business.service.IAreaService;
import cn.stylefeng.guns.modular.business.service.IHelpService;
import cn.stylefeng.guns.modular.business.service.IMentalTestRecordService;
+import cn.stylefeng.guns.modular.business.service.IVersionService;
import cn.stylefeng.rest.modular.user.service.CustomerLoginBizService;
import cn.stylefeng.roses.kernel.auth.api.AuthServiceApi;
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
@@ -99,6 +101,15 @@
@Resource
private IAreaService areaService;
+ @Resource
+ private IVersionService versionService;
+
+ @ApiOperation(value = "获取当前最新版本")
+ @PostResource(name = "获取当前最新版本", path = RuleConstants.NOT_LOGIN +"/newversion")
+ public ResponseData<Version> newversion() {
+ Version one = versionService.getOne(Wrappers.lambdaQuery(Version.class).orderByDesc(Version::getCreateTime).eq(Version::getIsDelete, 0).last("limit 1"));
+ return new SuccessResponseData<>(one);
+ }
@ApiOperation(value = "获取微信openId")
@GetResource(name = "获取微信openId", path = RuleConstants.NOT_LOGIN + "/getWxOpenId", requiredPermission = false, requiredLogin = false)
@@ -301,12 +312,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "分页：第几页（从1开始）", dataTypeClass = Integer.class, paramType = "query"),
@ApiImplicitParam(name = "pageSize", value = "分页：每页大小（默认10）", dataTypeClass = Integer.class, paramType = "query"),
- @ApiImplicitParam(name = "title", value = "帮助内容", dataTypeClass = Integer.class, paramType = "query")
+ @ApiImplicitParam(name = "title", value = "标题", dataTypeClass = String.class, paramType = "query"),
+ @ApiImplicitParam(name = "content", value = "内容", dataTypeClass = String.class, paramType = "query")
} )
- public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize,String title) {
- LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete,false)
- .orderByAsc(Help::getSort);
- lambdaQueryWrapper.like(StrUtil.isNotBlank(title),Help::getTitle,title).or().like(StrUtil.isNotBlank(title),Help::getContent,title);
+ public ResponseData<PageResult<Help>> page(Integer pageNo, Integer pageSize, String title, String content) {
+ LambdaQueryWrapper<Help> lambdaQueryWrapper = new LambdaQueryWrapper<Help>().eq(Help::getIsDelete, false).orderByAsc(Help::getSort);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(title), Help::getTitle, title);
+ lambdaQueryWrapper.like(StrUtil.isNotBlank(content), Help::getContent, content);
Page<Help> page = this.helpService.page(PageFactory.page(pageNo, pageSize), lambdaQueryWrapper);
return new SuccessResponseData<>(PageResultFactory.createPageResult(page));
}
--
Gitblit v1.7.1