Commit 9aa9c9ba by shenjunjie

Merge branch 'feature' into 'release'

Feature

See merge request !185
parents ad4b9440 eb7f9e2e
package com.zhiwei.brandkbs2.pojo.dto;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -81,13 +80,13 @@ public class SearchFilterDTO {
* 来源
*/
@ApiModelProperty(value = "来源")
private String source;
private String sourceKeyword;
/**
* 域名
*/
@ApiModelProperty(value = "域名")
private String host;
private String hostKeyword;
/**
* 过滤关键字
......@@ -133,8 +132,8 @@ public class SearchFilterDTO {
map.put("search", search);
map.put("startTime", startTime);
map.put("endTime", endTime);
map.put("source", source);
map.put("url",host);
map.put("source", sourceKeyword);
map.put("url", hostKeyword);
map.put("sort", Objects.nonNull(sorter) ? sorter : "DESC");
map.put("page", page);
map.put("pageSize", pageSize);
......@@ -142,7 +141,6 @@ public class SearchFilterDTO {
map.put("sensitiveChannels", sensitiveChannels);
map.put("fans", fans);
map.put("filterType", filterType);
System.out.println("map:"+ JSON.toJSONString(map));
return map;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment