refactor(promotion): 将装修模板接口参数从type改为platform
- 修改AppDiyTemplateController中getUsedDiyTemplate方法参数名从type改为platform - 更新DiyTemplateMapper中相关方法参数命名和注释 - 调整selectAppByUsed方法中参数名称和逻辑注释 - 修改DiyTemplateService接口中方法参数命名 - 更新DiyTemplateServiceImpl实现类中方法参数名称pull/227/head
parent
4dcefa7298
commit
453ce470ed
|
|
@ -38,10 +38,11 @@ public class AppDiyTemplateController {
|
|||
// TODO @疯狂:要不要把 used 和 get 接口合并哈;不传递 id,直接拿默认;
|
||||
@GetMapping("/used")
|
||||
@Operation(summary = "使用中的装修模板")
|
||||
@Parameter(name = "type", description = "装修模板类型", example = "1024")
|
||||
@Parameter(name = "platform", description = "装修模板平台", example = "1024")
|
||||
@PermitAll
|
||||
public CommonResult<AppDiyTemplatePropertyRespVO> getUsedDiyTemplate(@RequestParam(value = "type", required = false) String type) {
|
||||
DiyTemplateDO diyTemplate = diyTemplateService.getUsedDiyTemplate(type);
|
||||
public CommonResult<AppDiyTemplatePropertyRespVO> getUsedDiyTemplate(@RequestParam(value = "platform",
|
||||
required = false) String platform) {
|
||||
DiyTemplateDO diyTemplate = diyTemplateService.getUsedDiyTemplate(platform);
|
||||
return success(buildVo(diyTemplate));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,19 +31,19 @@ public interface DiyTemplateMapper extends BaseMapperX<DiyTemplateDO> {
|
|||
default DiyTemplateDO selectByUsed(boolean used) {
|
||||
return selectOne(DiyTemplateDO::getUsed, used);
|
||||
}
|
||||
default DiyTemplateDO selectByUsed(boolean used, String type) {
|
||||
return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getPlatform, type);
|
||||
default DiyTemplateDO selectByUsed(boolean used, String platform) {
|
||||
return selectOne(DiyTemplateDO::getUsed, used, DiyTemplateDO::getPlatform, platform);
|
||||
}
|
||||
|
||||
default DiyTemplateDO selectAppByUsed(boolean used, String type) {
|
||||
// 1. 没传类型查默认类型,默认类型找不到,取最近一次使用的模板
|
||||
if (ObjectUtil.isEmpty(type)) {
|
||||
DiyTemplateDO defaultTemplate = selectByUsed(used, DiyTemplatePlatformEnum.DEFAULT.getPlatform());
|
||||
return ObjectUtil.isNotEmpty(defaultTemplate) ? defaultTemplate : lastUsedTemplate(true);
|
||||
default DiyTemplateDO selectAppByUsed(boolean used, String platform) {
|
||||
// 1. 没传值找默认,没找到,取最近一次使用的模板
|
||||
if (ObjectUtil.isNull(platform)) {
|
||||
DiyTemplateDO defaultDiyTemplate = selectByUsed(used, DiyTemplatePlatformEnum.DEFAULT.getPlatform());
|
||||
return ObjectUtil.isNotEmpty(defaultDiyTemplate) ? defaultDiyTemplate : lastUsedTemplate(true);
|
||||
}
|
||||
// 2. 传了类型根据类型查询,没找到,取默认类型
|
||||
DiyTemplateDO typedTemplate = selectByUsed(used, type);
|
||||
return ObjectUtil.isNotEmpty(typedTemplate) ? typedTemplate : selectByUsed(true, DiyTemplatePlatformEnum.DEFAULT.getPlatform());
|
||||
// 2. 有传值,没找到,取默认
|
||||
DiyTemplateDO diyTemplate = selectByUsed(used, platform);
|
||||
return ObjectUtil.isNotEmpty(diyTemplate) ? diyTemplate : selectByUsed(true, DiyTemplatePlatformEnum.DEFAULT.getPlatform());
|
||||
}
|
||||
|
||||
default DiyTemplateDO lastUsedTemplate(boolean used) {
|
||||
|
|
|
|||
|
|
@ -72,6 +72,6 @@ public interface DiyTemplateService {
|
|||
*
|
||||
* @return 装修模板
|
||||
*/
|
||||
DiyTemplateDO getUsedDiyTemplate(String type);
|
||||
DiyTemplateDO getUsedDiyTemplate(String platform);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -164,8 +164,8 @@ public class DiyTemplateServiceImpl implements DiyTemplateService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public DiyTemplateDO getUsedDiyTemplate(String type) {
|
||||
return diyTemplateMapper.selectAppByUsed(true, type);
|
||||
public DiyTemplateDO getUsedDiyTemplate(String platform) {
|
||||
return diyTemplateMapper.selectAppByUsed(true, platform);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue