1.Pda版本

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;
+
+
 
 }

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

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) {
+	public R detail(@Valid @RequestBody AppPdaversionDTO appPdaversionDTO) {
-		if (null == appPdaversionDTO.getBetenantId()){
+		if (null == appPdaversionDTO.getBetenantCode() ){
+			return R.success("无可用更新");
+		}
+		if ( null == appPdaversionDTO.getVersionCode() || null == appPdaversionDTO.getVersionType()){
 				return R.fail("参数不全");
 		}
-		AppPdaversionVO detail = pdaversionManageService.getPdaVersion(appPdaversionDTO);
+		R msg = pdaversionManageService.getPdaVersion(appPdaversionDTO);
-		return R.data(detail);
+		return msg;
 	}
 
 

blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.java

@@ -56,8 +56,8 @@ public interface PdaversionManageMapper extends BaseMapper<PdaversionManageEntit
 	/**
 	 * 查询该租户最新版本的包
 	 *
-	 * @param betenantId
+	 * @param betenantCode
 	 * @return
 	 */
-    AppPdaversionVO selectPdaVersionByTenantId(@Param("betenantId") Long betenantId);
+    AppPdaversionVO selectPdaVersionByTenantId(@Param("betenantCode") Long betenantCode,@Param("versionType") String versionType);
 }

blade-service/blade-system/src/main/java/org/springblade/system/mapper/PdaversionManageMapper.xml

@@ -43,10 +43,11 @@
             blade_pdaversion_tenant bpt
                 JOIN blade_pdaversion_manage bpm ON bpt.master_id = bpm.id
         WHERE
-        bpm.release_time <= now() and bpm.betenant_id =#{betenantId}
+        bpm.release_time <= now() and bpt.betenant_code =#{betenantCode} and bpm.version_type = #{versionType}
         ORDER BY
-            bpm.version_code DESC,
+                SUBSTRING_INDEX(SUBSTRING_INDEX(bpm.version_name, '.', 1), '.', 1) + 0 desc,
-            bpm.create_time DESC
+                SUBSTRING_INDEX(SUBSTRING_INDEX(bpm.version_name, '.', 2), '.', 1) + 0 desc,
+                SUBSTRING_INDEX(SUBSTRING_INDEX(bpm.version_name, '.', 2), '.', -1) + 0 desc
             LIMIT 1
     </select>
 

blade-service/blade-system/src/main/java/org/springblade/system/service/IPdaversionManageService.java

@@ -66,5 +66,5 @@ public interface IPdaversionManageService extends BaseService<PdaversionManageEn
 	 * @param appPdaversionDTO
 	 * @return
 	 */
-	AppPdaversionVO getPdaVersion(AppPdaversionDTO appPdaversionDTO);
+	R getPdaVersion(AppPdaversionDTO appPdaversionDTO);
 }

blade-service/blade-system/src/main/java/org/springblade/system/service/impl/PdaversionManageServiceImpl.java

@@ -81,8 +81,8 @@ public class PdaversionManageServiceImpl extends BaseServiceImpl<PdaversionManag
 //			return false;
 //		}
 		//判断是否重复
-		if (this.IsRepeat(pdaversionManageDTO.getVersionCode())){
+		if (this.IsRepeat(pdaversionManageDTO.getVersionCode(),pdaversionManageDTO.getVersionType())){
-			return R.fail("有重复版本号");
+			return R.fail("当前版本类型有重复版本号");
 		}
 		//存入
 		boolean b = this.save(pdaversionManageDTO);
@@ -94,9 +94,9 @@ public class PdaversionManageServiceImpl extends BaseServiceImpl<PdaversionManag
 	@Override
 	public R updateCustom(PdaversionManageDTO pdaversionManageDTO) {
 		//判断是否重复
-		if (this.IsRepeat(pdaversionManageDTO.getVersionCode())){
+//		if (this.IsRepeat(pdaversionManageDTO.getVersionCode())){
-			return R.fail("有重复版本号");
+//			return R.fail("有重复版本号");
-		}
+//		}
 		//修改中间表
 		pdaversionTenantMapper.delete(new QueryWrapper<PdaversionTenantEntity>().lambda().eq(PdaversionTenantEntity::getMasterId,pdaversionManageDTO.getId()));
 		this.savePdaversionTenant(pdaversionManageDTO.getTenantIds(),pdaversionManageDTO.getId());
@@ -113,10 +113,16 @@ public class PdaversionManageServiceImpl extends BaseServiceImpl<PdaversionManag
 	}
 
 	@Override
-	public AppPdaversionVO getPdaVersion(AppPdaversionDTO appPdaversionDTO) {
+	public R getPdaVersion(AppPdaversionDTO appPdaversionDTO) {
 		//查询该租户最新版本的包
-		AppPdaversionVO appPdaversionVO = baseMapper.selectPdaVersionByTenantId(appPdaversionDTO.getBetenantId());
+		AppPdaversionVO appPdaversionVO = baseMapper.selectPdaVersionByTenantId(appPdaversionDTO.getBetenantCode(),appPdaversionDTO.getVersionType());
-		return appPdaversionVO;
+		if (null == appPdaversionVO){
+			return R.success("当前租户无Pda可用版本");
+		}
+		if (appPdaversionVO.getVersionCode()<=appPdaversionDTO.getVersionCode()){
+			return R.success("当前已经是最新版本");
+		}
+		return R.data(appPdaversionVO) ;
 	}
 
 
@@ -138,10 +144,11 @@ public class PdaversionManageServiceImpl extends BaseServiceImpl<PdaversionManag
 			pdaversionTenantService.saveBatch(arrayList);
 		}
 	}
-	public Boolean IsRepeat(Integer versionCode){
+	public Boolean IsRepeat(Integer versionCode,String versionType){
 		//查询当前code是否和数据库里的重复
 		Long aLong = baseMapper.selectCount(new QueryWrapper<PdaversionManageEntity>().lambda()
 			.eq(PdaversionManageEntity::getVersionCode, versionCode)
+				.eq(PdaversionManageEntity::getVersionType,versionType)
 			.eq(PdaversionManageEntity::getIsDeleted,0)
 		);