pans 8 месяцев назад
Родитель
Сommit
443a922e55

+ 1 - 1
snowy-base/snowy-common/src/main/java/vip/xiaonuo/common/util/PinyinUtils.java

@@ -42,7 +42,7 @@ public class PinyinUtils {
                 try {
                     String[] pinyins = PinyinHelper.toHanyuPinyinStringArray(ch, FORMAT);
                     if (pinyins != null && pinyins.length > 0) {
-                        sb.append(pinyins[0]).append(" ");
+                        sb.append(pinyins[0]).append("");
                     }
                 } catch (Exception e) {
                     sb.append(ch);

+ 8 - 1
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/KeyWord.java

@@ -43,7 +43,11 @@ public class KeyWord extends CommonEntity {
      */
     @ApiModelProperty(value = "名称", position = 2)
     private String wordName;
-
+    /**
+     * 拼音
+     */
+    @ApiModelProperty(value = "名称", position = 2)
+    private String wordPy;
     /**
      * 是否热门  1 热门 0不热门
      */
@@ -51,4 +55,7 @@ public class KeyWord extends CommonEntity {
     private String popular;
 
 
+
+
+
 }

+ 1 - 0
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/KeyWordEditParam.java

@@ -37,6 +37,7 @@ public class KeyWordEditParam {
     @ApiModelProperty(value = "名称", position = 2)
     private String wordName;
 
+
     /** 是否热门  1 热门 0不热门 */
     @ApiModelProperty(value = "是否热门  1 热门 0不热门", position = 3)
     private String popular;

+ 10 - 5
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/KeyWordPageParam.java

@@ -41,9 +41,14 @@ public class KeyWordPageParam {
     /** 排序方式 */
     @ApiModelProperty(value = "排序方式,升序:ASCEND;降序:DESCEND")
     private String sortOrder;
-
-    /** 关键词 */
-    @ApiModelProperty(value = "关键词")
-    private String searchKey;
-
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称", position = 2)
+    private String wordName;
+    /**
+     * 拼音
+     */
+    @ApiModelProperty(value = "拼音", position = 2)
+    private String wordPy;
 }

+ 9 - 2
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/KeyWordServiceImpl.java

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