7c62fea9 by chentao

优化搜索

1 parent b26e7ad0
......@@ -2,6 +2,9 @@ package com.lego.core.domin.bo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 广告请求对象 core_advert
*
......@@ -20,11 +23,14 @@ public class AdvertBo extends BaseBO {
/**
* 广告名称
*/
@NotBlank(message = "广告名称不能为空")
@Size(min = 0, max = 50, message = "广告名称长度不能超过{max}个字符")
private String name;
/**
* 排序
*/
@Size(min = 0, max = 10, message = "排序不能超过{max}位数字")
private Long sort;
/**
......
......@@ -2,6 +2,9 @@ package com.lego.core.domin.bo;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 课程请求对象 core_course
*
......@@ -25,6 +28,8 @@ public class CourseBo extends BaseBO {
/**
* 课程名称
*/
@NotBlank(message = "课程名称不能为空")
@Size(min = 0, max = 50, message = "课程名称长度不能超过{max}个字符")
private String name;
/**
......
......@@ -3,6 +3,9 @@ package com.lego.core.domin.bo;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
/**
* 套件请求对象
*
......@@ -21,16 +24,20 @@ public class EntiretyBo extends BaseBO {
/**
* 套件名称
*/
@NotBlank(message = "套件名称不能为空")
@Size(min = 0, max = 50, message = "套件名称长度不能超过{max}个字符")
private String name;
/**
* 排序
*/
@Size(min = 0, max = 10, message = "排序不能超过{max}位数字")
private Long sort;
/**
* 类型(0词语 1图标 )
*/
@NotBlank(message = "类别不能为空")
private String type;
/**
......
......@@ -53,7 +53,7 @@ public class BuildingBlockServiceImpl implements IBuildingBlockService {
@Override
public TableDataInfo<BuildingBlockVo> listPage(BuildingBlockQueryBo queryBo, String language) {
Page<BuildingBlockVo> page = baseMapper.selectVoPage(queryBo.build(), Wrappers.<BuildingBlock>lambdaQuery()
.eq(StrUtil.isNotBlank(queryBo.getSearchKey()), BuildingBlock::getName, queryBo.getSearchKey())
.like(StrUtil.isNotBlank(queryBo.getSearchKey()), BuildingBlock::getName, queryBo.getSearchKey())
.eq(BuildingBlock::getLanguage, language));
setInfo(page.getRecords());
return TableDataInfo.build(page);
......
......@@ -52,7 +52,7 @@ public class CourseServiceImpl implements ICourseService {
@Override
public TableDataInfo<CourseVo> listPage(CourseQueryBo query, String language) {
Page<CourseVo> page = baseMapper.selectVoPage(query.build(),
Wrappers.<Course>lambdaQuery().eq(StrUtil.isNotBlank(query.getSearchKey()), Course::getName, query.getSearchKey())
Wrappers.<Course>lambdaQuery().like(StrUtil.isNotBlank(query.getSearchKey()), Course::getName, query.getSearchKey())
.eq(Course::getLanguage, language));
List<CourseVo> list = page.getRecords();
if (ObjectUtil.isNotEmpty(list)) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!