fix: 应用看板数据

src/main/java/cn/com/poc/expose/aggregate/impl/AgentDataAnalyzeServiceImpl.java

@@ -55,15 +55,15 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
         // 积分
         DataAnalyzeInfo todayDataAnlalyzeInfo = new DataAnalyzeInfo();
         DataAnalyze todayPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, todayPointsCount);
+        setPointsDataAnalyze(pointsUsageQueryItems, todayPointsCount, DataAnalyzeTimeDimensionEnum.today);
         todayDataAnlalyzeInfo.setPointsCount(todayPointsCount);
         //使用人数
         DataAnalyze todayUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(todayUsersCount, agentUsageQueryItems);
+        setUserCountDataAnalyze(todayUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.today);
         todayDataAnlalyzeInfo.setUsersCount(todayUsersCount);
         //使用量
         DataAnalyze todayUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(todayUsageCount, agentUsageQueryItems);
+        setUsageDataAnalyze(todayUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.today);
         todayDataAnlalyzeInfo.setUsageCount(todayUsageCount);
 
         AgentDataAnalyzeGeneralEntity today = new AgentDataAnalyzeGeneralEntity();
@@ -76,15 +76,15 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
         DataAnalyzeInfo weekDataAnalyzeInfo = new DataAnalyzeInfo();
         //积分
         DataAnalyze weekPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, weekPointsCount);
+        setPointsDataAnalyze(pointsUsageQueryItems, weekPointsCount, DataAnalyzeTimeDimensionEnum.week);
         weekDataAnalyzeInfo.setPointsCount(weekPointsCount);
         //使用人数
         DataAnalyze weekUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(weekUsersCount, agentUsageQueryItems);
+        setUserCountDataAnalyze(weekUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.week);
         weekDataAnalyzeInfo.setUsersCount(weekUsersCount);
         //使用量
         DataAnalyze weekUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(weekUsageCount, agentUsageQueryItems);
+        setUsageDataAnalyze(weekUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.week);
         weekDataAnalyzeInfo.setUsageCount(weekUsageCount);
 
         AgentDataAnalyzeGeneralEntity week = new AgentDataAnalyzeGeneralEntity();
@@ -97,15 +97,15 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
         DataAnalyzeInfo monthDataAnalyzeInfo = new DataAnalyzeInfo();
         //积分
         DataAnalyze monthPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, monthPointsCount);
+        setPointsDataAnalyze(pointsUsageQueryItems, monthPointsCount, DataAnalyzeTimeDimensionEnum.month);
         monthDataAnalyzeInfo.setPointsCount(monthPointsCount);
         //使用人数
         DataAnalyze monthUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(monthUsersCount, agentUsageQueryItems);
+        setUserCountDataAnalyze(monthUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.month);
         monthDataAnalyzeInfo.setUsersCount(monthUsersCount);
         //使用量
         DataAnalyze monthUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(monthUsageCount, agentUsageQueryItems);
+        setUsageDataAnalyze(monthUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.month);
         monthDataAnalyzeInfo.setUsageCount(monthUsageCount);
 
         AgentDataAnalyzeGeneralEntity month = new AgentDataAnalyzeGeneralEntity();
@@ -207,46 +207,65 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
     }
 
 
-    private static void setUsageDataAnalyze(DataAnalyze dataAnalyze, List<AgentUsageQueryItem> agentUsageQueryItems) {
+    private static void setUsageDataAnalyze(DataAnalyze dataAnalyze, List<AgentUsageQueryItem> agentUsageQueryItems, DataAnalyzeTimeDimensionEnum dimension) {
         if (dataAnalyze == null) {
             dataAnalyze = new DataAnalyze();
         }
-
-        if (CollectionUtils.isNotEmpty(agentUsageQueryItems)) {
-            dataAnalyze.setNum(agentUsageQueryItems.get(0).getTodayDialogue().doubleValue());
-            dataAnalyze.setFluctuate((short) (agentUsageQueryItems.get(0).getTodayDialogue() < agentUsageQueryItems.get(0).getYesterdayDialogue() ? -1 : 1));
-        } else {
-            dataAnalyze.setNum(0D);
-            dataAnalyze.setFluctuate((short) 0);
+        double num = 0D;
+        short fluctuate = 0;
+        if (DataAnalyzeTimeDimensionEnum.today.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getTodayDialogue();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getTodayDialogue() < agentUsageQueryItems.get(0).getYesterdayDialogue() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.week.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getWeekDialogue();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getWeekDialogue() < agentUsageQueryItems.get(0).getLastWeekDialogue() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.month.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getMonthDialogue();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getMonthDialogue() < agentUsageQueryItems.get(0).getLastMonthDialogue() ? -1 : 1);
         }
+        dataAnalyze.setNum(num);
+        dataAnalyze.setFluctuate(fluctuate);
     }
 
-    private static void setUserCountDataAnalyze(DataAnalyze dataAnalyze, List<AgentUsageQueryItem> agentUsageQueryItems) {
+    private static void setUserCountDataAnalyze(DataAnalyze dataAnalyze, List<AgentUsageQueryItem> agentUsageQueryItems, DataAnalyzeTimeDimensionEnum dimension) {
         if (dataAnalyze == null) {
             dataAnalyze = new DataAnalyze();
         }
-
-        if (CollectionUtils.isNotEmpty(agentUsageQueryItems)) {
-            dataAnalyze.setNum(agentUsageQueryItems.get(0).getMonthDialogueMember().doubleValue());
-            dataAnalyze.setFluctuate((short) (agentUsageQueryItems.get(0).getMonthDialogueMember() < agentUsageQueryItems.get(0).getLastMonthDialogueMember() ? -1 : 1));
-        } else {
-            dataAnalyze.setNum(0D);
-            dataAnalyze.setFluctuate((short) 0);
+        double num = 0D;
+        short fluctuate = 0;
+        if (DataAnalyzeTimeDimensionEnum.today.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getTodayDialogueMember();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getTodayDialogueMember() < agentUsageQueryItems.get(0).getYesterdayDialogueMember() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.week.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getWeekDialogueMember();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getWeekDialogueMember() < agentUsageQueryItems.get(0).getLastWeekDialogueMember() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.month.equals(dimension)) {
+            num = agentUsageQueryItems.get(0).getMonthDialogueMember();
+            fluctuate = (short) (agentUsageQueryItems.get(0).getMonthDialogueMember() < agentUsageQueryItems.get(0).getLastMonthDialogueMember() ? -1 : 1);
         }
+        dataAnalyze.setNum(num);
+        dataAnalyze.setFluctuate(fluctuate);
     }
 
-    private static void setPointsDataAnalyze(List<PointsUsageQueryItem> pointsUsageQueryItems, DataAnalyze dataAnalyze) {
+    private static void setPointsDataAnalyze(List<PointsUsageQueryItem> pointsUsageQueryItems, DataAnalyze dataAnalyze, DataAnalyzeTimeDimensionEnum dimension) {
         if (dataAnalyze == null) {
             dataAnalyze = new DataAnalyze();
         }
 
-        if (CollectionUtils.isNotEmpty(pointsUsageQueryItems)) {
-            dataAnalyze.setNum(pointsUsageQueryItems.get(0).getTodayTotalPoints());
-            dataAnalyze.setFluctuate((short) (pointsUsageQueryItems.get(0).getTodayTotalPoints() < pointsUsageQueryItems.get(0).getYesterdayTotalPoints() ? -1 : 1));
-        } else {
-            dataAnalyze.setNum(0D);
-            dataAnalyze.setFluctuate((short) 0);
+        double num = 0D;
+        short fluctuate = 0;
+        if (DataAnalyzeTimeDimensionEnum.today.equals(dimension)) {
+            num = pointsUsageQueryItems.get(0).getTodayTotalPoints();
+            fluctuate = (short) (pointsUsageQueryItems.get(0).getTodayTotalPoints() < pointsUsageQueryItems.get(0).getYesterdayTotalPoints() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.week.equals(dimension)) {
+            num = pointsUsageQueryItems.get(0).getWeekTotalPoints();
+            fluctuate = (short) (pointsUsageQueryItems.get(0).getWeekTotalPoints() < pointsUsageQueryItems.get(0).getLastWeekTotalPoints() ? -1 : 1);
+        } else if (DataAnalyzeTimeDimensionEnum.month.equals(dimension)) {
+            num = pointsUsageQueryItems.get(0).getMonthTotalPoints();
+            fluctuate = (short) (pointsUsageQueryItems.get(0).getMonthTotalPoints() < pointsUsageQueryItems.get(0).getLastMonthTotalPoints() ? -1 : 1);
         }
+        dataAnalyze.setNum(num);
+        dataAnalyze.setFluctuate(fluctuate);
     }