优化设备在线率tab页导出以及查询

优化护栏碰撞事件上报描述

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("护栏碰撞上报事件：" + "在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);