From b4e42f49f1572b62268a87a2e9f4f4413e37c70b Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 25 Feb 2022 00:09:45 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/WxCarCmdLogService.java | 2 +- .../service/impl/WxCarCmdLogServiceImpl.java | 14 +++++------ .../service/impl/WxChartServiceImpl.java | 23 +++++++++++-------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java index dc8c69a30..9c8af70b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java @@ -54,7 +54,7 @@ public interface WxCarCmdLogService { WxCarCmdLog getBySynId(HashMap params); - Map getHourCountMap(WxCarCmdLog wxCarCmdLog); + Map getHourCountMap(WxCarCmdLog wxCarCmdLog); long queryHistoryCount(HashMap weekParams); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java index b27e3966b..31b5fd162 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java @@ -78,28 +78,28 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService { } @Override - public Map getHourCountMap(WxCarCmdLog wxCarCmdLog) { + public Map getHourCountMap(WxCarCmdLog wxCarCmdLog) { if(StringUtils.isBlank(wxCarCmdLog.getTenantId()) && StringUtils.isNotBlank(wxCarCmdLog.getParentTenantId())){ List tenantEntitys = wxMallMapper.getTenantEntitys(wxCarCmdLog); - Map map = new HashMap<>(); + Map map = new HashMap<>(); for (TenantEntity tenantEntity:tenantEntitys) { wxCarCmdLog.updateTenantInfo(tenantEntity); List> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog); - Map collect = list.stream().collect(Collectors.toMap(m -> { + Map collect = list.stream().collect(Collectors.toMap(m -> { return (String)m.get("create_time"); }, m -> { - return (Integer)m.get("carcount"); + return (Long)m.get("carcount"); })); - collect.forEach((key,value) -> map.merge(key,value,Integer::sum)); + collect.forEach((key,value) -> map.merge(key,value,Long::sum)); } return map; } List> list = wxCarCmdLogMapper.queryTodayCar(wxCarCmdLog); - Map collect = list.stream().collect(Collectors.toMap(m -> { + Map collect = list.stream().collect(Collectors.toMap(m -> { return (String)m.get("create_time"); }, m -> { - return (Integer)m.get("carcount"); + return (Long)m.get("carcount"); })); return collect; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index d551fc123..7e047fa49 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -859,7 +859,7 @@ public class WxChartServiceImpl implements WxChartDataService { wxCarCmdLog.setCmdTypes(EnumCarCmd.getCarIn()); wxCarCmdLog.setStartdate(DateUtils.stringToDate(systemTime + " 05:00:00","yyyy-MM-dd HH:mm:ss")); wxCarCmdLog.setEnddate(new Date()); - Map todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); + Map todaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); List hourList = new ArrayList<>(); Calendar instance = Calendar.getInstance(); @@ -870,12 +870,13 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = startHour; i < endHour; i++) { hourList.add(i < 10 ? "0" + i + ":00" : i + ":00"); } - List todayCarList = new ArrayList<>(); + List todayCarList = new ArrayList<>(); for (int i = startHour; i < endHour; i++) { if(i yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); - List yesterdayCarList = new ArrayList<>(); + Map yesterdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); + List yesterdayCarList = new ArrayList<>(); for (int i = startHour; i < endHour; i++) { - yesterdayCarList.add(yesterdaycollect.get((Object) hourList.get(i-startHour))); + Long count = yesterdaycollect.get(hourList.get(i - startHour)); + yesterdayCarList.add(count == null?0l:count); } datamap.put("yesterdaycardata", yesterdayCarList); wxCarCmdLog.setStartdate(DateUtils.stringToDate(lastweek + " 05:00:00","yyyy-MM-dd HH:mm:ss")); wxCarCmdLog.setEnddate(DateUtils.stringToDate(lastweek + " 22:59:59","yyyy-MM-dd HH:mm:ss")); - Map lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); - List lastweekdayCarList = new ArrayList<>(); + Map lastweekdaycollect = wxCarCmdLogService.getHourCountMap(wxCarCmdLog); + List lastweekdayCarList = new ArrayList<>(); for (int i = startHour; i < endHour; i++) { - lastweekdayCarList.add(lastweekdaycollect.get((Object) hourList.get(i-startHour))); + Long count = lastweekdaycollect.get(hourList.get(i - startHour)); + lastweekdayCarList.add(count == null?0l:count); } datamap.put("lastdaycardata", lastweekdayCarList);