Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/IActiveDataServiceImpl.java

@@ -92,7 +92,7 @@ public class IActiveDataServiceImpl implements IActiveDataService {
         //解析ActiveDataTotalVO的映射
         Map<String, Field> fieldTotalMap = new HashMap<>();
         List<Field> dayNTotalFieldList = new ArrayList<>();
-        Class<?> tempTotalClazz = ActiveDataMonthTotalVO.class;
+        Class<?> tempTotalClazz = ActiveDataTotalVO.class;
         while (tempTotalClazz != null) {
             Field[] fields = tempTotalClazz.getDeclaredFields();
             for (Field field : fields) {
@@ -390,8 +390,9 @@ public class IActiveDataServiceImpl implements IActiveDataService {
      */
     @Override
     public ActiveDataTotalVO getActiveDataTotal(ActiveDataTotalDTO dto) {
-        com.github.sd4324530.jtuple.Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
-        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : dto.getGameId();
+//        com.github.sd4324530.jtuple.Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo();
+//        List<Long> gameIds = dto.getGameId() == null ? poerInfo.second : dto.getGameId();
+        ArrayList<Long> gameIds = new ArrayList<>();
 
         //默认查询字段
         String gameColumn = "game_id";