Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.调整实体类

Browse Source
This commit is contained in:
wr
2024-05-22 20:00:32 +08:00
parent 8e83a6b35e
commit 262dd68cd4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
View File

@@ -93,7 +93,7 @@ public class DeviceInfoParam implements Serializable {
*/
@ApiModelProperty("通讯状态")
@Range(min = 0, max = 2, message = "通讯状态" + ValidMessage.PARAM_FORMAT_ERROR)
private Integer comFlag;
private Integer comFlagStatus;
/**
* 默认全部监测点

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GeneralDeviceService.java
View File

@@ -320,8 +320,8 @@ public class GeneralDeviceService {
} else {
deviceType.setRunFlag(runFlag);
}
if(ObjectUtil.isNotNull(deviceInfoParam.getComFlag())){
deviceType.setComFlag(Arrays.asList(deviceInfoParam.getComFlag()));
if(ObjectUtil.isNotNull(deviceInfoParam.getComFlagStatus())){
deviceType.setComFlag(Arrays.asList(deviceInfoParam.getComFlagStatus()));
}
filterDataType(deviceType, deviceInfoParam.getServerName());

2
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
View File

@@ -152,7 +152,7 @@ public class RStatLimitServiceImpl implements RStatLimitService {
//监测点总数
List<GeneralDeviceDTO> data = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
//在线
param.setComFlag(1);
param.setComFlagStatus(1);
List<GeneralDeviceDTO> onData = generalDeviceInfoClient.getPracticalRunDeviceInfo(param).getData();
List<String> line = data.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());