下行自定义功能

src/main/java/com/cusc/adas/v2x/assist/dto/AssistMessageBodyDto.java

@@ -20,5 +20,12 @@ public class AssistMessageBodyDto<T> {
 	
 	//命令数据
 	private T infoData;
-	
+
+	public short getAstFuncType() {
+		return astFuncType;
+	}
+
+	public T getInfoData() {
+		return infoData;
+	}
 }

src/main/java/com/cusc/adas/v2x/assist/dto/TrafficLightDto.java

@@ -20,7 +20,7 @@ public class TrafficLightDto {
 	//车辆所在车道 对应信号灯相 位数量
 	private  int numOfLanePhase;
 	//车辆所在车道 对应信号灯相 位 ID 列表
-	private List<Short> lanePhaseIds;
+//	private List<Short> lanePhaseIds;
 	
 	//车辆到前方停 止线距离
 	private  float d2StopLine;
@@ -30,7 +30,12 @@ public class TrafficLightDto {
 	
 	//信号灯相位状 态
 	private List<TrafficLightStatusDto> phaseState;
-	
-	
-	
+
+	public float getD2StopLine() {
+		return d2StopLine;
+	}
+
+	public List<TrafficLightStatusDto> getPhaseState() {
+		return phaseState;
+	}
 }

src/main/java/com/cusc/adas/v2x/assist/dto/TrafficLightStatusDto.java

@@ -22,7 +22,21 @@ public class TrafficLightStatusDto {
 	private  short nextLightTime;
 	//灯组类型
 	private  short lightType;
-	
-	
-	
+
+
+	public short getLightState() {
+		return lightState;
+	}
+
+	public short getTimeLeft() {
+		return timeLeft;
+	}
+
+	public void setNextLightState(short nextLightState) {
+		this.nextLightState = nextLightState;
+	}
+
+	public short getNextLightState() {
+		return nextLightState;
+	}
 }

src/main/java/com/cusc/adas/v2x/assist/vo/TrafficLight.java

@@ -26,22 +26,22 @@ public class TrafficLight {
 	//车辆所在车道 对应信号灯相 位数量
 	@Order(4)
 	private  short numOfLanePhase;
-	//车辆所在车道 对应信号灯相 位 ID 列表
-	@Order(5)
-	@RefNumFlag(value="numOfLanePhase")
-	private List<Short> lanePhaseIds;
+//	//车辆所在车道 对应信号灯相 位 ID 列表
+//	@Order(5)
+//	@RefNumFlag(value="numOfLanePhase")
+//	private List<Short> lanePhaseIds;
 	
 	//车辆到前方停 止线距离
-	@Order(6)
+	@Order(5)
 	@OffsetDef(value = 0.01)
 	private  int d2StopLine;
 	
 	//相位数量
-	@Order(7)
+	@Order(6)
 	private  short  phaseNumber;
 	
 	//信号灯相位状 态
-	@Order(8)
+	@Order(7)
 	@RefNumFlag(value="phaseNumber")
 	private List<TrafficLightStatus> phaseState;
 	

src/main/java/com/cusc/adas/v2x/clouddecision/dto/RSISDetailDto.java

@@ -27,7 +27,7 @@ public class RSISDetailDto {
     private short eventSource;
 
     //事件（影响） 半径
-    private int eventRadius;
+    private float eventRadius;
 
     //关联路段数量
     private int referenceLinksNum;

src/main/java/com/cusc/adas/v2x/clouddecision/vo/RSISDetail.java

@@ -37,6 +37,7 @@ public class RSISDetail {
 	
 	//事件（影响） 半径
 	@Order(6)
+	@OffsetDef(value = 0.1)
 	private  int eventRadius;
 	
 	//关联路段数量

src/main/java/com/cusc/adas/v2x/selfdefine/dto/SelfDefineDetailDto.java

 package com.cusc.adas.v2x.selfdefine.dto;
 
 import com.cusc.adas.v2x.dto.PositionDto;
+import com.cusc.adas.v2x.utils.OffsetDef;
+import com.cusc.adas.v2x.utils.Order;
 
 /**
  * @author huangml
@@ -19,20 +21,35 @@ public class SelfDefineDetailDto {
     private PositionDto location;
 
     //主车速度
-    private float speed;
+    private double speed;
 
     //主车航向角
-    private float heading;
+    private double heading;
 
     //RV远车经纬度
     private PositionDto rvLocation;
 
+    //RV远车速度
+    private double rvSpeed;
+
     //RV方向
-    private float rvHeading;
+    private double rvHeading;
 
     //预警级别
     private short level;
 
     //预警距离
-    private int distance;
+    private float distance;
+
+    public double getRvSpeed() {
+        return rvSpeed;
+    }
+
+    public double getRvHeading() {
+        return rvHeading;
+    }
+
+    public short getType() {
+        return type;
+    }
 }

src/main/java/com/cusc/adas/v2x/selfdefine/vo/SelfDefineDetail.java

@@ -29,7 +29,7 @@ public class SelfDefineDetail {
 
     //主车速度
     @Order(5)
-    @OffsetDef(value = 0.01)
+    @OffsetDef(value = 0.036)
     private int speed;
 
     //主车航向角
@@ -41,15 +41,22 @@ public class SelfDefineDetail {
     @Order(7)
     private Position rvLocation;
 
-    //RV方向
+    //RV远车速度
     @Order(8)
+    @OffsetDef(value = 0.036)
+    private int rvSpeed;
+
+    //RV方向
+    @Order(9)
+    @OffsetDef(value=0.0001,minValidLength=7)
     private long rvHeading;
 
     //预警级别
-    @Order(9)
+    @Order(10)
     private short level;
 
     //预警距离
-    @Order(10)
+    @Order(11)
+    @OffsetDef(value=0.01)
     private int distance;
 }