合并分支 'dev_0710' 到 'event_fusion'

事件分析-相关资讯逻辑修改

查看合并请求 !6

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

@@ -1187,15 +1187,12 @@ public class EsService {
                     eventViewVO.setPublishDate(EsDateUtil.esFieldDateMapping(eventViewVO.getPublishDate()));
                     eventViewVO.setIndex(index);
                     List<Label> labels = eventViewVO.getLabels();
-                    String professionName = null;
-                    for (Label label : labels) {
-                        String labelRelationId = label.getRelationId();
-                        if (StringUtils.isEmpty(labelRelationId)) {
-                            professionName = label.getRelationName();
-                            break;
-                        }
+                    if (CollectionUtils.isNotEmpty(labels)) {
+                        List<Label> enterpriseList = labels.stream().filter(e -> e.getLabelMark().equals("company_label")).collect(Collectors.toList());
+                        eventViewVO.setEnterpriseList(enterpriseList);
+                        List<Label> expertList = labels.stream().filter(e -> e.getLabelMark().equals("expert")).collect(Collectors.toList());
+                        eventViewVO.setExpertList(expertList);
                     }
-                    eventViewVO.setProfessionName(professionName);
                     dataList.add(eventViewVO);
                 }
             }

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

@@ -32,7 +32,9 @@ public class EventViewVO {
     private List<Label> labels;
     /**es索引名称*/
     private String index;
-    /**专家名称*/
-    private String professionName;
+    /**专家集合*/
+    private List<Label> expertList;
+    /**企业集合*/
+    private List<Label> enterpriseList;
 
 }