Merge branch 'feature' into 'dev'

Feature

See merge request !27

src/main/java/com/zhiwei/brandkbs2/controller/app/AppContendController.java

@@ -9,15 +9,12 @@ import com.zhiwei.brandkbs2.pojo.dto.ExportAppYuqingDTO;
 import com.zhiwei.brandkbs2.pojo.dto.MarkSearchDTO;
 import com.zhiwei.brandkbs2.service.MarkDataService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.text.ParseException;
 import java.util.List;
 
 /**
@@ -43,7 +40,7 @@ public class AppContendController extends BaseController {
 
     @ApiOperation("竞品库-竞品舆情-搜索结果列表")
     @PostMapping("/list")
-    public ResponseResult getContendSearchList(@RequestBody MarkSearchDTO markSearchDTO) throws IOException {
+    public ResponseResult getContendSearchList(@RequestBody MarkSearchDTO markSearchDTO){
         return ResponseResult.success(markDataService.getContendSearchList(markSearchDTO));
     }
 

src/main/java/com/zhiwei/brandkbs2/pojo/dto/SearchFilterDTO.java

+package com.zhiwei.brandkbs2.pojo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("全网搜搜索传输类")
+public class SearchFilterDTO {
+
+    /**
+     * 项目Id
+     */
+    @ApiModelProperty(value = "项目id")
+    private String projectId;
+
+    /**
+     * 开始时间戳
+     */
+    @ApiModelProperty(value = "开始时间")
+    private Long startTime;
+
+    /**
+     * 结束时间戳
+     */
+    @ApiModelProperty("结束时间")
+    private Long endTime;
+
+    /**
+     * 页码
+     */
+    @ApiModelProperty("页码")
+    private int page;
+
+    /**
+     * 大小
+     */
+    @ApiModelProperty("每页记录数")
+    private int pageSize;
+
+    /**
+     * 关键字
+     */
+    @ApiModelProperty(value = "关键字")
+    private String keyword;
+
+    /**
+     * 平台
+     */
+    @ApiModelProperty(value = "平台")
+    private List<String> platforms;
+
+    /**
+     * 平台(真正用于搜索的)
+     */
+    private String platformsStr;
+
+    /**
+     * 数据类型 1:原创, 2:转发, 7:评论
+     */
+    private String filterForward = "1,2";
+
+    /**
+     * 排序字段
+     */
+    @ApiModelProperty(value = "排序字段")
+    private String sorter;
+
+    /**
+     * 排序字段(真正用于搜索的)
+     */
+    private String sortOf;
+
+    /**
+     * 匹配域名 默认标题+内容
+     */
+    private String matchFields = null;
+
+    /**
+     * 查询类型 标题/全文
+     */
+    @ApiModelProperty(value = "查询类型")
+    private String matchType;
+
+}

src/main/java/com/zhiwei/brandkbs2/service/MarkDataService.java

@@ -10,7 +10,6 @@ import com.zhiwei.brandkbs2.pojo.dto.SearchFilterDTO;
 import com.zhiwei.brandkbs2.pojo.vo.PageVO;
 import org.apache.commons.lang3.tuple.Pair;
 
-import javax.naming.directory.SearchControls;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -180,7 +179,7 @@ public interface MarkDataService {
      * @return 搜索结果列表
      */
 
-    PageVO<MarkFlowEntity> getContendSearchList(MarkSearchDTO markSearchDTO) throws IOException;
+    PageVO<MarkFlowEntity> getContendSearchList(MarkSearchDTO markSearchDTO);
 
     /**
      * 竞品库-获取竞品对比舆情解读数据

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -60,10 +60,8 @@ import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.joda.time.Period;
 import org.joda.time.PeriodType;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -86,9 +84,6 @@ public class MarkDataServiceImpl implements MarkDataService {
 
     private static final String[] EVENT_FETCH_SOURCE = new String[]{"id", "ind_full_text", "c5", "real_source", "source", "mtime", "time", "url", "mtag", "foreign", "brandkbs_mark_cache_maps"};
 
-    @Value("${istarshine.addIStarShineKSData.url}")
-    private String addIStarShineKSDataUrl;
-
     @Resource(name = "projectServiceImpl")
     private ProjectService projectService;