From 2206f203e8856b0d5aa025966ff847ff5814688c Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Fri, 20 Dec 2024 11:26:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cssystem/pojo/param/AppVersionParam.java | 3 ++ .../com/njcn/cssystem/pojo/po/AppVersion.java | 6 +++- .../njcn/cssystem/pojo/vo/AppVersionVo.java | 1 - .../baseinfo/AppVersionController.java | 29 +++++++++++++------ .../cssystem/service/IAppVersionService.java | 6 +++- .../service/impl/AppVersionServiceImpl.java | 16 +++++++++- 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java index 453f8ac..d749d51 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java @@ -24,5 +24,8 @@ public class AppVersionParam implements Serializable { @ApiModelProperty("整改内容") private String content; + @ApiModelProperty("版本类型 APP WEB") + @NotNull(message = "版本类型不能为空") + private String versionType; } diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java index 7d863fe..5ccf4f7 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java @@ -1,7 +1,6 @@ package com.njcn.cssystem.pojo.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; import lombok.Getter; import lombok.Setter; @@ -44,6 +43,11 @@ public class AppVersion extends BaseEntity implements Serializable { */ private Integer sev; + /** + * 版本类型 APP Web + */ + private String versionType; + /** * 修改内容 */ diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java index 46cd4ce..15c9594 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java @@ -22,5 +22,4 @@ public class AppVersionVo implements Serializable { @ApiModelProperty("严重度(0:优化 1:bug调整)") private Integer sev; - } diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java index 6944bc9..ffee4bc 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java @@ -7,6 +7,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.cssystem.pojo.param.AppVersionParam; +import com.njcn.cssystem.pojo.po.AppVersion; import com.njcn.cssystem.pojo.vo.AppVersionVo; import com.njcn.cssystem.service.IAppVersionService; import com.njcn.web.controller.BaseController; @@ -16,10 +17,9 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** *

@@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @Slf4j @RequestMapping("/appVersion") -@Api(tags = "app版本信息") +@Api(tags = "版本信息") @AllArgsConstructor public class AppVersionController extends BaseController { @@ -40,7 +40,7 @@ public class AppVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/add") - @ApiOperation("新增app版本信息") + @ApiOperation("新增版本信息") @ApiImplicitParam(name = "param", value = "app版本信息", required = true) public HttpResult add(@RequestBody @Validated AppVersionParam param){ String methodDescribe = getMethodDescribe("add"); @@ -54,12 +54,23 @@ public class AppVersionController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getLastData") - @ApiOperation("查询app最新版本信息") - public HttpResult getLastData(){ + @ApiOperation("查询最新版本信息") + @ApiImplicitParam(name = "versionType", value = "版本类型(APP WEB)", required = true) + public HttpResult getLastData(@RequestParam("versionType") String versionType){ String methodDescribe = getMethodDescribe("getLastData"); - AppVersionVo vo = appVersionService.getLastData(); + AppVersionVo vo = appVersionService.getLastData(versionType); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getAllData") + @ApiOperation("查询所有版本信息") + @ApiImplicitParam(name = "versionType", value = "版本类型(APP WEB)") + public HttpResult< List> getAllData(@RequestParam(value = "versionType",required = false) String versionType){ + String methodDescribe = getMethodDescribe("getAllData"); + List list = appVersionService.getAllData(versionType); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); + } + } diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java index c98bbd4..de5121f 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java @@ -5,6 +5,8 @@ import com.njcn.cssystem.pojo.param.AppVersionParam; import com.njcn.cssystem.pojo.po.AppVersion; import com.njcn.cssystem.pojo.vo.AppVersionVo; +import java.util.List; + /** *

* 服务类 @@ -17,5 +19,7 @@ public interface IAppVersionService extends IService { boolean add(AppVersionParam param); - AppVersionVo getLastData(); + AppVersionVo getLastData(String versionType); + + List getAllData(String versionType); } diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java index 7298dce..f638841 100644 --- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java @@ -11,6 +11,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; import java.util.Objects; /** @@ -30,14 +32,16 @@ public class AppVersionServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppVersion::getVersionType, versionType); queryWrapper.orderByDesc(AppVersion::getPublishTime).last("limit 1"); AppVersion appVersion = this.getOne(queryWrapper); if (Objects.nonNull(appVersion)) { @@ -45,4 +49,14 @@ public class AppVersionServiceImpl extends ServiceImpl getAllData(String versionType) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (Objects.nonNull(versionType)) { + queryWrapper.eq(AppVersion::getVersionType, versionType); + } + queryWrapper.orderByDesc(AppVersion::getPublishTime); + return this.list(queryWrapper); + } }