From fd74ab1958c336d1087037c516dfa3e8b8d3d61e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 八月 2025 11:13:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
index 0b1be34..8a28fa8 100644
--- a/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
+++ b/ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java
@@ -1,6 +1,5 @@
package com.ruoyi.dataInterchange.model;
-import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.dataInterchange.pojo.BaseModel;
import com.ruoyi.dataInterchange.util.jtt809.common.ByteArrayUtil;
import com.ruoyi.dataInterchange.util.jtt809.common.Jtt809Util;
@@ -10,9 +9,6 @@
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
-
-import java.util.Arrays;
-import java.util.List;
/**
* 上报报警信息
@@ -69,7 +65,7 @@
/**
* 报警时间
*/
- @Field(type = FieldType.Integer)
+ @Field(type = FieldType.Long)
private long warnTime;
/**
* 信息ID
@@ -97,7 +93,7 @@
@Field(type = FieldType.Text)
private String driverNo;
/**
- * 报警级别
+ * 报警级别 0x001:一级报警，0x002: 二级报警
*/
@Field(type = FieldType.Integer)
private int level;
@@ -162,6 +158,11 @@
*/
@Field(type = FieldType.Long)
private long pushTime;
+ /**
+ * 抓拍图片
+ */
+ @Field(type = FieldType.Text)
+ private String picUrl;
/**
@@ -236,17 +237,17 @@
//纬度
this.latitude = byteBuf.readInt();
//海拔高度
- this.altitude = byteBuf.readUnsignedShort();
+ this.altitude = byteBuf.readShort();
//行车速度
- this.speed = byteBuf.readUnsignedShort();
+ this.speed = byteBuf.readShort();
//行驶记录速度
- this.vec2 = byteBuf.readUnsignedShort();
+ this.vec2 = byteBuf.readShort();
//报警状态
this.status = byteBuf.readByte();
//方向
- this.direction = byteBuf.readUnsignedShort();
+ this.direction = byteBuf.readShort();
//报警数据长度
- this.infoLength = byteBuf.readUnsignedShort();
+ this.infoLength = byteBuf.readShort();
//报警信息内容
this.infoContent = Jtt809Util.readGBKString(byteBuf,this.infoLength);
}catch (Exception e){
--
Gitblit v1.7.1