Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复设备监控历史数据及最新一组数据点击最大化报错问题

Browse Source
This commit is contained in:
guofeihu
2024-08-09 10:08:12 +08:00
parent 48ee232a0b
commit 92ab75a0df
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DevicDataTrendQueryParam.java
View File

@@ -36,6 +36,8 @@ public class DevicDataTrendQueryParam {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@NotNull(message="结束时间不能为空！") @NotNull(message="结束时间不能为空！")
private String endTime; private String endTime;
private String devId;
@Data @Data
public static class StatisticalParam{ public static class StatisticalParam{
private String classId; private String classId;

2
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DeviceDataTrendServiceImpl.java
View File

@@ -57,7 +57,7 @@ public class DeviceDataTrendServiceImpl implements DeviceDataTrendService {
LineParamDTO lineParamDTO = new LineParamDTO(); LineParamDTO lineParamDTO = new LineParamDTO();
lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId()); lineParamDTO.setLineId(devicDataTrendQueryParam.getLineId());
List<CsLedger> data = csLedgerFeignClient.queryLine(lineParamDTO).getData(); List<CsLedger> data = csLedgerFeignClient.queryLine(lineParamDTO).getData();
List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(data.get(0).getPid()).collect(Collectors.toList())).getData(); List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of((data == null || data.isEmpty()) ? devicDataTrendQueryParam.getDevId() : data.get(0).getPid()).collect(Collectors.toList())).getData();
devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{ devicDataTrendQueryParam.getStatisticalParams().forEach(temp->{
CommonQueryParam commonQueryParam = new CommonQueryParam(); CommonQueryParam commonQueryParam = new CommonQueryParam();
commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId()); commonQueryParam.setLineId(devicDataTrendQueryParam.getLineId());