添加DTO对象

src/main/java/com/cusc/adas/v2x/utils/SM4Utils.java

@@ -20,9 +20,9 @@ public class SM4Utils {
     }
     
     /**
-     * ???? SM4 ???
-     * @return ????? Base64 ?????????
-     * @throws Exception ??
+     * 生成 SM4 密钥
+     * @return 密钥的 Base64 编码字符串
+     * @throws Exception 异常
      */
     public static String generateKey() throws Exception {
         KeyGenerator kg = KeyGenerator.getInstance(ALGORITHM_NAME, "BC");
@@ -32,11 +32,11 @@ public class SM4Utils {
     }
   
     /**
-     * SM4 ????
-     * @param plainText ????
-     * @param key ????? Base64 ?????????
-     * @return ????? Base64 ?????????
-     * @throws Exception ??
+     * SM4 加密
+     * @param plainText 明文
+     * @param key 密钥的 Base64 编码字符串
+     * @return 密文的 Base64 编码字符串
+     * @throws Exception 异常
      */
     public static String encrypt(String plainText, String key) throws Exception {
         byte[] keyBytes = Base64.getDecoder().decode(key);
@@ -48,11 +48,11 @@ public class SM4Utils {
     }
 
     /**
-     * SM4 ????
-     * @param cipherText ????? Base64 ?????????
-     * @param key ????? Base64 ?????????
-     * @return ????
-     * @throws Exception ??
+     * SM4 解密
+     * @param cipherText 密文的 Base64 编码字符串
+     * @param key 密钥的 Base64 编码字符串
+     * @return 明文
+     * @throws Exception 异常
      */
     public static String decrypt(String cipherText, String key) throws Exception {
         byte[] keyBytes = Base64.getDecoder().decode(key);

src/main/java/com/cusc/adas/v2x/vehiclesubscribe/vo/VehicleSubscribeMessageBody.java

 package com.cusc.adas.v2x.vehiclesubscribe.vo;
 
-public class VehicleSubscribeMessageBody {
+import com.cusc.adas.v2x.utils.FieldDef;
+import com.cusc.adas.v2x.utils.NumFlag;
+import com.cusc.adas.v2x.utils.Order;
+import com.cusc.adas.v2x.utils.RefNumFlag;
 
+public class VehicleSubscribeMessageBody {
+	@Order(1)
+	@FieldDef(type="BYTE",isArray=true,length=8)
 	private String vehicleId;
-	
-	private byte subsLen;
-	
-	private Byte[] funcSubscribe;
+	@Order(2)
+	@NumFlag
+	private short subsLen;
+	@Order(3)
+	@RefNumFlag(value="subsLen")
+	@FieldDef(type="BYTE[N]",isArray=true)
+	private byte[] funcSubscribe;
 	
 	
 	

src/main/java/com/cusc/adas/v2x/vo/DynamicsClassMap.java

+package com.cusc.adas.v2x.vo;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.cusc.adas.v2x.assist.vo.TrafficLight;
+import com.cusc.adas.v2x.clouddecision.vo.AbnormalVehicle;
+import com.cusc.adas.v2x.clouddecision.vo.AutoSpeedLimit;
+import com.cusc.adas.v2x.clouddecision.vo.EmergencyVehicle;
+import com.cusc.adas.v2x.clouddecision.vo.FawWarnning;
+import com.cusc.adas.v2x.clouddecision.vo.RSIWarnning;
+import com.cusc.adas.v2x.clouddecision.vo.TrafficLightInfo;
+
+public class DynamicsClassMap {
+	private static   Map<String,Map<Short,Class>> map = new HashMap<>();
+	
+	static {
+		Map<Short,Class> cloundDecisionsubMap = new  HashMap<>();
+		
+		// 参考 adviceType 列表定义
+		cloundDecisionsubMap.put((short)1, TrafficLightInfo.class);//信号灯路口车速引导功能指令
+		cloundDecisionsubMap.put((short)5, AutoSpeedLimit.class);//动态车道级限速指令
+		cloundDecisionsubMap.put((short)9, FawWarnning.class);//前向碰撞预警
+		cloundDecisionsubMap.put((short)11, AbnormalVehicle.class);//异常车辆预警
+		cloundDecisionsubMap.put((short)13, EmergencyVehicle.class);//紧急车辆预警
+		cloundDecisionsubMap.put((short)17, RSIWarnning.class);//通用 RSI 预警
+		map.put("CloudDecision",cloundDecisionsubMap );
+		
+		Map<Short,Class> assistSubMap = new  HashMap<>();
+		assistSubMap.put((short)7, TrafficLight.class);
+		map.put("assist",assistSubMap );
+		
+		
+	
+	}
+	
+	public static  Class get(String classtype,Short classkey) {
+		Map<Short,Class> subMap =  map.get(classtype);
+		return subMap.get(classkey);
+	}
+
+}

src/main/java/com/cusc/adas/v2x/vo/VehicleMessageBody.java

@@ -8,9 +8,9 @@ public class VehicleMessageBody {
     @Order(1)
     private VehicleInfo vehicleInfo;
     /****车辆辅助驾驶信息及状态信息*/
-//    @Order(2)
-//    private VehicleStatusInfo vehicleStatusInfo;
+    @Order(2)
+    private VehicleStatusInfo vehicleStatusInfo;
 //	//车辆自动驾驶信息
-//	@Order(3)
-//	private  AutomaticDriveInfo automaticDriveInfo;
+	@Order(3)
+	private  AutomaticDriveInfo automaticDriveInfo;
 }

src/main/java/com/cusc/adas/v2x/vo/VehicleStatusInfo.java

@@ -110,11 +110,11 @@ public class VehicleStatusInfo {
 	//数据偏移量 200，表示-200.00 m/s～200.00 m/s，
 	@Order(27)
 	@RefNumFlag(value="wheelNum")
-	private int[]  wheelVelocity;
+	private List<Integer>  wheelVelocity;
 	//胎压
 	@Order(28)
 	@RefNumFlag(value="wheelNum")
-	private int[]  tirePressure;
+	private List<Integer>  tirePressure;
 	//车灯状态 BIT2 = 左转灯 BIT3 = 右转灯
 	@Order(30)
 	private int lights;