|
|
@@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
|
+import vip.xiaonuo.common.util.PinyinUtils;
|
|
|
import vip.xiaonuo.disk.domain.KeyWord;
|
|
|
import vip.xiaonuo.disk.mapper.KeyWordMapper;
|
|
|
import vip.xiaonuo.disk.param.KeyWordAddParam;
|
|
|
@@ -48,8 +49,11 @@ public class KeyWordServiceImpl extends ServiceImpl<KeyWordMapper, KeyWord> impl
|
|
|
@Override
|
|
|
public Page<KeyWord> page(KeyWordPageParam keyWordPageParam) {
|
|
|
QueryWrapper<KeyWord> queryWrapper = new QueryWrapper<>();
|
|
|
- if(ObjectUtil.isNotEmpty(keyWordPageParam.getSearchKey())) {
|
|
|
- queryWrapper.lambda().like(KeyWord::getWordName, keyWordPageParam.getSearchKey());
|
|
|
+ if(ObjectUtil.isNotEmpty(keyWordPageParam.getWordName())) {
|
|
|
+ queryWrapper.lambda().like(KeyWord::getWordName, keyWordPageParam.getWordName());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(keyWordPageParam.getWordPy())) {
|
|
|
+ queryWrapper.lambda().like(KeyWord::getWordPy, keyWordPageParam.getWordPy());
|
|
|
}
|
|
|
if(ObjectUtil.isAllNotEmpty(keyWordPageParam.getSortField(), keyWordPageParam.getSortOrder())) {
|
|
|
CommonSortOrderEnum.validate(keyWordPageParam.getSortOrder());
|
|
|
@@ -65,6 +69,7 @@ public class KeyWordServiceImpl extends ServiceImpl<KeyWordMapper, KeyWord> impl
|
|
|
@Override
|
|
|
public void add(KeyWordAddParam keyWordAddParam) {
|
|
|
KeyWord keyWord = BeanUtil.toBean(keyWordAddParam, KeyWord.class);
|
|
|
+ keyWord.setWordPy(PinyinUtils.toPinyin(keyWordAddParam.getWordName()));
|
|
|
this.save(keyWord);
|
|
|
}
|
|
|
|
|
|
@@ -73,6 +78,7 @@ public class KeyWordServiceImpl extends ServiceImpl<KeyWordMapper, KeyWord> impl
|
|
|
public void edit(KeyWordEditParam keyWordEditParam) {
|
|
|
KeyWord keyWord = this.queryEntity(keyWordEditParam.getId());
|
|
|
BeanUtil.copyProperties(keyWordEditParam, keyWord);
|
|
|
+ keyWord.setWordPy(PinyinUtils.toPinyin(keyWordEditParam.getWordName()));
|
|
|
this.updateById(keyWord);
|
|
|
}
|
|
|
|
|
|
@@ -100,6 +106,7 @@ public class KeyWordServiceImpl extends ServiceImpl<KeyWordMapper, KeyWord> impl
|
|
|
@Override
|
|
|
public List<KeyWord> select() {
|
|
|
QueryWrapper<KeyWord> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.lambda().like(KeyWord::getPopular,"1");
|
|
|
queryWrapper.lambda().orderByAsc(KeyWord::getId);
|
|
|
return keyWordMapper.selectList(queryWrapper);
|
|
|
}
|