diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java index a11911f..8b70dcc 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java @@ -27,7 +27,7 @@ /** * 台风风速 */ - private String speed; + private Float speed; /** * 台风7级风力半径 @@ -47,7 +47,7 @@ /** * 台风整体移动速度,单位【公里/小时】 */ - private String moveSpeed; + private Float moveSpeed; /** * 台风未来移动方向 */ diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java index a11911f..8b70dcc 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/dto/EnvironmentDTO.java @@ -27,7 +27,7 @@ /** * 台风风速 */ - private String speed; + private Float speed; /** * 台风7级风力半径 @@ -47,7 +47,7 @@ /** * 台风整体移动速度,单位【公里/小时】 */ - private String moveSpeed; + private Float moveSpeed; /** * 台风未来移动方向 */ diff --git a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/EncodeData.java b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/EncodeData.java index 57b5667..11ee841 100644 --- a/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/EncodeData.java +++ b/casic-shelter/src/main/java/com/casic/missiles/modular/system/utils/EncodeData.java @@ -44,11 +44,11 @@ List points = typhoon.getPoints(); TyphoonDetailDTO.PointBean pointBean = points.get(points.size() - 1); dto.setTyphoonPower(pointBean.getPower()); - dto.setSpeed(pointBean.getSpeed()); + dto.setSpeed(Float.valueOf(pointBean.getSpeed())); dto.setRadius7(pointBean.getRadius7()); dto.setRadius10(pointBean.getRadius10()); dto.setRadius12(pointBean.getRadius12()); - dto.setMoveSpeed(pointBean.getMoveSpeed()); + dto.setMoveSpeed(Float.valueOf(pointBean.getMoveSpeed())); dto.setMoveDirection(DirectionUtil.toAngle(pointBean.getMoveDirection())); //机器人与台风中心距离