From 8c6849d98fc168369d6de2d94d2f42a6d67cd9c5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 26 五月 2025 11:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-dataInterchange/src/main/java/com/ruoyi/dataInterchange/model/UPWarnMsgAdptInfo.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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..5fd888b 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;
 
 /**
  * 上报报警信息
@@ -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;
 
 	
 	/**

--
Gitblit v1.7.1