From 1bb4e08f63d369355429413c3e84105ffa543458 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 31 Jul 2024 14:35:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E7=8E=87tab=E9=A1=B5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=9F=A5=E8=AF=A2=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=8A=A4=E6=A0=8F=E7=A2=B0=E6=92=9E=E4=BA=8B=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zc/business/interfaces/OperationLogAspect.java | 2 +- .../business/message/device/handler/DeviceMessageHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java index e4d4d519..b88bf18a 100644 --- a/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java +++ b/zc-business/src/main/java/com/zc/business/interfaces/OperationLogAspect.java @@ -207,7 +207,7 @@ public class OperationLogAspect { Objects.equals(functionId, UniversalEnum.FIFTY_TWO.getValue()) || Objects.equals(functionId, UniversalEnum.THREE_D.getValue()) || Objects.equals(functionId, UniversalEnum.THREE_C.getValue())) { - return; + break; } diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java index dfc2fef7..b14c52e9 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java +++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java @@ -564,7 +564,7 @@ public class DeviceMessageHandler { dcWarning.setWarningSource(UniversalEnum.FOUR.getNumber()); dcWarning.setWarningState(UniversalEnum.ONE.getNumber()); dcWarning.setCreateTime(new Date()); - dcWarning.setRemark("护栏碰撞上报事件：区域号为" + areaCode + "在20" + timeOfFireAlarming + direction + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); + dcWarning.setRemark("护栏碰撞上报事件：" + "在20" + timeOfFireAlarming + direction + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); dcWarning.setWarningTitle("护栏碰撞在20" + timeOfFireAlarming + direction + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); dcWarning.setOtherConfig(dataJsonObject.toJSONString()); dcWarningService.insertDcWarning(dcWarning); From ff2f801aab36dca38849655e2473b60e6f516b52 Mon Sep 17 00:00:00 2001 From: zhaoxianglong Date: Wed, 31 Jul 2024 15:08:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A4=E6=A0=8F?= =?UTF-8?q?=E7=A2=B0=E6=92=9E=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/message/device/handler/DeviceMessageHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java index b14c52e9..d8dcbe72 100644 --- a/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java +++ b/zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java @@ -564,7 +564,7 @@ public class DeviceMessageHandler { dcWarning.setWarningSource(UniversalEnum.FOUR.getNumber()); dcWarning.setWarningState(UniversalEnum.ONE.getNumber()); dcWarning.setCreateTime(new Date()); - dcWarning.setRemark("护栏碰撞上报事件：" + "在20" + timeOfFireAlarming + direction + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); + dcWarning.setRemark(UniversalEnum.TWENTY.getValue() + timeOfFireAlarming + UniversalEnum.BLANK_SPACE.getValue() + direction + UniversalEnum.BLANK_SPACE.getValue() + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); dcWarning.setWarningTitle("护栏碰撞在20" + timeOfFireAlarming + direction + UniversalEnum.TAKE_PLACE.getValue() + eventType + UniversalEnum.INCIDENT.getValue()); dcWarning.setOtherConfig(dataJsonObject.toJSONString()); dcWarningService.insertDcWarning(dcWarning); From fb6ea311154f2d26e9ac52baede89c261a453d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com> Date: Wed, 31 Jul 2024 15:21:21 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=86=E9=A2=91AI=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=8B=BC=E6=8E=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zc/business/enums/WarningSubclassEnum.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java b/zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java index 02bbb6ec..195db4fe 100644 --- a/zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java +++ b/zc-business/src/main/java/com/zc/business/enums/WarningSubclassEnum.java @@ -11,8 +11,8 @@ import java.util.Map; */ public enum WarningSubclassEnum { - TRAFFIC_JAM("1-1", "拥堵", "发生"), - SLOW_TRAFFIC("1-2", "缓行", "发生"), + TRAFFIC_JAM("1-1", "拥堵", "发生拥堵"), + SLOW_TRAFFIC("1-2", "缓行", "发生缓行"), REGULAR_PEDESTRIAN("2-1", "普通行人", "发生行人"), STAFF_MEMBER("2-2", "工作人员", "发生行人"), MOTORCYCLE("3-1", "摩托车", "发生非机动车"), @@ -22,13 +22,13 @@ public enum WarningSubclassEnum { CONSTRUCTION_VEHICLE("4-2", "工程车", "发生停车"), MAIN_ROAD_OCCUPIED("4-3", "主路有车", "发生停车"), RAMP_OCCUPIED("4-4", "匝道有车", "发生停车"), - VEHICLE_BREAKDOWN("4-5", "车辆故障", "发生"), - TRAFFIC_ACCIDENT("4-6", "交通事故", "发生"), - EMERGENCY_LANE_BLOCKED("4-7", "应急车道被占用", "发生"), - VEHICLE_EXIT_EMERGENCY_LANE("4-8", "车离开应急车道", "发生"), + VEHICLE_BREAKDOWN("4-5", "车辆故障", "发生停车"), + TRAFFIC_ACCIDENT("4-6", "交通事故", "发生停车"), + EMERGENCY_LANE_BLOCKED("4-7", "应急车道被占用", "发生停车"), + VEHICLE_EXIT_EMERGENCY_LANE("4-8", "车离开应急车道", "发生停车"), OTHER_CONDITION("4-9", "其他", "发生停车"), OTHER_UNKNOWN("4-10", "未知车辆", "发生停车"), - REVERSING_OR_GOING_BACKWARDS("5-1", "倒车/逆行", "发生"), + REVERSING_OR_GOING_BACKWARDS("5-1", "倒车/逆行", "发生倒车/逆行"), LINEBALL("5-2", "压线", "发生压线"), TURNROUND("5-3", "掉头", "发生掉头"), SPEED("5-4", "超速", "发生超速"),