几个坐标的地方

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

@@ -366,6 +366,9 @@ public class PlatElderDayReportDayServiceImpl implements PlatElderDayReportDaySe
                         vo.setX(new BigDecimal(i.getProperties().getDistance()).multiply(new BigDecimal(Math.cos(i.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
                         vo.setX(new BigDecimal(i.getProperties().getDistance()).multiply(new BigDecimal(Math.cos(i.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
                         vo.setY(new BigDecimal(i.getProperties().getDistance()).multiply(new BigDecimal(Math.sin(i.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
                         vo.setY(new BigDecimal(i.getProperties().getDistance()).multiply(new BigDecimal(Math.sin(i.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
 
 
+                        vo.setDistance(i.getProperties().getDistance());
+                        vo.setAngle(i.getProperties().getAngle());
+
                         return vo;
                         return vo;
 
 
                     })
                     })

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

@@ -186,9 +186,13 @@ public class PlatElderRealTimeServiceImpl implements PlatElderRealTimeService {
 
 
         voList = StreamUtil.map(deviceInfoContentSpaceList, e -> {
         voList = StreamUtil.map(deviceInfoContentSpaceList, e -> {
             PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
             PlatElderCoordinateVO vo = new PlatElderCoordinateVO();
+
             vo.setX(new BigDecimal(e.getProperties().getDistance()).multiply(new BigDecimal(Math.cos(e.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
             vo.setX(new BigDecimal(e.getProperties().getDistance()).multiply(new BigDecimal(Math.cos(e.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
             vo.setY(new BigDecimal(e.getProperties().getDistance()).multiply(new BigDecimal(Math.sin(e.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
             vo.setY(new BigDecimal(e.getProperties().getDistance()).multiply(new BigDecimal(Math.sin(e.getProperties().getAngle()) + "")).setScale(2, RoundingMode.HALF_UP));
 
 
+            vo.setDistance(e.getProperties().getDistance());
+            vo.setAngle(e.getProperties().getAngle());
+
             return vo;
             return vo;
         });
         });
 
 

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

@@ -14,4 +14,11 @@ public class PlatElderCoordinateVO {
     @ApiModelProperty("y")
     @ApiModelProperty("y")
     private BigDecimal y;
     private BigDecimal y;
 
 
+    @ApiModelProperty("人体目标距离雷达位置 范围：0-1000，单位cm")
+    private Integer distance;
+
+    @ApiModelProperty("人体目标偏离雷达法线角度范围：±60，单位°")
+    private Integer angle;
+
+
 }
 }