Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java

@@ -38,15 +38,19 @@
    * 解析报文
    */
   public UPBaseMsgVehicleAddedAck decode(BaseMsg baseMsg) {
      byte[] data = baseMsg.getData();
      ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
      this.vehicleNo = baseMsg.getVehicleNo();
      this.vehicleColor = baseMsg.getVehicleColor();
      this.dataType = baseMsg.getDataType();
      this.dataLength = baseMsg.getDataLength();
		
      //车辆信息
      this.carInfo = Jtt809Util.readGBKString(byteBuf, baseMsg.getDataLength());
      try {
         byte[] data = baseMsg.getData();
         ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
         this.vehicleNo = baseMsg.getVehicleNo();
         this.vehicleColor = baseMsg.getVehicleColor();
         this.dataType = baseMsg.getDataType();
         this.dataLength = baseMsg.getDataLength();
			
         //车辆信息
         this.carInfo = Jtt809Util.readGBKString(byteBuf, baseMsg.getDataLength());
      }catch (Exception e){
         e.printStackTrace();
      }
      return this;
   }
}