From 34888087867f83277dd1087f6bb99cc74ae2710a Mon Sep 17 00:00:00 2001 From: zq Date: Tue, 9 Dec 2025 17:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E4=BF=AE=E6=94=B9=E6=84=8F?= =?UTF-8?q?=E8=A7=8120251120-=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-?= =?UTF-8?q?=E6=8C=89=E5=A4=A9=E6=9F=A5=E8=AF=A2=E7=82=B9=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AE=B1=E7=BA=BF=E5=9B=BE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xzzn/ems/domain/vo/GeneralQueryResponse.java | 14 +++++++++++++- .../ems/service/impl/GeneralQueryServiceImpl.java | 8 ++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/GeneralQueryResponse.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/GeneralQueryResponse.java index 1571ac8..99b440a 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/GeneralQueryResponse.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/GeneralQueryResponse.java @@ -17,10 +17,14 @@ public class GeneralQueryResponse { // 点位数据类型，1-瞬时值，2-累计值 private Long dataType; - public GeneralQueryResponse(String siteId, List deviceList, Long dataType) { + // 点位数据图表类型，1-曲线图，2-箱线图 + private Long chartType; + + public GeneralQueryResponse(String siteId, List deviceList, Long dataType, Long chartType) { this.siteId = siteId; this.deviceList = deviceList; this.dataType = dataType; + this.chartType = chartType; } public GeneralQueryResponse() { @@ -50,4 +54,12 @@ public class GeneralQueryResponse { public void setDataType(Long dataType) { this.dataType = dataType; } + + public Long getChartType() { + return chartType; + } + + public void setChartType(Long chartType) { + this.chartType = chartType; + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java index 649456c..70b2170 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java @@ -234,7 +234,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService }) .collect(Collectors.toList()); - return new GeneralQueryResponse(siteId, deviceList, dataType); + return new GeneralQueryResponse(siteId, deviceList, dataType, 2L); }) .collect(Collectors.toList()); } @@ -286,7 +286,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService .collect(Collectors.toList()); // 5. 构建SiteData - return new GeneralQueryResponse(siteId, deviceList, dataType); + return new GeneralQueryResponse(siteId, deviceList, dataType, 2L); }) .collect(Collectors.toList()); } @@ -340,7 +340,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService .collect(Collectors.toList()); // 5. 构建SiteData - return new GeneralQueryResponse(siteId, deviceList, dataType); + return new GeneralQueryResponse(siteId, deviceList, dataType, 1L); }) .collect(Collectors.toList()); } @@ -371,7 +371,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService }) .collect(Collectors.toList()); - return new GeneralQueryResponse(siteId, deviceList, dataType); + return new GeneralQueryResponse(siteId, deviceList, dataType, 1L); }) .collect(Collectors.toList());