Merge branch 'release' into 'master'

Release

See merge request !422

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

@@ -155,14 +155,16 @@ public class IndexServiceImpl implements IndexService {
             //获取上个周期时间范围内总中性稿件数
             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 reputation = normalCount == 0 ? 0d : (positiveCount + neutralCount) / (double) normalCount;
+            double posPro = normalCount == 0 ? 0d : positiveCount / (double) normalCount;
+            double neuPro = normalCount == 0 ? 0d : neutralCount / (double) normalCount;
             double negPro = normalCount == 0 ? 0d : negativeCount / (double) normalCount;
-            double oldPosPro = oldCount == 0 ? 0d : (oldPositiveCount + oldNeutralCount) / (double) oldCount;
+            double oldReputation = 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);
+            jsonObject.put("reputation", reputation);
+            jsonObject.put("compare", oldReputation == 0 ? 0d : (reputation - oldReputation) / oldReputation);
             double avgPosPro = totalNormalCount == 0 ? 0d : (totalPositiveCount + totalNeutralCount) / (double) totalNormalCount;
             jsonObject.put("avgPosPro", avgPosPro);
             redisUtil.setExpire(redisKey, JSON.toJSONString(jsonObject));