Merge remote-tracking branch 'origin/event_fusion' into event_fusion

src/main/java/com/zzsn/event/controller/SubjectManageController.java

@@ -990,6 +990,9 @@ public class SubjectManageController {
             subjectInfoSourceMap.setSourceId(labelCode);
             subjectInfoSourceMap.setSourceItemId(labelItemCode);
             subjectInfoSourceMap.setType(312);
+            UserVo currentUser = UserUtil.getLoginUser();
+            subjectInfoSourceMap.setCreateBy(currentUser.getUsername());
+            subjectInfoSourceMap.setCreateTime(new Date());
             dataList.add(subjectInfoSourceMap);
         }
         if (CollectionUtils.isNotEmpty(dataList)) {

src/main/java/com/zzsn/event/entity/SubjectInfoSourceMap.java

@@ -41,4 +41,10 @@ public class SubjectInfoSourceMap implements Serializable {
     private Integer isExemptKeyword;
     /**是否免审核 0否  1是*/
     private Integer isFreeCheck;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
 }

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

@@ -3,6 +3,8 @@ package com.zzsn.event.es;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.net.URLDecoder;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
@@ -2380,6 +2382,39 @@ public class EsService {
             TermsQueryBuilder sortFieldQuery = QueryBuilders.termsQuery("sortField.fieldType", searchCondition.getKeywordList());
             boolQuery.must(QueryBuilders.nestedQuery("sortField", sortFieldQuery, ScoreMode.None));
         }
+        //实体标签参数
+        if (CollectionUtils.isNotEmpty(searchCondition.getSpecialLabelParams())) {
+            cn.hutool.json.JSONObject params = searchCondition.getSpecialLabelParams();
+            String entityObjectId = params.getStr("entityObjectId");
+            if (StrUtil.isNotBlank(entityObjectId) && ("1892197364882550786".equals(entityObjectId) || "1874728877847257089".equals(entityObjectId))){
+                cn.hutool.json.JSONArray jsonArray = params.getJSONArray("labelCodeList");
+                if (ObjectUtil.isNotEmpty(jsonArray) && !jsonArray.isEmpty()){
+                    jsonArray.forEach(e -> {
+                        cn.hutool.json.JSONObject jsonObject = (cn.hutool.json.JSONObject) e;
+                        String labelCode = jsonObject.getStr("labelCode");
+                        if (StrUtil.isNotBlank(labelCode)){
+                            cn.hutool.json.JSONArray jsonArray1 = jsonObject.getJSONArray("children");
+                            if (jsonArray1 != null && !jsonArray1.isEmpty()){
+                                List<String> reids = new ArrayList<>();
+
+                                jsonArray1.forEach(f -> {
+                                    cn.hutool.json.JSONObject jsonObject1 = (cn.hutool.json.JSONObject) f;
+                                    String labelItemCode = jsonObject1.getStr("labelItemCode");
+                                    if (StrUtil.isNotBlank(labelItemCode)){
+                                        reids.add(labelCode+"-"+labelItemCode);
+                                    }
+                                });
+                                if (CollectionUtils.isNotEmpty(reids)){
+                                    BoolQueryBuilder specialLabelQuery = QueryBuilders.boolQuery();
+                                    specialLabelQuery.must(QueryBuilders.nestedQuery("labels",QueryBuilders.termsQuery("labels.relationId",reids),ScoreMode.None));
+                                    boolQuery.must(specialLabelQuery);
+                                }
+                            }
+                        }
+                    });
+                }
+            }
+        }
         return boolQuery;
     }
 

src/main/java/com/zzsn/event/mapper/xml/SubjectTypeMapper.xml

@@ -241,9 +241,13 @@
     </select>
 
     <select id="allList" resultType="com.zzsn.event.entity.SubjectType">
-        select t.* from subject_type t
+        select t.* from subject_type t where 1=1
         <if test="userId !=null and userId != ''">
             inner join sys_user_data_permission dp on t.id=dp.permission_id and dp.user_id = #{userId}
         </if>
+        <if test="category !=null">
+            and t.category = #{category}
+        </if>
+
     </select>
 </mapper>

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

 package com.zzsn.event.vo;
 
+import cn.hutool.json.JSONObject;
 import com.zzsn.event.vo.es.Label;
 import lombok.Data;
 
@@ -205,4 +206,5 @@ public class InfoDataSearchCondition {
      * 本次任务使用的流程id
      */
     private String flowId;
+    private JSONObject specialLabelParams;
 }

src/main/java/com/zzsn/event/vo/es/DisplayInfo.java

@@ -144,4 +144,46 @@ public class DisplayInfo {
      * 是否是主条目,0为非主条目，1为主条目
      */
     private Integer ismain;
+
+
+    //政策文件信息字段
+    /**
+     * 索引号
+     */
+    private String indexNumber;
+
+    /**
+     * 主题词
+     */
+    private String topicInfo;
+
+    /**
+     * 实施日期
+     */
+    private String implementDate;
+    /**
+     * 失效日期
+     */
+    private String invalidDate;
+    /**
+     * 时效
+     */
+    private String effectiveness;
+    /**
+     * 信息来源
+     */
+    private String informationSources;
+    /**
+     * 公文种类
+     */
+    private String officialDocumentType;
+    /**
+     * 效力位阶
+     */
+    private String legalPrecedenceHierarchy;
+    //政策文件信息字段结束
+
+    /**克虏宝平台基础索引库名 来源基础库*/
+    private String sourceDbType;
+
 }

src/main/java/com/zzsn/event/vo/es/ESData.java

@@ -123,4 +123,58 @@ public class ESData {
     private String checkDate;
     /**原创性*/
     private String originality;
+
+
+    //政策文件信息字段
+    /**
+     * 索引号
+     */
+    private String indexNumber;
+    /**
+     * 发文机关
+     */
+    private String organ;
+    /**
+     * 发文字号
+     */
+    private String issuedNumber;
+    /**
+     * 主题词
+     */
+    private String topicInfo;
+    /**
+     * 主题分类
+     */
+    private String topicClassification;
+    /**
+     * 成文日期
+     */
+    private String writtenDate;
+    /**
+     * 实施日期
+     */
+    private String implementDate;
+    /**
+     * 失效日期
+     */
+    private String invalidDate;
+    /**
+     * 时效
+     */
+    private String effectiveness;
+    /**
+     * 信息来源
+     */
+    private String informationSources;
+    /**
+     * 公文种类
+     */
+    private String officialDocumentType;
+    /**
+     * 效力位阶
+     */
+    private String legalPrecedenceHierarchy;
+    //政策文件信息字段结束
+    /**克虏宝平台基础索引库名 来源基础库*/
+    private String sourceDbType;
 }

src/main/java/com/zzsn/event/vo/es/SpecialInformation.java

@@ -150,6 +150,62 @@ public class SpecialInformation {
     private Integer dataFrom;
 
 
+
+    //政策文件信息字段
+    /**
+     * 索引号
+     */
+    private String indexNumber;
+    /**
+     * 发文机关
+     */
+    private String organ;
+    /**
+     * 发文字号
+     */
+    private String issuedNumber;
+    /**
+     * 主题词
+     */
+    private String topicInfo;
+    /**
+     * 主题分类
+     */
+    private String topicClassification;
+    /**
+     * 成文日期
+     */
+    private String writtenDate;
+    /**
+     * 实施日期
+     */
+    private String implementDate;
+    /**
+     * 失效日期
+     */
+    private String invalidDate;
+    /**
+     * 时效
+     */
+    private String effectiveness;
+    /**
+     * 信息来源
+     */
+    private String informationSources;
+    /**
+     * 公文种类
+     */
+    private String officialDocumentType;
+    /**
+     * 效力位阶
+     */
+    private String legalPrecedenceHierarchy;
+    //政策文件信息字段结束
+
+    /**克虏宝平台基础索引库名 来源基础库*/
+    private String sourceDbType;
+
+
     public List<String> toExcelList(){
         List<String> list = new ArrayList<>();
         list.add(getRealValue(score));