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 4d575ed3d..8c79305fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -584,57 +584,38 @@ public class DataTowerServiceImpl implements DataTowerService { lastdaytreemap.putAll(lastdaycollect); datamap.put("lastdaycardata", lastdaytreemap); + //绑定车牌 + Map carParams=new HashMap<>(); + carParams.put("tenantId",tenantId); + carParams.put("startdate",DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); + carParams.put("enddate",DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); + long todaybindcar = wxCUserCarMapper.queryCarCount(carParams); + carParams.put("startdate",yesterday+" 00:00:00"); + carParams.put("enddate",yesterday+" 23:59:59"); + long yesterdaybindcar = wxCUserCarMapper.queryCarCount(carParams); + carParams.put("startdate",lastweek+" 00:00:00"); + carParams.put("enddate",lastweek+" 23:59:59"); + long lastweekbindcar = wxCUserCarMapper.queryCarCount(carParams); + datamap.put("todaybindcar",todaybindcar); - //目前为止总车牌数 - WxCUserCar wxCUserCar = new WxCUserCar(); - wxCUserCar.setTenantId(tenantId); - List plateNumberTotalList = wxCUserCarMapper.findList(wxCUserCar).stream() - .map(WxCUserCar::getCarNumber).distinct().collect(Collectors.toList()); - //今日车牌 - Map carParams = new HashMap<>(); - carParams.put("tenantId", tenantId); - carParams.put("startdate", DateUtils.getSystemTime("yyyy-MM-dd 00:00:00")); - carParams.put("enddate", DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); - List plateNumberTodayList = wxCarCmdLogMapper.queryPlateNumberList(carParams).stream(). - map(c -> c.get("plateNumber").toString()).collect(Collectors.toList()); - //今日绑定车牌 - plateNumberTodayList.retainAll(plateNumberTotalList); - long todaybindcar = plateNumberTodayList.size(); - //昨日车牌 - carParams.put("startdate", yesterday + " 00:00:00"); - carParams.put("enddate", yesterday + " 23:59:59"); - List plateNumberYesterdayList = wxCarCmdLogMapper.queryPlateNumberList(carParams).stream(). - map(c -> c.get("plateNumber").toString()).collect(Collectors.toList()); - //昨日绑定车牌 - plateNumberYesterdayList.retainAll(plateNumberTotalList); - long yesterdaybindcar = plateNumberYesterdayList.size(); - //上周车牌 - carParams.put("startdate", lastweek + " 00:00:00"); - carParams.put("enddate", lastweek + " 23:59:59"); - List plateNumberLastweekList = wxCarCmdLogMapper.queryPlateNumberList(carParams).stream(). - map(c -> c.get("plateNumber").toString()).collect(Collectors.toList()); - plateNumberLastweekList.retainAll(plateNumberTotalList); - long lastweekbindcar = plateNumberLastweekList.size(); - //今日绑定车牌数 - datamap.put("todaybindcar", todaybindcar); - //绑定车牌数日环比 if (yesterdaybindcar > 0) { double yesterdaybinddhb = (double) (todaybindcar - yesterdaybindcar) / yesterdaybindcar * 100; double yesterdaybindhb = new BigDecimal(yesterdaybinddhb).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("yesterdaybindhb", yesterdaybindhb + "%"); + datamap.put("yesterdaybindhb", yesterdaybindhb+"%"); } else { datamap.put("yesterdaybindhb", "--"); } - //绑定车牌数周同比 + if (lastweekbindcar > 0) { double lastweekbinddhb = (double) (todaybindcar - lastweekbindcar) / lastweekbindcar * 100; double lastweekbindhb = new BigDecimal(lastweekbinddhb).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); - datamap.put("lastweekbindhb", lastweekbindhb + "%"); + datamap.put("lastweekbindhb", lastweekbindhb+"%"); } else { datamap.put("lastweekbindhb", "--"); } return datamap; + } @Override