传播路径查询优化

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

@@ -14,11 +14,13 @@ import com.zzsn.event.entity.SubjectAnalysis;
 import com.zzsn.event.service.*;
 import com.zzsn.event.util.CalculateUtil;
 import com.zzsn.event.util.HttpUtil;
+import com.zzsn.event.util.RedisUtil;
 import com.zzsn.event.vo.CountVO;
 import com.zzsn.event.vo.PropagationPathVo;
 import com.zzsn.event.vo.SubjectDataVo;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,6 +56,8 @@ public class EventAnalysisController {
     private SubjectAnalysisService subjectAnalysisService;
     @Autowired
     private EsService esService;
+    @Autowired
+    private RedisUtil redisUtil;
 
     @Value(("${serviceProject.url:}"))
     private String SERVICE_PROJECT_URL;
@@ -122,8 +126,12 @@ public class EventAnalysisController {
      */
     @GetMapping("/propagationPath")
     public Result<?> propagationPath(@RequestParam String eventId) {
-        PropagationPathVo pathVo = analysisService.propagationPath(eventId);
-        return Result.OK(pathVo);
+        String key = Constants.SUBJECT_ANALYSIS_PRE + Constants.PROPAGATION_KEY + eventId;
+        Object cacheObject = redisUtil.get(key);
+        if (ObjectUtils.isEmpty(cacheObject)) {
+            cacheObject = analysisService.propagationPath(eventId);
+        }
+        return Result.OK(cacheObject);
     }
 
     /**

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

@@ -459,7 +459,9 @@ public class EsService {
             List<? extends Terms.Bucket> buckets = groupOrigin.getBuckets();
             for (Terms.Bucket bucket : buckets) {
                 String origin = bucket.getKeyAsString();
-                originList.add(origin);
+                if (StringUtils.isNotEmpty(origin)) {
+                    originList.add(origin);
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/zzsn/event/service/impl/AnalysisServiceImpl.java

@@ -13,11 +13,13 @@ import com.zzsn.event.util.DateUtil;
 import com.zzsn.event.vo.PropagationPathVo;
 import com.zzsn.event.vo.SubjectDataVo;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author lkg
@@ -106,22 +108,24 @@ public class AnalysisServiceImpl implements AnalysisService {
             earlyList.forEach(e->allOriginList.add(e.getOrigin()));
             for (SubjectDataVo subjectDataVo : earlyList) {
                 String origin = subjectDataVo.getOrigin();
-                PropagationPathVo second = new PropagationPathVo();
-                second.setName(origin);
-                secondList.add(second);
-                List<String> thirdList = esService.groupByOrigin(subjectDataVo.getTitle(), subjectDataVo.getPublishDate());
-                thirdList.removeAll(allOriginList);
-                List<PropagationPathVo> lastList = new ArrayList<>();
-                if (thirdList.size() > 3) {
-                    thirdList = thirdList.subList(0,3);
+                if (StringUtils.isNotEmpty(origin)) {
+                    PropagationPathVo second = new PropagationPathVo();
+                    second.setName(origin);
+                    secondList.add(second);
+                    List<String> thirdList = esService.groupByOrigin(subjectDataVo.getTitle(), subjectDataVo.getPublishDate());
+                    thirdList.removeAll(allOriginList);
+                    List<PropagationPathVo> lastList = new ArrayList<>();
+                    if (thirdList.size() > 3) {
+                        thirdList = thirdList.subList(0,3);
+                    }
+                    for (String s : thirdList) {
+                        PropagationPathVo third = new PropagationPathVo();
+                        third.setName(s);
+                        lastList.add(third);
+                    }
+                    second.setChildren(lastList);
+                    allOriginList.addAll(thirdList);
                 }
-                for (String s : thirdList) {
-                    PropagationPathVo third = new PropagationPathVo();
-                    third.setName(s);
-                    lastList.add(third);
-                }
-                second.setChildren(lastList);
-                allOriginList.addAll(thirdList);
             }
             top.setChildren(secondList);
         }

src/main/resources/application-dev.yml

@@ -48,7 +48,7 @@ spring:
           url: jdbc:mysql://114.116.44.11:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
           username: ciglobal
           password: qwer@9988&zzsn
-        # 多数据源配置
+          driver-class-name: com.mysql.cj.jdbc.Driver
         multi-datasource1:
           url: jdbc:mysql://114.116.44.11:3306/clb_xxl_job?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: ciglobal

src/main/resources/application-pro.yml

@@ -48,7 +48,7 @@ spring:
           url: jdbc:mysql://114.116.44.11:3306/clb_project?useUnicode=true&characterEncoding=utf-8&AllowPublicKeyRetrieval=True&serverTimezone=Asia/Shanghai&autoReconnect=true&rewriteBatchedStatements=true
           username: ciglobal
           password: qwer@9988&zzsn
-    # 多数据源配置
+          driver-class-name: com.mysql.cj.jdbc.Driver
         multi-datasource1:
           url: jdbc:mysql://114.116.44.11:3306/clb_xxl_job?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: ciglobal