From 96f920d000ff037d0bb27aaa29d2890db5a491a2 Mon Sep 17 00:00:00 2001 From: lau572 <1010031226@qq.com> Date: Thu, 24 Oct 2024 08:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=B9=E5=9D=A1=E7=9B=91=E6=B5=8B=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/zc/business/domain/DcWarning.java | 4 ++-- .../src/main/java/com/zc/business/enums/ValueConverter.java | 2 ++ .../main/java/com/zc/business/enums/WarningSourceEnum.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java index b1d4661f..173fe1dc 100644 --- a/zc-business/src/main/java/com/zc/business/domain/DcWarning.java +++ b/zc-business/src/main/java/com/zc/business/domain/DcWarning.java @@ -44,8 +44,8 @@ public class DcWarning extends BaseEntity /** 处理人员 */ private Long userId; - /** 信息来源:1-视频AI2-雷达识别3-锥桶4-护栏碰撞5-扫码报警6-非机预警 */ - @Excel(name = "信息来源", readConverterExp = "1=视频AI,2=雷达识别,3=锥桶,4=护栏碰撞,5=扫码报警,6=非机预警") + /** 信息来源:1-视频AI2-雷达识别3-锥桶4-护栏碰撞5-扫码报警6-非机预警,7-气象监测器,8-边坡监测 */ + @Excel(name = "信息来源", readConverterExp = "1=视频AI,2=雷达识别,3=锥桶,4=护栏碰撞,5=扫码报警,6=非机预警,7=气象监测器,8=边坡监测") private Integer warningSource; /** 预警级别 */ diff --git a/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java b/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java index 7656c61b..3346ee11 100644 --- a/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java +++ b/zc-business/src/main/java/com/zc/business/enums/ValueConverter.java @@ -41,6 +41,7 @@ public class ValueConverter { valueMappingSource.put(3,9); valueMappingSource.put(5,11); valueMappingSource.put(6,12); + valueMappingSource.put(8,14); valueMappingHost.put(1, 4); valueMappingHost.put(2, 5); valueMappingHost.put(3, 5); @@ -125,6 +126,7 @@ public class ValueConverter { eventSourceName.put("11","扫码报警"); eventSourceName.put("12","非机预警"); eventSourceName.put("13","气象检测器"); + eventSourceName.put("14","边坡监测"); eventTypeName.put("1","交通事故"); eventTypeName.put("2","车辆故障"); diff --git a/zc-business/src/main/java/com/zc/business/enums/WarningSourceEnum.java b/zc-business/src/main/java/com/zc/business/enums/WarningSourceEnum.java index 1f0a6c77..4b080b9e 100644 --- a/zc-business/src/main/java/com/zc/business/enums/WarningSourceEnum.java +++ b/zc-business/src/main/java/com/zc/business/enums/WarningSourceEnum.java @@ -10,7 +10,9 @@ public enum WarningSourceEnum { CONE_DETECTION(3,"锥桶感应"), GUARDRAIL_COLLISION(4,"护栏碰撞"), QR_CODE_ALERT(5,"扫码报警"), - NON_MOTOR_VEHICLE_WARNING(6,"非机动车预警"); + NON_MOTOR_VEHICLE_WARNING(6,"非机动车预警"), + WEATHER_WARNING(7,"气象检测器"), + SIDE_SLOPE_WARNING(8,"边坡监测"); private final Integer code; private final String description;