From 003c4a396fd946b37c209c41b34bec646e29133b Mon Sep 17 00:00:00 2001 From: gaojuan Date: Fri, 17 Nov 2017 17:38:08 +0800 Subject: [PATCH] bug --- .../job/common/util/DateUtilCustom.java | 19 ++++++ .../job/fsh/job/EnterpriseStatJob.java | 59 +++++++++++-------- .../job/fsh/service/VisitLogServiceImpl.java | 2 +- 3 files changed, 54 insertions(+), 26 deletions(-) diff --git a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java index 30c6892..34f5d34 100644 --- a/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java +++ b/fangjia-job/fangjia-job-common/src/main/java/com/fangjia/job/common/util/DateUtilCustom.java @@ -109,6 +109,25 @@ public class DateUtilCustom { return add(date,Calendar.DATE,amount); } + + /** + * 获取指定日期昨天的时间范围 + * @return + */ + public static Map getYesterday(int addDay) { + Map map = new HashMap(); + 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))); } diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java index 23777bc..6f51fe8 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/job/EnterpriseStatJob.java @@ -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 dateMap = DateUtilCustom.getYesterday(); - String start = dateMap.get("start"); - String end = dateMap.get("end"); - List> result = visitLogService.queryPvList(start, end); - if(result.size() > 0){ - List list = new ArrayList(); - for(Map 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 dateMap = DateUtilCustom.getYesterday(startNum); + Map dateMap = DateUtilCustom.getYesterday(); + String start = dateMap.get("start"); + String end = dateMap.get("end"); + + List> result = visitLogService.queryPvList(start, end); + if(result.size() > 0){ + List list = new ArrayList(); + for(Map 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; +// } + } } diff --git a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/VisitLogServiceImpl.java b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/VisitLogServiceImpl.java index 97d65e0..037094a 100644 --- a/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/VisitLogServiceImpl.java +++ b/fangjia-job/fangjia-job-fsh/src/main/java/com/fangjia/job/fsh/service/VisitLogServiceImpl.java @@ -76,7 +76,7 @@ public class VisitLogServiceImpl extends EntityService implements Visi @Override public List> 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> list = super.getJdbcTemplate().queryForPage(0, Integer.MAX_VALUE, sql, new Object[] {start, end}); return list; }