From cb464c77fdc36b05c706ad85bb58c134a4adf963 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 27 Aug 2018 18:16:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=BD=A6=E6=B5=81=E6=95=B0=E6=8D=AE]:=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/mapper/WxCarCmdLogMapper.java | 1 + .../service/impl/DataTowerServiceImpl.java | 68 +++++++++++++++++++ .../resources/mapper/WxCarCmdLogMapper.xml | 24 +++++-- 3 files changed, 86 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java index d3ecc7564..ccb627ed6 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogMapper.java @@ -13,4 +13,5 @@ public interface WxCarCmdLogMapper extends CommonMapper { List> queryHistory(HashMap params); + List> queryTodayCar(HashMap params); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java index f7566a91c..42d122695 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/DataTowerServiceImpl.java @@ -8,6 +8,7 @@ import com.simple.enums.EnumCarCmd; import com.simple.mapper.*; import com.simple.service.DataTowerService; import com.simple.utils.DateUtils; +import org.apache.commons.collections.map.TransformedMap; import org.apache.log4j.Logger; import org.apache.shiro.crypto.hash.Hash; import org.springframework.beans.factory.annotation.Autowired; @@ -38,6 +39,8 @@ public class DataTowerServiceImpl implements DataTowerService { @Autowired WxCarCmdLogMapper wxCarCmdLogMapper; + + @Override public Map queryRunning(String tenantId) { WxShop wxShop = new WxShop(); @@ -175,9 +178,74 @@ public class DataTowerServiceImpl implements DataTowerService { datamap.put("lasthb","--"); } + params.put("startdate",systemTime+" 05:00:00"); + params.put("enddate",systemTime+" 22:59:59"); + + List> todayCarlist=wxCarCmdLogMapper.queryTodayCar(params); + Map todaycollect = todayCarlist.stream().collect(Collectors.toMap(m -> { + return m.get("create_time"); + }, m -> { + return m.get("carcount"); + })); + TreeMap todaytreemap = getTimeTreeMap(); + todaytreemap.putAll(todaycollect); + + datamap.put("todaycar",todaytreemap); + + String yesterday = DateUtils.getTimeBefore(1, new Date()); + params.put("startdate",yesterday+" 05:00:00"); + params.put("enddate",yesterday+" 22:59:59"); + List> yesterdayCarlist=wxCarCmdLogMapper.queryTodayCar(params); + Map yesterdaycollect = yesterdayCarlist.stream().collect(Collectors.toMap(m -> { + return m.get("create_time"); + }, m -> { + return m.get("carcount"); + })); + TreeMap yesterdaytreemap = getTimeTreeMap(); + yesterdaytreemap.putAll(yesterdaycollect); + + datamap.put("yesterdaycar",yesterdaytreemap); + + + params.put("startdate",startdate+" 05:00:00"); + params.put("enddate",startdate+" 22:59:59"); + List> lastdayCarlist=wxCarCmdLogMapper.queryTodayCar(params); + Map lastdaycollect = lastdayCarlist.stream().collect(Collectors.toMap(m -> { + return m.get("create_time"); + }, m -> { + return m.get("carcount"); + })); + TreeMap lastdaytreemap = getTimeTreeMap(); + lastdaytreemap.putAll(lastdaycollect); + datamap.put("lastdaycar",lastdaytreemap); + return datamap; } + public TreeMap getTimeTreeMap(){ + TreeMap timemap=new TreeMap(); + timemap.put("06:00",0); + timemap.put("07:00",0); + timemap.put("08:00",0); + timemap.put("09:00",0); + timemap.put("10:00",0); + timemap.put("11:00",0); + timemap.put("12:00",0); + timemap.put("13:00",0); + timemap.put("14:00",0); + timemap.put("15:00",0); + timemap.put("16:00",0); + timemap.put("17:00",0); + timemap.put("18:00",0); + timemap.put("19:00",0); + timemap.put("20:00",0); + timemap.put("21:00",0); + timemap.put("22:00",0); + timemap.put("23:00",0); + return timemap; + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml index 21d690409..43572c99e 100644 --- a/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml @@ -69,13 +69,23 @@ - + + + + +