From 2d217c614073681cf14719fd201993d5c5fb5aa7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 18 四月 2025 16:25:14 +0800
Subject: [PATCH] 修改测试bug
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java
index db654b9..fab49ac 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPBaseMsgVehicleAddedAck.java
@@ -1,6 +1,8 @@
package com.ruoyi.dataInterchange.model;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.dataInterchange.util.jtt809.common.Jtt809Util;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
import lombok.Data;
/**
@@ -13,36 +15,38 @@
/**
* 车牌号码
*/
- @JsonProperty("VEHICLE_NO")
private String vehicleNo;
/**
* 车牌颜色
*/
- @JsonProperty("VEHICLE_COLOR")
- private String vehicleColor;
+ private int vehicleColor;
/**
* 子业务类型标识
*/
- @JsonProperty("DATA_TYPE")
- private String dataType;
+ private int dataType;
/**
* 后续数据长度
*/
- @JsonProperty("DATA_LENGTH")
- private String dataLength;
- /**
- * 对应补报车辆静态信息请求消息源子业务类型标识
- */
- @JsonProperty("SOURCE_DATE_TYPE")
- private String sourceDateType;
- /**
- * 对应补报车辆静态信息请求消息源报文序列号
- */
- @JsonProperty("SOURCE_MSG_SN")
- private String sourceMsgSn;
+ private int dataLength;
/**
* 车辆信息
*/
- @JsonProperty("CAR_INFO")
private String carInfo;
+
+
+ /**
+ * 解析报文
+ */
+ 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());
+ return this;
+ }
}
--
Gitblit v1.7.1