diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 11897be3a..c818766e0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -477,6 +477,7 @@ public class DataTowerServiceImpl implements DataTowerService { @Override public Map queryCar(String tenantId) { + logger.info("停车-月统计-开始"); HashMap params = new HashMap<>(); params.put("tenantId", tenantId); params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PARK_IN.getCode()); @@ -507,8 +508,10 @@ public class DataTowerServiceImpl implements DataTowerService { } Map datamap = new HashMap<>(); datamap.put("history", historymap); + logger.info("停车-月统计-结束"); // 查询近一周的缴费车辆----start------ + logger.info("停车-查询近一周的缴费车辆-开始"); HashMap weekParams = new HashMap<>(); weekParams.put("tenantId", tenantId); String oneWeekStartdate = DateUtils.getTimeBefore(7, new Date()); @@ -518,8 +521,10 @@ public class DataTowerServiceImpl implements DataTowerService { weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); datamap.put("oneWeekCarPayCount",wxCarCmdLogMapper.queryWeekCarPayCount(weekParams)); + logger.info("停车-查询近一周的缴费车辆-结束"); // 近一周缴费金额 + logger.info("停车-查询近一周的缴费金额-开始"); weekParams.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode()); List> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(weekParams); Map weekCollect = weekCarPayHistoryList.stream().collect(Collectors.toMap(m -> { @@ -537,8 +542,10 @@ public class DataTowerServiceImpl implements DataTowerService { weekMap.put(key,weekCollect.get(key)); } datamap.put("oneWeekCarPayFeeCount",weekMap); + logger.info("停车-查询近一周的缴费金额-结束"); // 近一周新增会员历史 + logger.info("停车-近一周新增会员历史-开始"); List> carCountHistory = wxCUserCarMapper.queryCarCountHistory(weekParams); Map weekCarCollect = carCountHistory.stream().collect(Collectors.toMap(m -> { return (String)m.get("create_time"); @@ -553,8 +560,10 @@ public class DataTowerServiceImpl implements DataTowerService { weekCarMap.put(key,weekCarCollect.get(key)); } datamap.put("oneWeekNewCarUserHistory",weekCarMap); + logger.info("停车-近一周新增会员历史-结束"); //近一周新增停车会员数 + logger.info("停车-近一周新增停车会员数-开始"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.setTenantId(tenantId); @@ -565,14 +574,18 @@ public class DataTowerServiceImpl implements DataTowerService { e.printStackTrace(); } datamap.put("oneWeekNewCarUserCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); + logger.info("停车-近一周新增停车会员数-结束"); //停车会员总数 + logger.info("停车-停车会员总数-开始"); wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); wxCUserBasicInfoDto.setTenantId(tenantId); datamap.put("newCarUserSumCount",wxCUserCarMapper.countUser(wxCUserBasicInfoDto)); + logger.info("停车-停车会员总数-结束"); // 查询近一周的缴费车辆----end------ //今日车流量 + logger.info("停车-今日车流量-开始"); long todaycar = (long) historymap.get(DateUtils.getSystemTime("MM/dd")); datamap.put("todaycar", todaycar); //环比 @@ -585,8 +598,10 @@ public class DataTowerServiceImpl implements DataTowerService { } else { datamap.put("hb", "--"); } + logger.info("停车-今日车流量-结束"); //上周同期 + logger.info("停车-上周同期-开始"); String lastweek = DateUtils.getTimeBefore(7, new Date()); long last = (long) historymap.get(lastweek.substring(5).replace("-", "/")); if (last > 0) { @@ -596,7 +611,10 @@ public class DataTowerServiceImpl implements DataTowerService { } else { datamap.put("lasthb", "--"); } + logger.info("停车-上周同期-结束"); + // 今日 + logger.info("停车-今日停车数据-开始"); params.put("startdate", systemTime + " 05:00:00"); params.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); @@ -623,7 +641,10 @@ public class DataTowerServiceImpl implements DataTowerService { hourMap.putAll(todaycollect); datamap.put("todaycardata", hourMap); + logger.info("停车-今日停车数据-结束"); + // 昨日 + logger.info("停车-昨日停车数据-开始"); params.put("startdate", yesterday + " 05:00:00"); params.put("enddate", yesterday + " 22:59:59"); List> yesterdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); @@ -636,20 +657,25 @@ public class DataTowerServiceImpl implements DataTowerService { yesterdaytreemap.putAll(yesterdaycollect); datamap.put("yesterdaycardata", yesterdaytreemap); + logger.info("停车-昨日停车数据-结束"); + // 上周同期 + logger.info("停车-上周同期停车数据-开始"); params.put("startdate", lastweek + " 05:00:00"); params.put("enddate", lastweek + " 22:59:59"); - List> lastdayCarlist = wxCarCmdLogMapper.queryTodayCar(params); - Map lastdaycollect = lastdayCarlist.stream().collect(Collectors.toMap(m -> { + List> lastweekCarlist = wxCarCmdLogMapper.queryTodayCar(params); + Map lastweekcollect = lastweekCarlist.stream().collect(Collectors.toMap(m -> { return m.get("create_time"); }, m -> { return m.get("carcount"); })); - TreeMap lastdaytreemap = getTimeTreeMap(); - lastdaytreemap.putAll(lastdaycollect); - datamap.put("lastdaycardata", lastdaytreemap); + TreeMap lastweektreemap = getTimeTreeMap(); + lastweektreemap.putAll(lastweekcollect); + datamap.put("lastdaycardata", lastweektreemap); + logger.info("停车-上周同期停车数据-结束"); //绑定车牌 + logger.info("停车-绑定车牌-开始"); Map carParams=new HashMap<>(); carParams.put("tenantId",tenantId); carParams.put("startdate",DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); @@ -678,6 +704,7 @@ public class DataTowerServiceImpl implements DataTowerService { } else { datamap.put("lastweekbindhb", "--"); } + logger.info("停车-绑定车牌-结束"); return datamap;