|
@@ -5,10 +5,11 @@ import cn.com.ctop.kuaishou.modules.report.service.IKuaiShouYiCheReportService;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.util.DateUtils;
|
|
import org.jeecg.common.util.DateUtils;
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.util.Calendar;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
@@ -16,7 +17,7 @@ import java.util.Map;
|
|
@Slf4j
|
|
@Slf4j
|
|
@Service
|
|
@Service
|
|
public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportService {
|
|
public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportService {
|
|
- @Autowired
|
|
|
|
|
|
+ @Resource
|
|
private KuaiShouYiCheReportMapper kuaiShouYiCheReportMapper;
|
|
private KuaiShouYiCheReportMapper kuaiShouYiCheReportMapper;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -27,70 +28,66 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
|
|
String statDate = requestJson.getString("statDate");
|
|
String statDate = requestJson.getString("statDate");
|
|
|
|
|
|
JSONObject returnJson = new JSONObject();
|
|
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;
|
|
return returnJson;
|
|
}
|
|
}
|
|
|
|
|