专题资讯列表和专题报告数据接口条件统一

src/main/java/com/zzsn/event/controller/reportData/SearchCondition.java

@@ -22,6 +22,13 @@ public class SearchCondition {
     @FieldDescription(value = "搜索词")
     private String searchWord;
 
+    /*------高级查询条件---start-------------------*/
+    //规则
+    private String superQueryMatchType;
+    //条件（url转码后的json）
+    private String superQueryParams;
+    /*------高级查询条件---end-------------------*/
+
     //开始时间
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -36,14 +43,15 @@ public class SearchCondition {
     @FieldDescription(value = "专题库类型")
     private List<Integer> classificationType;
 
-    /**原创性(0-非原创;1-原创;2-疑似)*/
+    /**
+     * 原创性(0-非原创;1-原创;2-疑似)
+     */
     @FieldDescription(value = "原创性")
     private String originality;
 
-    //审核状态(1-通过;2-未审核;3-暂定;4-删除;5-免审核)
+    //审核状态(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
     @FieldDescription(value = "审核状态")
-    private Integer status;
-
+    private Integer auditStatus;
     //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
     private Integer checkStatus;
     //删除标记(1:删除；0:未删除)
@@ -59,14 +67,18 @@ public class SearchCondition {
     @FieldDescription(value = "组合标签查询")
     private String composeSearchLabelIds;
 
-    /**----企业类标签筛选----**/
+    /**
+     * ----企业类标签筛选----
+     **/
     //企业类标签id集合
     @FieldDescription(value = "企业类标签id集合")
     private List<String> enterpriseLabelTypeIds;
     //企业信用代码集合
     @FieldDescription(value = "企业信用代码集合")
     private List<String> socialCreditCodeList;
-    /**----企业类标签id集合----**/
+    /**
+     * ----企业类标签id集合----
+     **/
     //专题关联标签值id集合
     @FieldDescription(value = "专题关联标签值id集合")
     private List<String> labelIds;

src/main/java/com/zzsn/event/es/EsService.java

@@ -2132,7 +2132,18 @@ public class EsService {
         if (CollectionUtils.isNotEmpty(searchWordList)) {
             handlerSearchWordList(boolQuery, searchWordList);
         } else {//平台 搜索词方式
-            if (StringUtils.isNotEmpty(searchCondition.getSearch())) {
+            String searchScope = searchCondition.getSearchScope();
+            String searchWord = searchCondition.getSearchWord();
+            if (StringUtils.isNotEmpty(searchWord)) {
+                if ("all".equalsIgnoreCase(searchScope)) {
+                    MultiMatchQueryBuilder multiMatchQuery = QueryBuilders.multiMatchQuery(searchWord, "title", "content", "origin");
+                    multiMatchQuery.type(MultiMatchQueryBuilder.Type.PHRASE);
+                    boolQuery.must(multiMatchQuery);
+                } else {
+                    boolQuery.must(QueryBuilders.matchPhraseQuery(searchScope, searchWord));
+                }
+            }
+            /*if (StringUtils.isNotEmpty(searchCondition.getSearch())) {
                 boolQuery.must(QueryBuilders.multiMatchQuery(searchCondition.getSearch(), "title", "content"));
             }
             if (StringUtils.isNotEmpty(searchCondition.getContent())) {
@@ -2149,7 +2160,7 @@ public class EsService {
                 MatchPhraseQueryBuilder relationNameQuery = QueryBuilders.matchPhraseQuery("labels.relationName", searchCondition.getLabelName());
                 nestedBoolQueryBuilder.should(QueryBuilders.nestedQuery("labels", relationNameQuery, ScoreMode.None));
                 boolQuery.must(nestedBoolQueryBuilder);
-            }
+            }*/
         }
         if (searchCondition.getLabelMark() != null) {
             BoolQueryBuilder nestedBoolQueryBuilder = QueryBuilders.boolQuery();
@@ -2174,6 +2185,22 @@ public class EsService {
                 boolQuery.must(QueryBuilders.termQuery("deleteFlag", 1));
             }
         } else {
+            //审核状态-平台(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
+            Integer auditStatus = searchCondition.getAuditStatus();
+            if (auditStatus != null) {
+                if (auditStatus == 1) {
+                    searchCondition.setCheckStatus(1);
+                } else if (auditStatus == 2) {
+                    searchCondition.setCheckStatus(0);
+                    searchCondition.setDeleteFlag(0);
+                } else if (auditStatus == 3) {
+                    searchCondition.setCheckStatus(3);
+                } else if (auditStatus == 4) {
+                    searchCondition.setDeleteFlag(1);
+                } else if (auditStatus == 5) {
+                    searchCondition.setIsFreeCheck(1);
+                }
+            }
             Integer checkStatus = searchCondition.getCheckStatus();
             Integer deleteFlag = searchCondition.getDeleteFlag();
             if (checkStatus != null) {

src/main/java/com/zzsn/event/vo/InfoDataSearchCondition.java

@@ -25,12 +25,18 @@ public class InfoDataSearchCondition {
     //内容
     private String content;
 
-    //发布时间
-    private String publishDate;
-
     //来源
     private String origin;
 
+    //搜索范围(all、title、content、origin)
+    private String searchScope;
+    //搜索词
+    private String searchWord;
+
+
+    //发布时间
+    private String publishDate;
+
     //开始时间
     private String startTime;
 
@@ -50,15 +56,15 @@ public class InfoDataSearchCondition {
     /**原创性(0-非原创;1-原创;2-疑似)*/
     private String originality;
 
-    //资讯状态-研究中心(0-全部;1-模型推荐;2-精选;3-待定;4-移除),和checkStatus、deleteFlag、isFreeCheck互斥
+    //资讯状态-研究中心(0-全部;1-模型推荐;2-精选;3-待定;4-移除),和auditStatus互斥
     private Integer status;
 
+    //平台-审核状态(null-全部;1-通过;2-未审核;3-暂定;4-删除;5-免审核)
+    private Integer auditStatus;
     //审核操作(0：未审核  1：审核通过  2：审核未通过  3：暂定  默认值为0)
     private Integer checkStatus;
-
     //删除标记(1:删除；0:未删除)
     private Integer deleteFlag;
-
     //是否免审核(1-是;0-否)
     private Integer isFreeCheck;