坐标返回设备id

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

@@ -369,10 +369,14 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
                         vo.setDistance(i.getProperties().getDistance());
                         vo.setAngle(i.getProperties().getAngle());
 
+                        vo.setDeviceId(e.getId());
+                        vo.setOriDeviceId(e.getOriDeviceId());
+
                         return vo;
 
                     })
             );
+
         });
 
         return voList;

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

@@ -8,6 +8,12 @@ import java.math.BigDecimal;
 @Data
 public class PlatElderCoordinateVO {
 
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+
+    @ApiModelProperty(value = "原始设备ID")
+    private String oriDeviceId;
+
     @ApiModelProperty("x")
     private BigDecimal x;