Commit bec2fbc48c5dc8cf3ad13a28a9299c58c5b297cd
1 parent
db092a1c
tijiao
Showing
2 changed files
with
8 additions
and
18 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/BerthsStatisticController.java
| @@ -511,7 +511,7 @@ public class BerthsStatisticController extends BizController { | @@ -511,7 +511,7 @@ public class BerthsStatisticController extends BizController { | ||
| 511 | request.setBaseRequest(new BaseInfo(1, 0)); | 511 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 512 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); | 512 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); |
| 513 | 513 | ||
| 514 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 514 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 515 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 515 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 516 | 516 | ||
| 517 | List<String> xAxisData = Lists.newArrayList(); | 517 | List<String> xAxisData = Lists.newArrayList(); |
| @@ -594,7 +594,7 @@ public class BerthsStatisticController extends BizController { | @@ -594,7 +594,7 @@ public class BerthsStatisticController extends BizController { | ||
| 594 | request.setBaseRequest(new BaseInfo(1, 0)); | 594 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 595 | BizResult<PageBean<MonthVehicleFlowAndVacancyRateAndTurnoverDTO>> bizResult = parkingLotStatisticService | 595 | BizResult<PageBean<MonthVehicleFlowAndVacancyRateAndTurnoverDTO>> bizResult = parkingLotStatisticService |
| 596 | .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); | 596 | .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); |
| 597 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 597 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 598 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 598 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 599 | String[] title = new String[] { "时间","停车场名称", "占用率", "周转率" }; | 599 | String[] title = new String[] { "时间","停车场名称", "占用率", "周转率" }; |
| 600 | String sheetName = "车位管理"; | 600 | String sheetName = "车位管理"; |
| @@ -649,14 +649,9 @@ public class BerthsStatisticController extends BizController { | @@ -649,14 +649,9 @@ public class BerthsStatisticController extends BizController { | ||
| 649 | request.setBaseRequest(new BaseInfo(1, 0)); | 649 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 650 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); | 650 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); |
| 651 | 651 | ||
| 652 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 652 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 653 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 653 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 654 | 654 | ||
| 655 | - Calendar beginTimec = Calendar.getInstance(); | ||
| 656 | - beginTimec.setTime(request.getBeginTime()); | ||
| 657 | - | ||
| 658 | - Calendar endTimec = Calendar.getInstance(); | ||
| 659 | - endTimec.setTime(request.getEndTime()); | ||
| 660 | 655 | ||
| 661 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), | 656 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), |
| 662 | new Timestamp(request.getBeginTime().getTime())); | 657 | new Timestamp(request.getBeginTime().getTime())); |
| @@ -664,7 +659,7 @@ public class BerthsStatisticController extends BizController { | @@ -664,7 +659,7 @@ public class BerthsStatisticController extends BizController { | ||
| 664 | List<String> xAxisData = Lists.newArrayList(); | 659 | List<String> xAxisData = Lists.newArrayList(); |
| 665 | String[] title = new String[dayDifference.intValue()+2]; | 660 | String[] title = new String[dayDifference.intValue()+2]; |
| 666 | title[0]=""; | 661 | title[0]=""; |
| 667 | - for (int i = 0; i <= dayDifference.intValue(); i++) { | 662 | + for (int i = 0; i < dayDifference.intValue(); i++) { |
| 668 | Calendar tempDate = Calendar.getInstance(); | 663 | Calendar tempDate = Calendar.getInstance(); |
| 669 | tempDate.setTime(request.getBeginTime()); | 664 | tempDate.setTime(request.getBeginTime()); |
| 670 | tempDate.add(Calendar.DAY_OF_MONTH, i); | 665 | tempDate.add(Calendar.DAY_OF_MONTH, i); |
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/datastatistic/VehicleFlowStatisticController.java
| @@ -354,7 +354,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -354,7 +354,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 354 | BizResult<PageBean<MonthVehicleFlowAndVacancyRateAndTurnoverDTO>> bizResult = parkingLotStatisticService | 354 | BizResult<PageBean<MonthVehicleFlowAndVacancyRateAndTurnoverDTO>> bizResult = parkingLotStatisticService |
| 355 | .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); | 355 | .queryMonthVehicleFlowAndVacancyRateAndTurnover(request); |
| 356 | 356 | ||
| 357 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 357 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 358 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 358 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 359 | String[] title = new String[] { "时间", "停车场", "进场车流量", "出场车流量" }; | 359 | String[] title = new String[] { "时间", "停车场", "进场车流量", "出场车流量" }; |
| 360 | String sheetName = "月报表车流量管理"; | 360 | String sheetName = "月报表车流量管理"; |
| @@ -406,7 +406,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -406,7 +406,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 406 | request.setBaseRequest(new BaseInfo(1, 0)); | 406 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 407 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); | 407 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1HOUR); |
| 408 | 408 | ||
| 409 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 409 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 410 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 410 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 411 | 411 | ||
| 412 | List<String> xAxisData = Lists.newArrayList(); | 412 | List<String> xAxisData = Lists.newArrayList(); |
| @@ -468,14 +468,9 @@ public class VehicleFlowStatisticController extends BizController { | @@ -468,14 +468,9 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 468 | request.setBaseRequest(new BaseInfo(1, 0)); | 468 | request.setBaseRequest(new BaseInfo(1, 0)); |
| 469 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); | 469 | request.setQueryKind(ParkConstant.ParkingLotUseStatistic.StatisticType.PER1DAY); |
| 470 | 470 | ||
| 471 | - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); | 471 | + //SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); |
| 472 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); | 472 | SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd"); |
| 473 | 473 | ||
| 474 | - Calendar beginTimec = Calendar.getInstance(); | ||
| 475 | - beginTimec.setTime(request.getBeginTime()); | ||
| 476 | - | ||
| 477 | - Calendar endTimec = Calendar.getInstance(); | ||
| 478 | - endTimec.setTime(request.getEndTime()); | ||
| 479 | 474 | ||
| 480 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), | 475 | Long dayDifference = DateUtil.getTimeDifference(new Timestamp(request.getEndTime().getTime()), |
| 481 | new Timestamp(request.getBeginTime().getTime())); | 476 | new Timestamp(request.getBeginTime().getTime())); |
| @@ -483,7 +478,7 @@ public class VehicleFlowStatisticController extends BizController { | @@ -483,7 +478,7 @@ public class VehicleFlowStatisticController extends BizController { | ||
| 483 | List<String> xAxisData = Lists.newArrayList(); | 478 | List<String> xAxisData = Lists.newArrayList(); |
| 484 | String[] title = new String[dayDifference.intValue() + 2]; | 479 | String[] title = new String[dayDifference.intValue() + 2]; |
| 485 | title[0] = ""; | 480 | title[0] = ""; |
| 486 | - for (int i = 0; i <= dayDifference.intValue(); i++) { | 481 | + for (int i = 0; i < dayDifference.intValue(); i++) { |
| 487 | Calendar tempDate = Calendar.getInstance(); | 482 | Calendar tempDate = Calendar.getInstance(); |
| 488 | tempDate.setTime(request.getBeginTime()); | 483 | tempDate.setTime(request.getBeginTime()); |
| 489 | tempDate.add(Calendar.DAY_OF_MONTH, i); | 484 | tempDate.add(Calendar.DAY_OF_MONTH, i); |