fix：辐射图热力图

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

@@ -268,7 +268,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
     @Override
     @Override
     public List<PlatElderBehaviorExceptionRecordVO> behaviorExceptionRecordListInternal(PlatElderReportDTO platElderIdDTO, LocalDateTime start, LocalDateTime end) {
     public List<PlatElderBehaviorExceptionRecordVO> behaviorExceptionRecordListInternal(PlatElderReportDTO platElderIdDTO, LocalDateTime start, LocalDateTime end) {
         List<PlatDevice> platDeviceList = platElderRealTimeService.getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> platDeviceList = platElderRealTimeService.getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
+        List<PlatDevice> fallDeviceList = platElderRealTimeService.getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
 
+        platDeviceList.addAll(fallDeviceList);
         if (CollectionUtils.isEmpty(platDeviceList)) {
         if (CollectionUtils.isEmpty(platDeviceList)) {
             return new ArrayList<>(10);
             return new ArrayList<>(10);
         }
         }
@@ -463,7 +465,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
     public List<PlatElderBehaviorDistributionVO> behaviorDistributionInternal(PlatElderReportDTO platElderIdDTO, List<LocalDate> nowList) {
     public List<PlatElderBehaviorDistributionVO> behaviorDistributionInternal(PlatElderReportDTO platElderIdDTO, List<LocalDate> nowList) {
 
 
         List<PlatDevice> platDeviceList = platElderRealTimeService.getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
         List<PlatDevice> platDeviceList = platElderRealTimeService.getSpaceDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
+        List<PlatDevice> fallDeviceList = platElderRealTimeService.getFallDevice(platElderIdDTO.getElderId(), platElderIdDTO.getDeviceId());
 
 
+        platDeviceList.addAll(fallDeviceList);
         if (CollectionUtils.isEmpty(platDeviceList)) {
         if (CollectionUtils.isEmpty(platDeviceList)) {
             return new ArrayList<>(10);
             return new ArrayList<>(10);
         }
         }

server-service/src/main/java/com/makeit/vo/platform/elder/realtime/PlatElderCoordinateVO.java

@@ -14,12 +14,6 @@ public class PlatElderCoordinateVO {
     @ApiModelProperty(value = "原始设备ID")
     @ApiModelProperty(value = "原始设备ID")
     private String oriDeviceId;
     private String oriDeviceId;
 
 
-//    @ApiModelProperty("x")
-//    private BigDecimal x;
-//
-//    @ApiModelProperty("y")
-//    private BigDecimal y;
-
     @ApiModelProperty("人体目标距离雷达位置 范围：0-1000，单位cm")
     @ApiModelProperty("人体目标距离雷达位置 范围：0-1000，单位cm")
     private Integer distance;
     private Integer distance;
     @ApiModelProperty("空间人感：0表示无人，1表示活动， 2表示微动 ，3表示静止  ，跌倒设备：0无人，1跌倒")
     @ApiModelProperty("空间人感：0表示无人，1表示活动， 2表示微动 ，3表示静止  ，跌倒设备：0无人，1跌倒")