From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java
index d54852a..90233f2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/MonitorPointsVO.java
@@ -21,7 +21,7 @@
private List<MonitorPointVO> monitorPoints;
- public static MonitorPointsVO convert(List<MonitorPoint> monitorPoints,boolean type){
+ public static MonitorPointsVO convert(List<MonitorPoint> monitorPoints,boolean type, boolean code){
MonitorPointsVO monitorPointsVO = new MonitorPointsVO();
List<MonitorPointVO> monitorPointVOS = new ArrayList<>();
for (MonitorPoint monitorPoint : monitorPoints) {
@@ -32,6 +32,12 @@
DeviceVO deviceVO = deviceConvert(device);
deviceVOS.add(deviceVO);
}
+ if(code){
+ DeviceVO vo = new DeviceVO();
+ vo.setName(monitorPoint.getName()+"������");
+ vo.setMac(monitorPoint.getId()+",avg");
+ deviceVOS.add(vo);
+ }
List<Device> resultState = devices.stream().filter(it->!it.getState().equals("0")).collect(Collectors.toList());
monitorPointVO.setId(monitorPoint.getId());
StringBuffer stringBuffer = new StringBuffer(monitorPoint.getName());
--
Gitblit v1.8.0