Merge remote-tracking branch 'origin/master'

puzhibing

2025-04-25 0dcba4fd1cb536ab426622e31213d8a0194449ff

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

@@ -64,17 +64,21 @@
    * 解析报文
    */
   public UPRealvideoMsgStartupAck decode(RealVideoMsg realVideoMsg) {
      byte[] data = realVideoMsg.getData();
      ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
      this.vehicleNo = realVideoMsg.getVehicleNo();
      this.vehicleColor = realVideoMsg.getVehicleColor();
      this.dataType = realVideoMsg.getDataType();
      this.dataLength = realVideoMsg.getDataLength();
		
      //报警处理结果
      this.result = byteBuf.readByte();
      this.serverIP = Jtt809Util.readGBKString(byteBuf, 32);
      this.serverPort = byteBuf.readShort();
      try {
         byte[] data = realVideoMsg.getData();
         ByteBuf byteBuf = Unpooled.wrappedBuffer(data);
         this.vehicleNo = realVideoMsg.getVehicleNo();
         this.vehicleColor = realVideoMsg.getVehicleColor();
         this.dataType = realVideoMsg.getDataType();
         this.dataLength = realVideoMsg.getDataLength();
			
         //报警处理结果
         this.result = byteBuf.readByte();
         this.serverIP = Jtt809Util.readGBKString(byteBuf, 32);
         this.serverPort = byteBuf.readShort();
      }catch (Exception e){
         e.printStackTrace();
      }
      return this;
   }
}