From aef4dc8342ee56f7b261f88c69ae13dd42cce168 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Thu, 14 Sep 2023 15:52:35 +0800 Subject: [PATCH] =?UTF-8?q?1.Pda=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/dto/AppPdaversionDTO.java | 7 +++ .../system/entity/PdaversionManageEntity.java | 5 +++ .../system/api/AppPdaversionController.java | 43 ++++++++----------- .../system/mapper/PdaversionManageMapper.java | 4 +- .../system/mapper/PdaversionManageMapper.xml | 7 +-- .../service/IPdaversionManageService.java | 2 +- .../impl/PdaversionManageServiceImpl.java | 25 +++++++---- 7 files changed, 52 insertions(+), 41 deletions(-) diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/AppPdaversionDTO.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/AppPdaversionDTO.java index 80c8b56f..d87d59a0 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/AppPdaversionDTO.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/AppPdaversionDTO.java @@ -41,5 +41,12 @@ public class AppPdaversionDTO extends PdaversionManageEntity { */ @ApiModelProperty(value = "租户id") private Long betenantId; + /** + * 租户Code + */ + @ApiModelProperty(value = "租户Code") + private Long betenantCode; + + } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/PdaversionManageEntity.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/PdaversionManageEntity.java index b3ef54a1..d5263ec2 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/PdaversionManageEntity.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/PdaversionManageEntity.java @@ -106,5 +106,10 @@ public class PdaversionManageEntity extends TenantEntity { */ @ApiModelProperty(value = "跟新类型(1-整包更新,2-补丁更新)") private String newTypes; + /** + * 版本类型（1-开发版本,2-测试版本,3-正式版本） + */ + @ApiModelProperty(value = "版本类型（1-开发版本,2-测试版本,3-正式版本）") + private String versionType; } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java b/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java index 010ae19e..5076b0c8 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/api/AppPdaversionController.java @@ -16,38 +16,26 @@ */ package org.springblade.system.api; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; + import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; + import lombok.AllArgsConstructor; import org.springblade.core.boot.ctrl.BladeController; -import org.springblade.core.excel.util.ExcelUtil; -import org.springblade.core.mp.support.Condition; -import org.springblade.core.mp.support.Query; -import org.springblade.core.secure.BladeUser; + import org.springblade.core.tool.api.R; -import org.springblade.core.tool.constant.BladeConstant; -import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.StringUtil; + import org.springblade.system.dto.AppPdaversionDTO; -import org.springblade.system.dto.PdaversionManageDTO; -import org.springblade.system.entity.PdaversionManageEntity; -import org.springblade.system.excel.PdaversionManageExcel; + import org.springblade.system.service.IPdaversionManageService; -import org.springblade.system.vo.AppPdaversionVO; -import org.springblade.system.vo.PdaversionManageVO; -import org.springblade.system.wrapper.PdaversionManageWrapper; + import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; -import javax.servlet.http.HttpServletResponse; + + import javax.validation.Valid; -import java.util.List; -import java.util.Map; + /** * pda版本管理 控制器 @@ -66,15 +54,18 @@ public class AppPdaversionController extends BladeController { /** * pda版本查询 */ - @GetMapping("/detail") + @PostMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "pda版本查询", notes = "传入pdaversionManage") - public R detail(AppPdaversionDTO appPdaversionDTO) { - if (null == appPdaversionDTO.getBetenantId()){ + public R detail(@Valid @RequestBody AppPdaversionDTO appPdaversionDTO) { + if (null == appPdaversionDTO.getBetenantCode() ){ + return R.success("无可用更新"); + } + if ( null == appPdaversionDTO.getVersionCode() || null == appPdaversionDTO.getVersionType()){ return R.fail("参数不全"); } - AppPdaversionVO detail = pdaversionManageService.getPdaVersion(appPdaversionDTO); - return R.data(detail); + R msg = pdaversionManageService.getPdaVersion(appPdaversionDTO); + return msg; } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.java index 263432aa..77fb7515 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.java @@ -56,8 +56,8 @@ public interface PdaversionManageMapper extends BaseMapper diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IPdaversionManageService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IPdaversionManageService.java index 89c37e88..f3d3e49b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IPdaversionManageService.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IPdaversionManageService.java @@ -66,5 +66,5 @@ public interface IPdaversionManageService extends BaseService().lambda().eq(PdaversionTenantEntity::getMasterId,pdaversionManageDTO.getId())); this.savePdaversionTenant(pdaversionManageDTO.getTenantIds(),pdaversionManageDTO.getId()); @@ -113,10 +113,16 @@ public class PdaversionManageServiceImpl extends BaseServiceImpl().lambda() .eq(PdaversionManageEntity::getVersionCode, versionCode) + .eq(PdaversionManageEntity::getVersionType,versionType) .eq(PdaversionManageEntity::getIsDeleted,0) );