This commit is contained in:
2017-11-17 17:38:08 +08:00
parent 03929ed463
commit 003c4a396f
3 changed files with 54 additions and 26 deletions
@@ -109,6 +109,25 @@ public class DateUtilCustom {
return add(date,Calendar.DATE,amount);
}
/**
* 获取指定日期昨天的时间范围
* @return
*/
public static Map<String, String> getYesterday(int addDay) {
Map<String, String> map = new HashMap<String, String>();
DateTime dt = new DateTime();
// 昨天
DateTime yesterday = dt.minusDays(addDay);
String start = yesterday.toString("yyyy-MM-dd") + " 00:00:00";
DateTime day = dt.minusDays(addDay-1);
String end = day.toString("yyyy-MM-dd") + " 00:00:00";
map.put("start", start);
map.put("end", end);
return map;
}
public static void main(String[] args) {
System.err.println(JsonUtils.toJson(getLatelyDate(3)));
}
@@ -153,33 +153,42 @@ public class EnterpriseStatJob implements SimpleJob {
private void processPageStat(){
Date date = DateUtilCustom.add(new Date(), -1);
String fDate = DateUtilCustom.formatByPattern(date, "yyyy-MM-dd");
//删除老数据
pageStatService.deleteByParams(fDate);
Map<String, String> dateMap = DateUtilCustom.getYesterday();
String start = dateMap.get("start");
String end = dateMap.get("end");
List<Map<String, Object>> result = visitLogService.queryPvList(start, end);
if(result.size() > 0){
List<PageStat> list = new ArrayList<PageStat>();
for(Map<String, Object> m : result){
String city = (String) m.get("city");
if(StringUtils.isNotBlank(city)){
PageStat stat = new PageStat();
stat.setCity((String) m.get("city"));
stat.setEid((Long) m.get("eid"));
stat.setUri((String) m.get("uri"));
stat.setPv((Long) m.get("pv"));
stat.setUv((Long) m.get("uv"));
stat.setCreateDate(date);
stat.setFormatDate(fDate);
list.add(stat);
int startNum = 1;
// while(startNum<=10){
Date date = DateUtilCustom.add(new Date(), -1*startNum);
String fDate = DateUtilCustom.formatByPattern(date, "yyyy-MM-dd");
//删除老数据
pageStatService.deleteByParams(fDate);
//Map<String, String> dateMap = DateUtilCustom.getYesterday(startNum);
Map<String, String> dateMap = DateUtilCustom.getYesterday();
String start = dateMap.get("start");
String end = dateMap.get("end");
List<Map<String, Object>> result = visitLogService.queryPvList(start, end);
if(result.size() > 0){
List<PageStat> list = new ArrayList<PageStat>();
for(Map<String, Object> m : result){
String city = (String) m.get("city");
if(StringUtils.isNotBlank(city)){
PageStat stat = new PageStat();
stat.setCity((String) m.get("city"));
stat.setEid((Long) m.get("eid"));
stat.setUri((String) m.get("uri"));
stat.setPv((Long) m.get("pv"));
stat.setUv((Long) m.get("uv"));
stat.setCreateDate(date);
stat.setFormatDate(fDate);
list.add(stat);
}
}
pageStatService.saveAll(list);
}
pageStatService.saveAll(list);
}
//startNum = startNum + 1;
// }
}
}
@@ -76,7 +76,7 @@ public class VisitLogServiceImpl extends EntityService<VisitLog> implements Visi
@Override
public List<Map<String, Object>> queryPvList(String start, String end) {
String sql = "SELECT eid,city, uri,COUNT(uri) as pv,COUNT(DISTINCT(ip)) as uv FROM visit_log WHERE visit_time BETWEEN ? AND ? GROUP BY eid,city,uri";
String sql = "SELECT eid,city, uri,COUNT(uri) as pv,COUNT(DISTINCT(uid)) as uv FROM visit_log WHERE visit_time BETWEEN ? AND ? GROUP BY eid,city,uri";
List<Map<String, Object>> list = super.getJdbcTemplate().queryForPage(0, Integer.MAX_VALUE, sql, new Object[] {start, end});
return list;
}