Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

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

@@ -64,16 +64,20 @@
    * 解析报文
    */
   public UPExgMsgReportDriverInfoAck decode(UPExgMsg exgMsg) {
      byte[] data = exgMsg.getData();
      ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
      this.vehicleNo = exgMsg.getVehicleNo();
      this.vehicleColor = exgMsg.getVehicleColor();
      this.dataType = exgMsg.getDataType();
      this.dataLength = exgMsg.getDataLength();
      this.driverName = Jtt809Util.readGBKString(byteBuf, 16);
      this.driverId = Jtt809Util.readGBKString(byteBuf, 20);
      this.licence = Jtt809Util.readGBKString(byteBuf, 40);
      this.orgName = Jtt809Util.readGBKString(byteBuf, 200);
      try {
         byte[] data = exgMsg.getData();
         ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
         this.vehicleNo = exgMsg.getVehicleNo();
         this.vehicleColor = exgMsg.getVehicleColor();
         this.dataType = exgMsg.getDataType();
         this.dataLength = exgMsg.getDataLength();
         this.driverName = Jtt809Util.readGBKString(byteBuf, 16);
         this.driverId = Jtt809Util.readGBKString(byteBuf, 20);
         this.licence = Jtt809Util.readGBKString(byteBuf, 40);
         this.orgName = Jtt809Util.readGBKString(byteBuf, 200);
      }catch (Exception e){
         e.printStackTrace();
      }
      return this;
   }
}