소스 검색

补全数据处理,排序

zhaoxian 4 년 전
부모
커밋
b2a8f22e9e

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouReportAccountDailyMapper.xml

@@ -266,7 +266,7 @@
     </select>
 
     <select id="getNewlyUpdateTime" resultType="java.lang.String">
-        select update_time
+        select DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s')
         FROM ctop_etl_kuaishou_report_account_daily
         ORDER BY update_time desc LIMIT 1
     </select>

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/EtlKuaishouReportAccountHourlyMapper.xml

@@ -214,7 +214,7 @@
             </if>
         </if>
         stat_hour as 'statHour'
-        FROM ctop_etl_kuaishou_report_account_hourly
+        FROM ctop_kuaishou_report_hourly_account
         WHERE account_id = #{accountId}
         AND stat_date = #{startTime}
         GROUP BY stat_hour
@@ -222,7 +222,7 @@
     </select>
 
     <select id="getNewlyUpdateTime" resultType="java.lang.String">
-        select update_time
+        select DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%s')
         FROM ctop_etl_kuaishou_report_account_hourly
         ORDER BY update_time desc LIMIT 1
     </select>

+ 8 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountHourlyServiceImpl.java

@@ -126,6 +126,12 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
         String updateTime = "";
         if (endTime.equals(startTime)) {
             updateTime = etlHourlyAccountMapper.getNewlyUpdateTime();
+            if ("photo_share".equals(value)) {
+                value = "share";
+            }
+            if ("photo_comment".equals(value)) {
+                value = "comment";
+            }
             todayList = etlHourlyAccountMapper.getOnedayEtlReportList(startTime, accountId, value, type);
             String lastDay = DateUtils.getLastDay(startTime, 1);
             yesterdayList = etlHourlyAccountMapper.getOnedayEtlReportList(lastDay, accountId, value, type);
@@ -147,8 +153,9 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
             if (days > yesterdayNum) {
                 dayList = DateUtils.getDays(startTime2, endTime2);
                 completionTime(yesterdayList, dayList);
-
             }
+            userRechargeListSort(todayList);
+            userRechargeListSort(yesterdayList);
         }
         obj.put("today", todayList);
         obj.put("yesterday", yesterdayList);
@@ -172,8 +179,6 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
                 dataList.add(obj);
             }
         }
-        //按时间排序
-        userRechargeListSort(dataList);
     }
 
     private static void userRechargeListSort(List<JSONObject> list) {