jtoms 4 gadi atpakaļ
vecāks
revīzija
2803b5e9ac

+ 1 - 1
src/main/java/com/zhiqiyun/open/core/models/statistics/PopularFeelings.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @TableName(value = "popular_feelings")
 public class PopularFeelings {
     private Long id;
-    private String brief;
+    private String title;
     private String keywords;
     private String siteUrl;
 

+ 13 - 0
src/main/java/com/zhiqiyun/open/mvc/controller/PopularFeelingsController.java

@@ -14,6 +14,7 @@ import com.zhiqiyun.open.mvc.params.statistics.QueryPopularFeelingsParam;
 import com.zhiqiyun.open.mvc.params.statistics.SavePopularFeelingsParam;
 import com.zhiqiyun.open.utils.DateUtil;
 import com.zhiqiyun.open.utils.ServletContext;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,6 +48,18 @@ public class PopularFeelingsController {
 
         QueryWrapper<PopularFeelings> wrapper = new QueryWrapper<>();
 
+        if (StringUtils.isNotBlank(param.getTitle())) {
+            wrapper.like("title", param.getTitle());
+        }
+
+        if (StringUtils.isNotBlank(param.getKeywords())) {
+            wrapper.like("keywords", param.getKeywords());
+        }
+
+        if (StringUtils.isNotBlank(param.getSiteUrl())) {
+            wrapper.like("site_url", param.getSiteUrl());
+        }
+
         Page<PopularFeelings> page = param.getPage();
         page.addOrder(OrderItem.desc("id"));
 

+ 7 - 0
src/main/java/com/zhiqiyun/open/mvc/params/statistics/QueryPopularFeelingsParam.java

@@ -1,9 +1,16 @@
 package com.zhiqiyun.open.mvc.params.statistics;
 
 import com.zhiqiyun.open.mvc.params.QueryPageParams;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * @author jtoms
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class QueryPopularFeelingsParam extends QueryPageParams {
+    private String title;
+    private String keywords;
+    private String siteUrl;
 }

+ 1 - 1
src/main/java/com/zhiqiyun/open/mvc/params/statistics/SavePopularFeelingsParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
  */
 @Data
 public class SavePopularFeelingsParam {
-    private String brief;
+    private String title;
     private String keywords;
     private String siteUrl;
 }

+ 1 - 1
src/main/resources/db/migration/V1.0.7__popular_feelings.sql

@@ -11,7 +11,7 @@ DROP TABLE IF EXISTS `popular_feelings`;
 CREATE TABLE `popular_feelings`
 (
     `id`           BIGINT(20) NOT NULL COMMENT 'ID',
-    `brief`        VARCHAR(50) NOT NULL COMMENT '备注说明',
+    `title`        VARCHAR(50) NOT NULL COMMENT '标题',
     `keywords`     VARCHAR(50) NOT NULL COMMENT '监控关键词',
     `site_url`     VARCHAR(50) NOT NULL COMMENT '网站URL',
     `created_time` DATETIME NULL DEFAULT NULL COMMENT '创建时间',