From 40042d3b78ba2135c5f4cf0fe1b983dbf2e52e63 Mon Sep 17 00:00:00 2001 From: zhangyx <1254353766@qq.com> Date: Wed, 21 Apr 2021 15:55:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=80=E4=BD=8E=E6=9C=80=E9=AB=98=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TemplateWarehouseController.java | 25 +++++++++-- .../dao/ClientVersionCheckMapper.java | 10 +++++ .../dao/mapper/BizBidClientVersionMapper.xml | 1 + .../dao/mapper/ClientVersionCheckMapper.xml | 12 +++++ .../entity/BizBidClientVersion.java | 13 ++++-- .../entity/ClientVersionCheck.java | 44 +++++++++++++++++++ .../sevice/ClientVersionCheckService.java | 16 +++++++ .../impl/ClientVersionCheckServiceImpl.java | 18 ++++++++ 8 files changed, 132 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/ClientVersionCheckMapper.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/ClientVersionCheckMapper.xml create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/ClientVersionCheck.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/ClientVersionCheckService.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/ClientVersionCheckServiceImpl.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java index e1a3ac4..d70b52f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/controller/TemplateWarehouseController.java @@ -1,20 +1,19 @@ package com.chinaunicom.mall.ebtp.extend.templatewarehouse.controller; import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; -import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidClientVersion; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.BizBidTemplateWarehouse; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.BizBidClientVersionService; import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.BizBidTemplateWarehouseService; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.ClientVersionCheckService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.io.ByteArrayOutputStream; -import java.io.FileOutputStream; import java.io.IOException; +import java.util.List; @RestController @Api(tags = "模板仓库") @@ -24,6 +23,8 @@ public class TemplateWarehouseController { private BizBidTemplateWarehouseService templateWarehouseService; @Resource private BizBidClientVersionService bizBidClientVersionService; + @Resource + private ClientVersionCheckService clientVersionCheckService; /** * 通过模板类型查询模板数据 @@ -79,4 +80,20 @@ public class TemplateWarehouseController { bizBidClientVersionService.getClientByVersion(version); return BaseResponse.success(); } + + + /** + * 通过版本号获得对应客户端文件id + * + * @return + */ + @ApiOperation("查询最低最高版本号") + @GetMapping("/client/check") + public BaseResponse getClientByVersion() { + List checkList = clientVersionCheckService.list(); + if (checkList.isEmpty()){ + return BaseResponse.fail(new ClientVersionCheck()); + } + return BaseResponse.success(checkList.get(0)); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/ClientVersionCheckMapper.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/ClientVersionCheckMapper.java new file mode 100644 index 0000000..3a6fd5a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/ClientVersionCheckMapper.java @@ -0,0 +1,10 @@ +package com.chinaunicom.mall.ebtp.extend.templatewarehouse.dao; + + +import com.chinaunicom.mall.ebtp.common.base.dao.IBaseMapper; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck; + +public interface ClientVersionCheckMapper extends IBaseMapper { + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml index 3195b5a..af1178d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/BizBidClientVersionMapper.xml @@ -7,6 +7,7 @@ + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/ClientVersionCheckMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/ClientVersionCheckMapper.xml new file mode 100644 index 0000000..68cf42d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/dao/mapper/ClientVersionCheckMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java index dd5bcf1..836e5cb 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/BizBidClientVersion.java @@ -35,11 +35,18 @@ public class BizBidClientVersion implements Serializable { private String id; /** - * 文档中心-文档ID - */ - @ApiModelProperty(value = "文档中心-文档ID") + * 客户端对应文档中心-文档ID + */ + @ApiModelProperty(value = "客户端对应文档中心-文档ID") private String documentCenterId; + /** + * 配置文件对应文档中心-文档ID + */ + @ApiModelProperty(value = "配置文件对应文档中心-文档ID") + private String configDocumentId; + + /** * ipass客户端版本号 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/ClientVersionCheck.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/ClientVersionCheck.java new file mode 100644 index 0000000..002f132 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/entity/ClientVersionCheck.java @@ -0,0 +1,44 @@ +package com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 ClientVersionCheck + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +@TableName(value = "client_version_check", autoResultMap = true) +public class ClientVersionCheck extends BaseEntity implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 新版本客户端版本号 + */ + @ApiModelProperty(value = "新版本客户端版本号") + private String newVersion; + + /** + * 旧版本客户端版本号 + */ + @ApiModelProperty(value = "旧版本客户端版本号") + private String oldVersion; + + /** + * 状态 是否启用校验 1-启用，2-不启用 + */ + @ApiModelProperty(value = "状态 是否启用校验 1-启用，2-不启用") + private Integer status; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/ClientVersionCheckService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/ClientVersionCheckService.java new file mode 100644 index 0000000..a4d4381 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/ClientVersionCheckService.java @@ -0,0 +1,16 @@ +package com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice; + + +import com.chinaunicom.mall.ebtp.common.base.service.IBaseService; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck; + +/** + * 对数据表 client_version_check 操作的 service + * @author Auto create + * + */ +public interface ClientVersionCheckService extends IBaseService{ + + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/ClientVersionCheckServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/ClientVersionCheckServiceImpl.java new file mode 100644 index 0000000..87378b0 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/templatewarehouse/sevice/impl/ClientVersionCheckServiceImpl.java @@ -0,0 +1,18 @@ +package com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.impl; + + +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.dao.ClientVersionCheckMapper; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.entity.ClientVersionCheck; +import com.chinaunicom.mall.ebtp.extend.templatewarehouse.sevice.ClientVersionCheckService; +import org.springframework.stereotype.Service; +import com.chinaunicom.mall.ebtp.common.base.service.impl.BaseServiceImpl; +/** + * 对数据表 client_version_check 操作的 serviceImpl + * @author Auto create + * + */ +@Service +public class ClientVersionCheckServiceImpl extends BaseServiceImpl implements ClientVersionCheckService { + + +}