Merge branch 'release' into 'master'

Release

See merge request !235

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

@@ -247,7 +247,7 @@ public class ReportServiceImpl implements ReportService {
         try {
             result = getPcReportResult(report);
         } catch (Exception e) {
-            log.error("生成报告数据异常", e);
+            log.error("生成报告数据异常,id:{}", report.getId(), e);
             ExceptionCast.cast(CommonCodeEnum.FAIL, "生成报告数据异常");
         }
         redisUtil.set(redisKey, JSON.toJSONString(result));
@@ -412,7 +412,7 @@ public class ReportServiceImpl implements ReportService {
             List<Map.Entry<String, Integer>> topPosArticleList = markDataService.getMarkTopTitle(startTime, endTime, EmotionEnum.POSITIVE.getName(), projectId, linkedGroupId, contendId, 3);
             result.put("topPosSummary", this.getTopArticlesMsg(startTime, endTime, projectId, linkedGroupId, contendId, topPosArticleList));
         } else {
-            result.put("topPosSummary", this.getTopEventMsg(topPosEventList));
+            result.put("topPosSummary", this.getTopEventMsg(topPosEventList, projectId));
         }
         //获取上个周期时间范围内总正面稿件数
         long lastPositiveTotal = markDataService.getYuqingMarkCount(lastStartTime, startTime, EmotionEnum.POSITIVE.getName(), projectId, contendId);
@@ -430,7 +430,7 @@ public class ReportServiceImpl implements ReportService {
             List<Map.Entry<String, Integer>> topNeuArticleList = markDataService.getMarkTopTitle(startTime, endTime, EmotionEnum.NEUTRAL.getName(), projectId, linkedGroupId, contendId, 4);
             result.put("topNeuSummary", this.getTopArticlesMsg(startTime, endTime, projectId, linkedGroupId, contendId, topNeuArticleList));
         } else {
-            result.put("topNeuSummary", this.getTopEventMsg(topNeuEventList));
+            result.put("topNeuSummary", this.getTopEventMsg(topNeuEventList, projectId));
         }
         //获取上个周期时间范围内总中性稿件数
         long lastNeutralTotal = markDataService.getYuqingMarkCount(lastStartTime, startTime, EmotionEnum.NEUTRAL.getName(), projectId, contendId);
@@ -448,7 +448,7 @@ public class ReportServiceImpl implements ReportService {
             List<Map.Entry<String, Integer>> topNegArticleList = markDataService.getMarkTopTitle(startTime, endTime, EmotionEnum.NEGATIVE.getName(), projectId, linkedGroupId, contendId, 4);
             result.put("topNegSummary", this.getTopArticlesMsg(startTime, endTime, projectId, linkedGroupId, contendId, topNegArticleList));
         } else {
-            result.put("topNegSummary", this.getTopEventMsg(topNegEventList));
+            result.put("topNegSummary", this.getTopEventMsg(topNegEventList, projectId));
         }
         //获取上个周期时间范围内总负面稿件数
         long lastNegativeTotal = markDataService.getYuqingMarkCount(lastStartTime, startTime, EmotionEnum.NEGATIVE.getName(), projectId, contendId);
@@ -586,8 +586,7 @@ public class ReportServiceImpl implements ReportService {
      * @param topEventList top事件集合
      * @return top事件信息
      */
-    private List<JSONObject> getTopEventMsg(List<com.zhiwei.middleware.event.pojo.entity.Event> topEventList) {
-        String projectId = UserThreadLocal.getProjectId();
+    private List<JSONObject> getTopEventMsg(List<com.zhiwei.middleware.event.pojo.entity.Event> topEventList,String projectId) {
         return topEventList.stream().map(event -> {
             boolean hasAnalyze = false;
             for (BrandkbsBasicInfo brandkbsInfo : event.getBrandkbsInfos()) {