style:.AgentDataAnalyzeServiceImpl#getGeneralUsageData

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

@@ -51,67 +51,12 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
         agentUsageQueryCondition.setRelationId(agentId);
         List<AgentUsageQueryItem> agentUsageQueryItems = bizDataAnalyzeDialogueRecordService.agentUsageQuery(agentUsageQueryCondition, null);
 
-        // 1.获取今日数据
-        // 积分
-        DataAnalyzeInfo todayDataAnlalyzeInfo = new DataAnalyzeInfo();
-        DataAnalyze todayPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, todayPointsCount, DataAnalyzeTimeDimensionEnum.today);
-        todayDataAnlalyzeInfo.setPointsCount(todayPointsCount);
-        //使用人数
-        DataAnalyze todayUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(todayUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.today);
-        todayDataAnlalyzeInfo.setUsersCount(todayUsersCount);
-        //使用量
-        DataAnalyze todayUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(todayUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.today);
-        todayDataAnlalyzeInfo.setUsageCount(todayUsageCount);
-
-        AgentDataAnalyzeGeneralEntity today = new AgentDataAnalyzeGeneralEntity();
-        today.setTimeDimension(DataAnalyzeTimeDimensionEnum.today.name());
-        today.setDataAnalyzeInfo(todayDataAnlalyzeInfo);
-        result.add(today);
-
-
-        //2. 获取本周数据
-        DataAnalyzeInfo weekDataAnalyzeInfo = new DataAnalyzeInfo();
-        //积分
-        DataAnalyze weekPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, weekPointsCount, DataAnalyzeTimeDimensionEnum.week);
-        weekDataAnalyzeInfo.setPointsCount(weekPointsCount);
-        //使用人数
-        DataAnalyze weekUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(weekUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.week);
-        weekDataAnalyzeInfo.setUsersCount(weekUsersCount);
-        //使用量
-        DataAnalyze weekUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(weekUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.week);
-        weekDataAnalyzeInfo.setUsageCount(weekUsageCount);
-
-        AgentDataAnalyzeGeneralEntity week = new AgentDataAnalyzeGeneralEntity();
-        week.setTimeDimension(DataAnalyzeTimeDimensionEnum.week.name());
-        week.setDataAnalyzeInfo(weekDataAnalyzeInfo);
-        result.add(week);
-
-
-        //3. 获取本月数据
-        DataAnalyzeInfo monthDataAnalyzeInfo = new DataAnalyzeInfo();
-        //积分
-        DataAnalyze monthPointsCount = new DataAnalyze();
-        setPointsDataAnalyze(pointsUsageQueryItems, monthPointsCount, DataAnalyzeTimeDimensionEnum.month);
-        monthDataAnalyzeInfo.setPointsCount(monthPointsCount);
-        //使用人数
-        DataAnalyze monthUsersCount = new DataAnalyze();
-        setUserCountDataAnalyze(monthUsersCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.month);
-        monthDataAnalyzeInfo.setUsersCount(monthUsersCount);
-        //使用量
-        DataAnalyze monthUsageCount = new DataAnalyze();
-        setUsageDataAnalyze(monthUsageCount, agentUsageQueryItems, DataAnalyzeTimeDimensionEnum.month);
-        monthDataAnalyzeInfo.setUsageCount(monthUsageCount);
-
-        AgentDataAnalyzeGeneralEntity month = new AgentDataAnalyzeGeneralEntity();
-        month.setTimeDimension(DataAnalyzeTimeDimensionEnum.month.name());
-        month.setDataAnalyzeInfo(monthDataAnalyzeInfo);
-        result.add(month);
+        //1. 构造今天数据
+        buildGeneralData(DataAnalyzeTimeDimensionEnum.today, pointsUsageQueryItems, agentUsageQueryItems, result);
+        //2. 构造本周数据
+        buildGeneralData(DataAnalyzeTimeDimensionEnum.week, pointsUsageQueryItems, agentUsageQueryItems, result);
+        //3. 构造本月数据
+        buildGeneralData(DataAnalyzeTimeDimensionEnum.month, pointsUsageQueryItems, agentUsageQueryItems, result);
         return result;
     }
 
@@ -207,6 +152,28 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
     }
 
 
+    private static void buildGeneralData(DataAnalyzeTimeDimensionEnum dataAnalyzeTimeDimensionEnum, List<PointsUsageQueryItem> pointsUsageQueryItems, List<AgentUsageQueryItem> agentUsageQueryItems, List<AgentDataAnalyzeGeneralEntity> result) {
+        DataAnalyzeInfo dataAnalyzeInfo = new DataAnalyzeInfo();
+        //积分
+        DataAnalyze pointsCount = new DataAnalyze();
+        setPointsDataAnalyze(pointsUsageQueryItems, pointsCount, dataAnalyzeTimeDimensionEnum);
+        dataAnalyzeInfo.setPointsCount(pointsCount);
+        //使用人数
+        DataAnalyze usersCount = new DataAnalyze();
+        setUserCountDataAnalyze(usersCount, agentUsageQueryItems, dataAnalyzeTimeDimensionEnum);
+        dataAnalyzeInfo.setUsersCount(usersCount);
+        //使用量
+        DataAnalyze usageCount = new DataAnalyze();
+        setUsageDataAnalyze(usageCount, agentUsageQueryItems, dataAnalyzeTimeDimensionEnum);
+        dataAnalyzeInfo.setUsageCount(usageCount);
+
+        AgentDataAnalyzeGeneralEntity agentDataAnalyzeGeneralEntity = new AgentDataAnalyzeGeneralEntity();
+        agentDataAnalyzeGeneralEntity.setTimeDimension(dataAnalyzeTimeDimensionEnum.name());
+        agentDataAnalyzeGeneralEntity.setDataAnalyzeInfo(dataAnalyzeInfo);
+        result.add(agentDataAnalyzeGeneralEntity);
+    }
+
+
     private static void setUsageDataAnalyze(DataAnalyze dataAnalyze, List<AgentUsageQueryItem> agentUsageQueryItems, DataAnalyzeTimeDimensionEnum dimension) {
         if (dataAnalyze == null) {
             dataAnalyze = new DataAnalyze();
@@ -251,7 +218,6 @@ public class AgentDataAnalyzeServiceImpl implements AgentDataAnalyzeService {
         if (dataAnalyze == null) {
             dataAnalyze = new DataAnalyze();
         }
-
         double num = 0D;
         short fluctuate = 0;
         if (DataAnalyzeTimeDimensionEnum.today.equals(dimension)) {