diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java index 9421dcd7..64e9c879 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java @@ -56,6 +56,12 @@ public class EngEqDataController { return ResponseResult.successData(engEqDataService.getIntervalKendoListCust(dataSourceRequest)); } + @PostMapping("/to/eq/GetKendoListCust") + @Operation(summary = "电站生态流量统计查询(电站左连接)") + public ResponseResult getToEqKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(engEqDataService.getIntervalKendoListCust(dataSourceRequest)); + } + @PostMapping("/msstbprpt/GetKendoList") @Operation(summary = "电站基础信息查询") public ResponseResult getMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { diff --git a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java index eea8d641..5f898876 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java @@ -1964,7 +1964,9 @@ public class EngEqDataServiceImpl implements EngEqDataService { if (Boolean.TRUE.equals(dataSourceRequest.getGroupResultFlat())) { result.setData((List) (List) new GroupHelper().faltGroup(rows, Arrays.asList(groupInfos))); } else { - result.setData((List) (List) new GroupHelper().group(rows, Arrays.asList(groupInfos))); + List grouped = new GroupHelper().group(rows, Arrays.asList(groupInfos)); + populateHourDayGroupKeyNames(grouped); + result.setData((List) (List) grouped); } result.setTotal(0L); result.setAggregates(new HashMap<>()); @@ -2024,6 +2026,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { return "SELECT " + "eng.STCD AS stcd, " + + "eng.RGCP AS rgcp, " + "eng.ENNM AS stnm, " + "eng.ENNM AS ennm, " + "'ENG' AS sttp, " + @@ -2237,6 +2240,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { columns.put("dtmel", "t.dtmel AS dtmel"); columns.put("dtin", "t.dtin AS dtin"); columns.put("dtinEnv", "t.dtinEnv AS dtinEnv"); + columns.put("rgcp", "t.rgcp AS rgcp"); columns.put("prsc", "t.prsc AS prsc"); columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode"); columns.put("qi", "t.qi AS qi"); @@ -4447,6 +4451,7 @@ public class EngEqDataServiceImpl implements EngEqDataService { } return switch (field) { case "stcd" -> "t.stcd"; + case "rgcpCode" -> "t.rgcp"; case "stnm", "ennm" -> "t.ennm"; case "sttp", "sttpCode" -> "t.sttpCode"; case "baseId" -> "t.baseId";