Merge branch 'feature' into 'release'

首页美誉度计算逻辑调整

See merge request !419

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

@@ -131,6 +131,9 @@ public class IndexServiceImpl implements IndexService {
             //获取总正面稿件数
             long totalPositiveCount = markDataService.getYuqingMarkCount
                     (null, null, EmotionEnum.POSITIVE.getName(), projectId, Constant.PRIMARY_CONTEND_ID);
+            //获取总中性稿件数
+            long totalNeutralCount = markDataService.getYuqingMarkCount
+                    (null, null, EmotionEnum.NEUTRAL.getName(), projectId, Constant.PRIMARY_CONTEND_ID);
             //获取时间范围内总稿件数
             long normalCount = markDataService.getYuqingMarkCount
                     (startTime, endTime, EmotionEnum.ALL.getName(), projectId, Constant.PRIMARY_CONTEND_ID);
@@ -149,15 +152,18 @@ public class IndexServiceImpl implements IndexService {
             //获取上个周期时间范围内总正面稿件数
             long oldPositiveCount = markDataService.getYuqingMarkCount
                     (oldStartTime, startTime, EmotionEnum.POSITIVE.getName(), projectId, Constant.PRIMARY_CONTEND_ID);
-            double posPro = normalCount == 0 ? 0d : positiveCount / (double) normalCount;
-            double neuPro = normalCount == 0 ? 0d : neutralCount / (double) normalCount;
+            //获取上个周期时间范围内总中性稿件数
+            long oldNeutralCount = markDataService.getYuqingMarkCount
+                    (oldStartTime, startTime, EmotionEnum.NEUTRAL.getName(), projectId, Constant.PRIMARY_CONTEND_ID);
+            double posPro = normalCount == 0 ? 0d : (positiveCount + neutralCount) / (double) normalCount;
+//            double neuPro = normalCount == 0 ? 0d : neutralCount / (double) normalCount;
             double negPro = normalCount == 0 ? 0d : negativeCount / (double) normalCount;
-            double oldPosPro = oldCount == 0 ? 0d : oldPositiveCount / (double) oldCount;
+            double oldPosPro = oldCount == 0 ? 0d : (oldPositiveCount + oldNeutralCount) / (double) oldCount;
             jsonObject.put("posPro", posPro);
-            jsonObject.put("neuPro", neuPro);
+//            jsonObject.put("neuPro", neuPro);
             jsonObject.put("negPro", negPro);
             jsonObject.put("compare", oldPosPro == 0 ? 0d : (posPro - oldPosPro) / oldPosPro);
-            double avgPosPro = totalNormalCount == 0 ? 0d : totalPositiveCount / (double) totalNormalCount;
+            double avgPosPro = totalNormalCount == 0 ? 0d : (totalPositiveCount + totalNeutralCount) / (double) totalNormalCount;
             jsonObject.put("avgPosPro", avgPosPro);
             redisUtil.setExpire(redisKey, JSON.toJSONString(jsonObject));
         } catch (IOException e) {