diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java index 942dd50..70987fc 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java @@ -511,7 +511,7 @@ public class BerthsStatisticController extends BizController { request.setBaseRequest(new BaseInfo(1, 0)); request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); List xAxisData = Lists.newArrayList(); @@ -594,7 +594,7 @@ public class BerthsStatisticController extends BizController { request.setBaseRequest(new BaseInfo(1, 0)); BizResult> bizResult = parkingLotStatisticService .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); String[] title = new String[] { "时间","停车场名称", "占用率", "周转率" }; String sheetName = "车位管理"; @@ -649,14 +649,9 @@ public class BerthsStatisticController extends BizController { request.setBaseRequest(new BaseInfo(1, 0)); request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); - Calendar beginTimec = Calendar.getInstance(); - beginTimec.setTime(request.getBeginTime()); - - Calendar endTimec = Calendar.getInstance(); - endTimec.setTime(request.getEndTime()); Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), new Timestamp(request.getBeginTime().getTime())); @@ -664,7 +659,7 @@ public class BerthsStatisticController extends BizController { List xAxisData = Lists.newArrayList(); String[] title = new String[dayDifference.intValue()+2]; title[0]=""; - for (int i = 0; i <= dayDifference.intValue(); i++) { + for (int i = 0; i < dayDifference.intValue(); i++) { Calendar tempDate = Calendar.getInstance(); tempDate.setTime(request.getBeginTime()); tempDate.add(Calendar.DAY_OF_MONTH, i); diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java index e7bcdd6..73871ee 100644 --- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java +++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java @@ -354,7 +354,7 @@ public class VehicleFlowStatisticController extends BizController { BizResult> bizResult = parkingLotStatisticService .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); String[] title = new String[] { "时间", "停车场", "进场车流量", "出场车流量" }; String sheetName = "月报表车流量管理"; @@ -406,7 +406,7 @@ public class VehicleFlowStatisticController extends BizController { request.setBaseRequest(new BaseInfo(1, 0)); request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); List xAxisData = Lists.newArrayList(); @@ -468,14 +468,9 @@ public class VehicleFlowStatisticController extends BizController { request.setBaseRequest(new BaseInfo(1, 0)); request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); - Calendar beginTimec = Calendar.getInstance(); - beginTimec.setTime(request.getBeginTime()); - - Calendar endTimec = Calendar.getInstance(); - endTimec.setTime(request.getEndTime()); Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), new Timestamp(request.getBeginTime().getTime())); @@ -483,7 +478,7 @@ public class VehicleFlowStatisticController extends BizController { List xAxisData = Lists.newArrayList(); String[] title = new String[dayDifference.intValue() + 2]; title[0] = ""; - for (int i = 0; i <= dayDifference.intValue(); i++) { + for (int i = 0; i < dayDifference.intValue(); i++) { Calendar tempDate = Calendar.getInstance(); tempDate.setTime(request.getBeginTime()); tempDate.add(Calendar.DAY_OF_MONTH, i);