zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 电站生态流量统计查询（电站左连接）

Browse Source
This commit is contained in:
tangwei 2026-06-17 19:08:32 +08:00
parent d64894905a
commit 725384f093
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/com/yfd/platform/qgc_eng/eq/controller/EngEqDataController.java
View File

@ -56,6 +56,12 @@ public class EngEqDataController {
return ResponseResult.successData(engEqDataService.getIntervalKendoListCust(dataSourceRequest)); 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") @PostMapping("/msstbprpt/GetKendoList")
@Operation(summary = "电站基础信息查询") @Operation(summary = "电站基础信息查询")
public ResponseResult getMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { public ResponseResult getMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) {

7
backend/src/main/java/com/yfd/platform/qgc_eng/eq/service/impl/EngEqDataServiceImpl.java
View File

@ -1964,7 +1964,9 @@ public class EngEqDataServiceImpl implements EngEqDataService {
if (Boolean.TRUE.equals(dataSourceRequest.getGroupResultFlat())) { if (Boolean.TRUE.equals(dataSourceRequest.getGroupResultFlat())) {
result.setData((List<EngEqIntervalVo>) (List<?>) new GroupHelper().faltGroup(rows, Arrays.asList(groupInfos))); result.setData((List<EngEqIntervalVo>) (List<?>) new GroupHelper().faltGroup(rows, Arrays.asList(groupInfos)));
} else { } else {
result.setData((List<EngEqIntervalVo>) (List<?>) new GroupHelper().group(rows, Arrays.asList(groupInfos))); List<Group> grouped = new GroupHelper().group(rows, Arrays.asList(groupInfos));
populateHourDayGroupKeyNames(grouped);
result.setData((List<EngEqIntervalVo>) (List<?>) grouped);
} }
result.setTotal(0L); result.setTotal(0L);
result.setAggregates(new HashMap<>()); result.setAggregates(new HashMap<>());
@ -2024,6 +2026,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
return "SELECT " + return "SELECT " +
"eng.STCD AS stcd, " + "eng.STCD AS stcd, " +
"eng.RGCP AS rgcp, " +
"eng.ENNM AS stnm, " + "eng.ENNM AS stnm, " +
"eng.ENNM AS ennm, " + "eng.ENNM AS ennm, " +
"'ENG' AS sttp, " + "'ENG' AS sttp, " +
@ -2237,6 +2240,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
columns.put("dtmel", "t.dtmel AS dtmel"); columns.put("dtmel", "t.dtmel AS dtmel");
columns.put("dtin", "t.dtin AS dtin"); columns.put("dtin", "t.dtin AS dtin");
columns.put("dtinEnv", "t.dtinEnv AS dtinEnv"); columns.put("dtinEnv", "t.dtinEnv AS dtinEnv");
columns.put("rgcp", "t.rgcp AS rgcp");
columns.put("prsc", "t.prsc AS prsc"); columns.put("prsc", "t.prsc AS prsc");
columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode"); columns.put("bldsttCcode", "t.bldsttCcode AS bldsttCcode");
columns.put("qi", "t.qi AS qi"); columns.put("qi", "t.qi AS qi");
@ -4447,6 +4451,7 @@ public class EngEqDataServiceImpl implements EngEqDataService {
} }
return switch (field) { return switch (field) {
case "stcd" -> "t.stcd"; case "stcd" -> "t.stcd";
case "rgcpCode" -> "t.rgcp";
case "stnm", "ennm" -> "t.ennm"; case "stnm", "ennm" -> "t.ennm";
case "sttp", "sttpCode" -> "t.sttpCode"; case "sttp", "sttpCode" -> "t.sttpCode";
case "baseId" -> "t.baseId"; case "baseId" -> "t.baseId";