xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

平台修改意见20251120-综合查询-按天查询点位数据箱线图展示

Browse Source
This commit is contained in:
zq
2025-12-09 17:23:24 +08:00
parent 497e5bb8ca
commit 3488808786
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-system/src/main/java/com/xzzn/ems/domain/vo/GeneralQueryResponse.java
View File

@ -17,10 +17,14 @@ public class GeneralQueryResponse {
// 点位数据类型，1-瞬时值，2-累计值 // 点位数据类型，1-瞬时值，2-累计值
private Long dataType; private Long dataType;
public GeneralQueryResponse(String siteId, List<DevicePointDataList> deviceList, Long dataType) { // 点位数据图表类型，1-曲线图，2-箱线图
private Long chartType;
public GeneralQueryResponse(String siteId, List<DevicePointDataList> deviceList, Long dataType, Long chartType) {
this.siteId = siteId; this.siteId = siteId;
this.deviceList = deviceList; this.deviceList = deviceList;
this.dataType = dataType; this.dataType = dataType;
this.chartType = chartType;
} }
public GeneralQueryResponse() { public GeneralQueryResponse() {
@ -50,4 +54,12 @@ public class GeneralQueryResponse {
public void setDataType(Long dataType) { public void setDataType(Long dataType) {
this.dataType = dataType; this.dataType = dataType;
} }
public Long getChartType() {
return chartType;
}
public void setChartType(Long chartType) {
this.chartType = chartType;
}
} }

8
ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
View File

@ -234,7 +234,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
return new GeneralQueryResponse(siteId, deviceList, dataType); return new GeneralQueryResponse(siteId, deviceList, dataType, 2L);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -286,7 +286,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
.collect(Collectors.toList()); .collect(Collectors.toList());
// 5. 构建SiteData // 5. 构建SiteData
return new GeneralQueryResponse(siteId, deviceList, dataType); return new GeneralQueryResponse(siteId, deviceList, dataType, 2L);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -340,7 +340,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
.collect(Collectors.toList()); .collect(Collectors.toList());
// 5. 构建SiteData // 5. 构建SiteData
return new GeneralQueryResponse(siteId, deviceList, dataType); return new GeneralQueryResponse(siteId, deviceList, dataType, 1L);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -371,7 +371,7 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
return new GeneralQueryResponse(siteId, deviceList, dataType); return new GeneralQueryResponse(siteId, deviceList, dataType, 1L);
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());