fix:修复bug

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderDayReportDayServiceImpl.java

@@ -35,6 +35,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Service
 @Service
 public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDayService {
 public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDayService {
@@ -384,7 +385,8 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
                     .orderByDesc(PlatAlarmRecord::getAlarmDate)
                     .orderByDesc(PlatAlarmRecord::getAlarmDate)
             );
             );
 
 
-            voList.addAll(StreamUtil.map(recordList, i -> i.getAlarmDate().format(dateTimeFormatter)));
+            List<String> list = recordList.stream().map(i -> i.getAlarmDate().format(dateTimeFormatter)).distinct().collect(Collectors.toList());
+            voList.addAll(list);
 
 
         /*    List<DeviceInfoContentFall> fallList = iotProductDeviceService.getDeviceLogByTimeRangeFall(e.getOriDeviceId(), 2 * 24 * 3600, start, end);
         /*    List<DeviceInfoContentFall> fallList = iotProductDeviceService.getDeviceLogByTimeRangeFall(e.getOriDeviceId(), 2 * 24 * 3600, start, end);
             fallList = StreamUtil.filter(fallList, i -> DeviceInfoContentFallEnum.PersonStateEnum.FALL.getValue().equals(i.getProperties().getPersonState()));
             fallList = StreamUtil.filter(fallList, i -> DeviceInfoContentFallEnum.PersonStateEnum.FALL.getValue().equals(i.getProperties().getPersonState()));

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderRealTimeServiceImpl.java

@@ -112,7 +112,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
         }
         }
 
 
         if (StringUtils.isNotBlank(deviceId)) {
         if (StringUtils.isNotBlank(deviceId)) {
-            deviceList = Arrays.asList(platDeviceService.getById(deviceId));
+            PlatDevice platDevice = platDeviceService.getById(deviceId);
+            if (platDevice != null) {
+                deviceList.add(platDevice);
+            }
+            PlatDevice device = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
+                    .eq(PlatDevice::getOriDeviceId, deviceId).last("limit 1"));
+            if (device != null) {
+                deviceList.add(platDevice);
+            }
         }
         }
 
 
         return deviceList;
         return deviceList;
@@ -127,7 +135,15 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
         }
         }
 
 
         if (StringUtils.isNotBlank(deviceId)) {
         if (StringUtils.isNotBlank(deviceId)) {
-            deviceList = Arrays.asList(platDeviceService.getById(deviceId));
+            PlatDevice platDevice = platDeviceService.getById(deviceId);
+            if (platDevice != null) {
+                deviceList.add(platDevice);
+            }
+            PlatDevice device = platDeviceService.getOne(new QueryWrapper<PlatDevice>().lambda()
+                    .eq(PlatDevice::getOriDeviceId, deviceId).last("limit 1"));
+            if (device != null) {
+                deviceList.add(platDevice);
+            }
         }
         }
 
 
         return deviceList;
         return deviceList;