From cb02230e3b6e195f0ff71fa9a5913e3b55a31910 Mon Sep 17 00:00:00 2001 From: lishuai Date: Mon, 10 Mar 2025 11:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E5=B9=B4=E6=9C=88?= =?UTF-8?q?=E6=97=A5=202025=E5=B9=B43=E6=9C=8810=E6=97=A511:20:07?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StationScreenController.java | 12 ++--- .../screen/service/StationScreenService.java | 4 +- .../impl/StationScreenServiceImpl.java | 49 ++++++++++--------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/controller/StationScreenController.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/controller/StationScreenController.java index 716fbb5..d634297 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/controller/StationScreenController.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/controller/StationScreenController.java @@ -44,14 +44,14 @@ public class StationScreenController { return new Result().ok(data); } - @GetMapping("month/charge/analysis") + @GetMapping("charge/analysis") @Operation(summary = "月度充电分析") @Parameters({ @Parameter(name = "thingCode", description = "充电站物编码"), }) public Result getMonthChargeAnalysis( - @Parameter(hidden = true) String thingCode) { - StationMonthChargeAnalysis data = service.getMonthChargeAnalysis(thingCode); + @Parameter(hidden = true) String thingCode, String dateType) { + StationMonthChargeAnalysis data = service.getMonthChargeAnalysis(thingCode, dateType); return new Result().ok(data); } @@ -65,14 +65,14 @@ public class StationScreenController { return new Result().ok(data); } - @GetMapping("usage/analysis") + @GetMapping("month/usage/analysis") @Operation(summary = "月度使用率分析") @Parameters({ @Parameter(name = "thingCode", description = "充电站物编码"), }) public Result getMonthUsageAnalysis( - @Parameter(hidden = true) String thingCode,String dateType) { - StationMonthUsageAnalysis data = service.getMonthUsageAnalysis(thingCode, dateType); + @Parameter(hidden = true) String thingCode) { + StationMonthUsageAnalysis data = service.getMonthUsageAnalysis(thingCode); return new Result().ok(data); } diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/StationScreenService.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/StationScreenService.java index 44b7fb7..17f3218 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/StationScreenService.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/StationScreenService.java @@ -15,11 +15,11 @@ public interface StationScreenService { StationDailyInfo getDailyInfo(String thingCode); - StationMonthChargeAnalysis getMonthChargeAnalysis(String thingCode); + StationMonthChargeAnalysis getMonthChargeAnalysis(String thingCode, String dateType); StationChargeStatus getChargeStatus(String thingCode); - StationMonthUsageAnalysis getMonthUsageAnalysis(String thingCode,String dateType); + StationMonthUsageAnalysis getMonthUsageAnalysis(String thingCode); StationChargeTrend getChargeTrend(String thingCode, String timeType); diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java index a918da8..d743626 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java +++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/screen/service/impl/StationScreenServiceImpl.java @@ -94,13 +94,32 @@ public class StationScreenServiceImpl implements StationScreenService { } @Override - public StationMonthChargeAnalysis getMonthChargeAnalysis(String thingCode) { + public StationMonthChargeAnalysis getMonthChargeAnalysis(String thingCode, String dateType) { + Long startTs = DateTimeUtils.monthStartTs(); + Long endTs = DateTimeUtils.monthStartTs(); + List code; + if (StringUtils.equals(dateType, "yy")) { + startTs = DateTimeUtils.yearStartTs(); + endTs = DateTimeUtils.yearEndTs(); + code = List.of("A29mm", "A202mm", "A201mm"); + } else if (StringUtils.equals(dateType, "mm")) { + startTs = DateTimeUtils.monthStartTs(); + endTs = DateTimeUtils.monthEndTs(); + code = List.of("A29dd", "A202dd", "A201dd"); + } else { + startTs = DateTimeUtils.todayStartTs(); + endTs = DateTimeUtils.yearEndTs(); + code = List.of("A29hh", "A202hh", "A201hh"); + } List tskvList = tsKvService.findTsKvByCodeAndAttrs( thingCode, - StationMonthChargeAnalysis.DAILY_ATTR_CODES, + /* StationMonthChargeAnalysis.DAILY_ATTR_CODES, DateTimeUtils.monthStartTs(), - System.currentTimeMillis(), + System.currentTimeMillis(),*/ + code, + startTs, + endTs, true); return StationMonthChargeAnalysis.assemble(tskvList); } @@ -121,31 +140,15 @@ public class StationScreenServiceImpl implements StationScreenService { } @Override - public StationMonthUsageAnalysis getMonthUsageAnalysis(String thingCode,String dateType) { + public StationMonthUsageAnalysis getMonthUsageAnalysis(String thingCode) { Integer gunCount = connectorInfoService.getCountByStationIds(Collections.singletonList(thingCode)); - String code = "A201mm"; - Long startTs = DateTimeUtils.monthStartTs(); - Long endTs = DateTimeUtils.monthStartTs(); - if(StringUtils.equals(dateType,"yy")){ - startTs = DateTimeUtils.yearStartTs(); - endTs = DateTimeUtils.yearEndTs(); - } else if (StringUtils.equals(dateType,"mm")) { - startTs = DateTimeUtils.monthStartTs(); - endTs = DateTimeUtils.monthEndTs(); - code= "A201dd"; - }else{ - startTs = DateTimeUtils.todayStartTs(); - endTs = DateTimeUtils.yearEndTs(); - code= "A201hh"; - } - List tskvList = tsKvService.findTsKvByCodeAndAttr( thingCode, - code, - startTs, - endTs, + StationChargeStatus.DAILY_DURATION_CODE, + DateTimeUtils.monthStartTs(), + DateTimeUtils.todayStartTs(), true); return StationMonthUsageAnalysis.assemble(tskvList, gunCount); }