diff --git a/backend/src/main/java/com/yfd/platform/common/DataSourceRequest.java b/backend/src/main/java/com/yfd/platform/common/DataSourceRequest.java index bf9a79c..ad4c5ea 100644 --- a/backend/src/main/java/com/yfd/platform/common/DataSourceRequest.java +++ b/backend/src/main/java/com/yfd/platform/common/DataSourceRequest.java @@ -255,13 +255,17 @@ public class DataSourceRequest { for(SortDescriptor entry : sort) { String field = entry.getField(); String dir = entry.getDir(); + String normalizedDir = StringUtil.isBlank(dir) ? "" : dir.toLowerCase(); + if ("des".equals(normalizedDir)) { + normalizedDir = "desc"; + } SortingInfo sortingInfo = new SortingInfo(); sortingInfo.setSelector(field); - if (StringUtil.isBlank(dir)) { + if (StringUtil.isBlank(normalizedDir)) { sortingInfo.setDesc(false); - } else if (dir.equals("asc")) { + } else if (normalizedDir.equals("asc")) { sortingInfo.setDesc(false); - } else if (dir.equals("desc")) { + } else if (normalizedDir.equals("desc")) { sortingInfo.setDesc(true); } @@ -303,11 +307,15 @@ public class DataSourceRequest { GroupingInfo groupingInfo = new GroupingInfo(); groupingInfo.setSelector(groupDescriptor.getField()); String dir = groupDescriptor.getDir(); - if (StringUtil.isBlank(dir)) { + String normalizedDir = StringUtil.isBlank(dir) ? "" : dir.toLowerCase(); + if ("des".equals(normalizedDir)) { + normalizedDir = "desc"; + } + if (StringUtil.isBlank(normalizedDir)) { groupingInfo.setDesc(false); - } else if (dir.equals("asc")) { + } else if (normalizedDir.equals("asc")) { groupingInfo.setDesc(false); - } else if (dir.equals("desc")) { + } else if (normalizedDir.equals("desc")) { groupingInfo.setDesc(true); } diff --git a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java index 7931e4a..aaf612b 100644 --- a/backend/src/main/java/com/yfd/platform/common/GroupHelper.java +++ b/backend/src/main/java/com/yfd/platform/common/GroupHelper.java @@ -102,6 +102,9 @@ public class GroupHelper { Group newGroup = new Group(); newGroup.setKey(groupKey); newGroup.setField(groupInfo.getSelector()); + newGroup.setKeyExt(new HashMap()); + newGroup.setSummary(new Object[0]); + newGroup.setAggregates(new HashMap()); if (tempCount != null) { newGroup.setCount(NumberUtil.parseInt(tempCount.toString())); } diff --git a/backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java b/backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java index b0e0082..8544b93 100644 --- a/backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java +++ b/backend/src/main/java/com/yfd/platform/env/wq/controller/EnvWqDataController.java @@ -32,7 +32,7 @@ public class EnvWqDataController { @PostMapping("/data/GetKendoListCust") @Operation(summary = "水质明细数据查询") public ResponseResult getDataKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { - return ResponseResult.successData(envWqDataService.processKendoList(dataSourceRequest)); + return ResponseResult.successData(envWqDataService.processDataKendoList(dataSourceRequest)); } @PostMapping("/GetStbprpYsByStcd") @@ -50,7 +50,7 @@ public class EnvWqDataController { @PostMapping("/data/noAuth/GetKendoListCust") @Operation(summary = "水质统计分析(完成)") public ResponseResult getNoAuthKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { - return ResponseResult.successData(envWqDataService.processKendoList(dataSourceRequest)); + return ResponseResult.successData(envWqDataService.processDataKendoList(dataSourceRequest)); } @PostMapping("/along/qgc/GetKendoListCust") @@ -65,6 +65,12 @@ public class EnvWqDataController { return ResponseResult.successData(envWqDataService.getMsstbprptList(dataSourceRequest)); } + @PostMapping("/base/msstbprpt/GetKendoList") + @Operation(summary = "查询水质基础站点分组统计") + public ResponseResult getBaseMsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { + return ResponseResult.successData(envWqDataService.getMsstbprptList(dataSourceRequest)); + } + @PostMapping("/vmsstbprpt/GetKendoList") @Operation(summary = "根据条件查询水质基础站点数据(完成)") public ResponseResult getVmsstbprptList(@RequestBody DataSourceRequest dataSourceRequest) { diff --git a/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java b/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java new file mode 100644 index 0000000..8ba1aeb --- /dev/null +++ b/backend/src/main/java/com/yfd/platform/env/wq/entity/vo/WqMsstbprptGroupVo.java @@ -0,0 +1,15 @@ +package com.yfd.platform.env.wq.entity.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "水质基础站点分组统计") +public class WqMsstbprptGroupVo { + + @Schema(description = "数据接入类型") + private Integer dtinType; + + @Schema(description = "数据接入类型分组数量") + private Integer countDtinType; +} diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java b/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java index 8fd2445..2bd2f3b 100644 --- a/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java +++ b/backend/src/main/java/com/yfd/platform/env/wq/service/EnvWqDataService.java @@ -8,6 +8,8 @@ public interface EnvWqDataService { DataSourceResult processKendoList(DataSourceRequest dataSourceRequest); + DataSourceResult processDataKendoList(DataSourceRequest dataSourceRequest); + DataSourceResult getAlongWqKendoListCust(DataSourceRequest dataSourceRequest); DataSourceResult getMsstbprptList(DataSourceRequest dataSourceRequest); diff --git a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java index 9a62d97..4cf08ed 100644 --- a/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/env/wq/service/impl/EnvWqDataServiceImpl.java @@ -89,6 +89,11 @@ public class EnvWqDataServiceImpl implements EnvWqDataService { return result; } + @Override + public DataSourceResult processDataKendoList(DataSourceRequest dataSourceRequest) { + return null; + } + @Override public DataSourceResult getAlongWqKendoListCust(DataSourceRequest dataSourceRequest) { return emptyResult(); diff --git a/backend/src/main/java/com/yfd/platform/utils/KendoUtil.java b/backend/src/main/java/com/yfd/platform/utils/KendoUtil.java index 8701ea0..5967765 100644 --- a/backend/src/main/java/com/yfd/platform/utils/KendoUtil.java +++ b/backend/src/main/java/com/yfd/platform/utils/KendoUtil.java @@ -44,9 +44,13 @@ public class KendoUtil extends ReflectUtil { DataSourceRequest.GroupDescriptor groupingInfo = (DataSourceRequest.GroupDescriptor)groupDescriptorList.get(i); String selector = groupingInfo.getField(); String dir = groupingInfo.getDir(); + String normalizedDir = StrUtil.blankToDefault(dir, "asc").toLowerCase(); + if ("des".equals(normalizedDir)) { + normalizedDir = "desc"; + } groupByBuilder.append(selector); if (groupingInfo.getNeedSortFlag()) { - if ("desc".equals(dir)) { + if ("desc".equals(normalizedDir)) { orderByBuilder.append(selector).append(" desc"); } else { orderByBuilder.append(selector).append(" asc");