Kaynağa Gözat

Merge remote-tracking branch 'origin/V1.1.6' into V1.1.6

jiequan.bi 4 yıl önce
ebeveyn
işleme
915724a168

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/KuaiShouGroupTemplateMapper.java

@@ -22,7 +22,7 @@ public interface KuaiShouGroupTemplateMapper extends BaseMapper<KuaiShouGroupTem
 
     Integer getApiCreateCount(@Param("accountId") Long accountId, @Param("date") String date);
 
-    JSONObject getUrlByPhotoId(@Param("photoId") Long photoId);
+    JSONObject getUrlByPhotoId(@Param("photoId") String photoId);
 
     JSONObject getImageJsonByMd5(String md5);
 

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupTemplateServiceImpl.java

@@ -520,7 +520,7 @@ public class KuaiShouGroupTemplateServiceImpl extends ServiceImpl<KuaiShouGroupT
      */
     @Override
     public JSONObject getUrlByPhotoId(Long photoId) {
-        return groupTemplateMapper.getUrlByPhotoId(photoId);
+        return groupTemplateMapper.getUrlByPhotoId(photoId.toString());
     }
 
     /**

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

@@ -17,7 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EtlKuaishouReportAccountDailyMapper extends BaseMapper<EtlKuaishouReportAccountDaily> {
 
-    void replaceBatch(@Param("list") List<EtlKuaishouReportAccountDaily> list);
+    void replaceBatch(@Param("list") List<EtlKuaishouReportAccountHourly> list);
 
     EtlKuaishouReportAccountHourly getOnedayAggregatebyDaily(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("accountId") Long accountId);
 

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

@@ -51,7 +51,7 @@ public interface KuaishouReportDailyAccountMapper extends BaseMapper<KuaishouRep
 
     void replaceBatchAdScene(@Param("addList") List<KuaishouReportDailyAccount> addList);
 
-    List<EtlKuaishouReportAccountDaily> queryEveryDayDataForAccount();
+    List<EtlKuaishouReportAccountHourly> queryEveryDayDataForAccount();
 
     BigDecimal getSumChargeByAccountIdAndStatDate(@Param("accountId") Long accountId, @Param("statDate") String statDate);
 }

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

@@ -1452,7 +1452,7 @@
     </select>
 
     <select id="queryEveryDayDataForAccount"
-            resultType="cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouReportAccountDaily">
+            resultType="cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouReportAccountHourly">
     SELECT stat_date,
            account_id,
            SUM(charge) as 'charge',

+ 2 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/EtlKuaishouReportAccountDailyServiceImpl.java

@@ -2,6 +2,7 @@ package cn.com.ctop.kuaishou.modules.report.service.impl;
 
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouReportAccountDaily;
+import cn.com.ctop.kuaishou.modules.report.entity.EtlKuaishouReportAccountHourly;
 import cn.com.ctop.kuaishou.modules.report.mapper.EtlKuaishouReportAccountDailyMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IEtlKuaishouReportAccountDailyService;
@@ -29,7 +30,7 @@ public class EtlKuaishouReportAccountDailyServiceImpl extends ServiceImpl<EtlKua
 
     @Override
     public void queryEveryDayDataForAccount() {
-        List<EtlKuaishouReportAccountDaily> list = dailyAccountMapper.queryEveryDayDataForAccount();
+        List<EtlKuaishouReportAccountHourly> list = dailyAccountMapper.queryEveryDayDataForAccount();
         if (!Check.isNull(list)) {
             etlDailyAccountMapper.replaceBatch(list);
         }

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

@@ -64,6 +64,7 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
         if (!Check.isNull(list)) {
             etlHourlyAccountMapper.replaceBatch(list);
         }
+        etlDailyAccountMapper.replaceBatch(list);
     }
 
     @Override
@@ -128,8 +129,8 @@ public class EtlKuaishouReportAccountHourlyServiceImpl extends ServiceImpl<EtlKu
             if ("photo_comment".equals(value)) {
                 value = "comment";
             }
-            if("play_3s_count".equals(value)){
-                value =  value = request.getString("value");
+            if ("play_3s_count".equals(value)) {
+                value = value = request.getString("value");
                 type = "more";
             }
             todayList = etlHourlyAccountMapper.getOnedayEtlReportList(startTime, accountId, value, type);

+ 63 - 66
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouYiCheReportServiceImpl.java

@@ -5,10 +5,11 @@ import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouYiCheReportService;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,7 +17,7 @@ import java.util.Map;
 @Slf4j
 @Service
 public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportService {
-    @Autowired
+    @Resource
     private KuaiShouYiCheReportMapper kuaiShouYiCheReportMapper;
 
     @Override
@@ -27,70 +28,66 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
         String statDate = requestJson.getString("statDate");
 
         JSONObject returnJson = new JSONObject();
-        Integer maxHour = kuaiShouYiCheReportMapper.getMaxHourByProjectIdAndStatDate(statDate, projectId);
-        if (maxHour != null) {
-            Map<String, Object> requestMap = new HashMap<>();
-            requestMap.put("projectId", projectId);
-            requestMap.put("disCount", disCount);
-            requestMap.put("statDate", statDate);
-            requestMap.put("statHour", maxHour);
-
-
-            String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -1);
-            String weekAgoDay = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -6);
-
-            // 安卓
-            requestMap.put("systemType", "android");
-            // 账号
-            List<JSONObject> androidReportArr = kuaiShouYiCheReportMapper.selectReportByMap(requestMap);
-
-            // 今日
-            requestMap.put("statDate", statDate);
-            requestMap.put("dateDesc", statDate + "整体数据");
-            JSONObject nowJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            androidReportArr.add(nowJson);
-
-            // 昨日
-            requestMap.put("statDate", yesterday);
-            requestMap.put("dateDesc", "昨日整体数据");
-            JSONObject yesterdayJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            androidReportArr.add(yesterdayJson);
-            // 七日
-            requestMap.put("statDate", weekAgoDay);
-            requestMap.put("dateDesc", "上周同期整体数据");
-
-            JSONObject weekAgoJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            androidReportArr.add(weekAgoJson);
-
-
-            // ios
-            requestMap.put("systemType", "ios");
-            requestMap.put("statDate", statDate);
-            // 账号
-            List<JSONObject> iosReportArr = kuaiShouYiCheReportMapper.selectReportByMap(requestMap);
-
-            // 今日
-
-            requestMap.put("dateDesc", statDate + "整体数据");
-            JSONObject iosNowJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            iosReportArr.add(iosNowJson);
-
-
-            // 昨日
-            requestMap.put("statDate", yesterday);
-            requestMap.put("dateDesc", "昨日整体数据");
-            JSONObject iosYesterdayJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            iosReportArr.add(iosYesterdayJson);
-            // 七日
-            requestMap.put("statDate", weekAgoDay);
-            requestMap.put("dateDesc", "上周同期整体数据");
-            JSONObject iosWeekAgoJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
-            iosReportArr.add(iosWeekAgoJson);
-
-            returnJson.put("android", androidReportArr);
-            returnJson.put("ios", iosReportArr);
-        }
-
+        Calendar calendar = Calendar.getInstance();
+        int maxHour = calendar.get(Calendar.HOUR_OF_DAY);
+
+        Map<String, Object> requestMap = new HashMap<>();
+        requestMap.put("projectId", projectId);
+        requestMap.put("disCount", disCount);
+        requestMap.put("statDate", statDate);
+        requestMap.put("statHour", maxHour);
+
+        String yesterday = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -1);
+        String weekAgoDay = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, -6);
+
+        // 安卓
+        requestMap.put("systemType", "android");
+        // 账号
+        List<JSONObject> androidReportArr = kuaiShouYiCheReportMapper.selectReportByMap(requestMap);
+
+        // 今日
+        requestMap.put("statDate", statDate);
+        requestMap.put("dateDesc", statDate + "整体数据");
+        JSONObject nowJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        androidReportArr.add(nowJson);
+
+        // 昨日
+        requestMap.put("statDate", yesterday);
+        requestMap.put("dateDesc", "昨日整体数据");
+        JSONObject yesterdayJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        androidReportArr.add(yesterdayJson);
+        // 七日
+        requestMap.put("statDate", weekAgoDay);
+        requestMap.put("dateDesc", "上周同期整体数据");
+
+        JSONObject weekAgoJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        androidReportArr.add(weekAgoJson);
+
+
+        // ios
+        requestMap.put("systemType", "ios");
+        requestMap.put("statDate", statDate);
+        // 账号
+        List<JSONObject> iosReportArr = kuaiShouYiCheReportMapper.selectReportByMap(requestMap);
+
+        // 今日
+        requestMap.put("dateDesc", statDate + "整体数据");
+        JSONObject iosNowJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        iosReportArr.add(iosNowJson);
+
+        // 昨日
+        requestMap.put("statDate", yesterday);
+        requestMap.put("dateDesc", "昨日整体数据");
+        JSONObject iosYesterdayJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        iosReportArr.add(iosYesterdayJson);
+        // 七日
+        requestMap.put("statDate", weekAgoDay);
+        requestMap.put("dateDesc", "上周同期整体数据");
+        JSONObject iosWeekAgoJson = kuaiShouYiCheReportMapper.selectSumReportByMap(requestMap);
+        iosReportArr.add(iosWeekAgoJson);
+
+        returnJson.put("android", androidReportArr);
+        returnJson.put("ios", iosReportArr);
         return returnJson;
     }