From e8d285b6dccbf5f590b175caa08f415949a1a185 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Mon, 8 Oct 2018 17:12:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=95=B0=E6=8D=AE=E5=A1=94=E5=8F=B0][?= =?UTF-8?q?=E8=90=A5=E9=94=80=E6=95=B0=E6=8D=AE][=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=95=B0=E6=8D=AE=E4=B8=BA30=E5=A4=A9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataTowerServiceImpl.java | 2 +- .../impl/MarkingDataReportServiceImpl.java | 25 ++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) 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 1393979e2..982271202 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -158,7 +158,7 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap params = new HashMap<>(); params.put("tenantId",tenantId); params.put("cmdType",EnumCarCmd.CAR_ETCP_CALLBACK_PARK_OUT.getCode()); - String startdate = DateUtils.getTimeBefore(7, new Date()); + String startdate = DateUtils.getTimeBefore(29, new Date()); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); List tjTimeList = DateUtils.getTjTimeList(startdate, systemTime, "0"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java index 4cf4de677..18cb4b6df 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java @@ -205,12 +205,35 @@ public class MarkingDataReportServiceImpl implements MarkingDataReportService { vo.setVerifyCount(verifyCountMap.get(vo.getxTime()) == null ? 0 : verifyCountMap.get(vo.getxTime())); } + String startdate = DateUtils.getTimeBefore(29, new Date()); + String enddate = DateUtils.getTimeBefore(1,new Date()); + List tjTimeList = DateUtils.getTjTimeList(startdate, enddate, "0"); + List tjList = tjTimeList.stream().map(d -> d.substring(5).replace("-", "/")).collect(Collectors.toList()); + List tempDatalist =new LinkedList<>(); + + for(String tj:tjList){ + Optional first = list.stream().filter(c -> c.getxTime().equals(tj)).findFirst(); + if(!first.isPresent()){ + MarkingSceneDataReportVo markingSceneDataReportVo = new MarkingSceneDataReportVo(); + markingSceneDataReportVo.setxTime(tj); + markingSceneDataReportVo.setParkCount(0); + markingSceneDataReportVo.setVerifyCount(0); + markingSceneDataReportVo.setTempCount(0); + markingSceneDataReportVo.setCarCount(0); + markingSceneDataReportVo.setParkSendCount(0); + markingSceneDataReportVo.setVerifySendCount(0); + tempDatalist.add(markingSceneDataReportVo); + continue; + } + tempDatalist.add(first.get()); + } + HashMap returnMap = new HashMap<>(); returnMap.put("sceneDownDay", sceneDownDay);//比昨日下降 returnMap.put("sceneUpWeek", sceneUpWeek);//比上周提升 returnMap.put("todaySceneCount", todaySceneCount);//今日领取数 - returnMap.put("sceneDataMap", list); + returnMap.put("sceneDataMap", tempDatalist); return returnMap; }