Merge remote-tracking branch 'origin/develop' into develop

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", "超速", "发生超速"),

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;
                             }
 
 

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(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);