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());