From 6cca8f6b62cff87bde6108f0fddc1822e865a8ef Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期二, 22 七月 2025 18:10:26 +0800 Subject: [PATCH] 大屏替换路径 --- ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java | 54 +++++++++++++++++++++++++++--------------------------- 1 files changed, 27 insertions(+), 27 deletions(-) diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java index ec3353e..9e88b0e 100644 --- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java +++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/controller/LargeScreenController.java @@ -37,33 +37,33 @@ } - @SneakyThrows - @ApiOperation(tags = {"大屏-停车场充电功率曲线图"},value = "停车场充电功率曲线图") - @GetMapping("/getChargingPower") - public R<List<LargeChargingPowerVo>> getChargingPower(){ - String sevenDayAgo = LocalDate.now().minusDays(7) + " 00:00:00"; - String oneDayAgo = LocalDate.now().minusDays(1) + " 23:59:59"; - Date oneDayAgoTime = format.parse(oneDayAgo); - Date sevenDayAgoTime = format.parse(sevenDayAgo); - ArrayList<LargeChargingPowerVo> largeChargingPowerVos = new ArrayList<>(); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); - List<UploadRealTimeMonitoringData> rangeTimeData = uploadRealTimeMonitoringDataService.getRangeTimeData(sevenDayAgoTime,oneDayAgoTime ); - for (int count = 7; count > 0; count--) { - LargeChargingPowerVo largeChargingPowerVo = new LargeChargingPowerVo(); - String time = LocalDate.now().minusDays(count).toString(); - - List<UploadRealTimeMonitoringData> list = rangeTimeData.stream().filter(e -> simpleDateFormat.format(e.getCreate_time()).contains(time)).collect(Collectors.toList()); - if(!list.isEmpty()){ - System.out.println(list); - BigDecimal powerAverage = list.stream().map(UploadRealTimeMonitoringData::getPower).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(list.size()), 0, RoundingMode.HALF_UP); - largeChargingPowerVo.setPower(powerAverage); - } - largeChargingPowerVo.setTime(time); - largeChargingPowerVos.add(largeChargingPowerVo); - } - - return R.ok(largeChargingPowerVos); - } +// @SneakyThrows +// @ApiOperation(tags = {"大屏-停车场充电功率曲线图"},value = "停车场充电功率曲线图") +// @GetMapping("/getChargingPower") +// public R<List<LargeChargingPowerVo>> getChargingPower(){ +// String sevenDayAgo = LocalDate.now().minusDays(7) + " 00:00:00"; +// String oneDayAgo = LocalDate.now().minusDays(1) + " 23:59:59"; +// Date oneDayAgoTime = format.parse(oneDayAgo); +// Date sevenDayAgoTime = format.parse(sevenDayAgo); +// ArrayList<LargeChargingPowerVo> largeChargingPowerVos = new ArrayList<>(); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// List<UploadRealTimeMonitoringData> rangeTimeData = uploadRealTimeMonitoringDataService.getRangeTimeData(sevenDayAgoTime,oneDayAgoTime ); +// for (int count = 7; count > 0; count--) { +// LargeChargingPowerVo largeChargingPowerVo = new LargeChargingPowerVo(); +// String time = LocalDate.now().minusDays(count).toString(); +// +// List<UploadRealTimeMonitoringData> list = rangeTimeData.stream().filter(e -> simpleDateFormat.format(e.getCreate_time()).contains(time)).collect(Collectors.toList()); +// if(!list.isEmpty()){ +// System.out.println(list); +// BigDecimal powerAverage = list.stream().map(UploadRealTimeMonitoringData::getPower).reduce(BigDecimal.ZERO, BigDecimal::add).divide(BigDecimal.valueOf(list.size()), 0, RoundingMode.HALF_UP); +// largeChargingPowerVo.setPower(powerAverage); +// } +// largeChargingPowerVo.setTime(time); +// largeChargingPowerVos.add(largeChargingPowerVo); +// } +// +// return R.ok(largeChargingPowerVos); +// } -- Gitblit v1.7.1