中间库事件对象

zc-business/src/main/java/com/zc/business/domain/MdEvent.java

@@ -588,51 +588,7 @@ public class MdEvent
         //交通事件名称
         this.eventName = dcEvent.getEventTitle();
         //交通事件类型
-        this.eventTypeCode = dcEvent.getEventType().toString();
+        if (dcEvent.getEventType() != null && dcEvent.getEventType() > 0){
-        //交通事件详情
-        this.eventDesc = dcEvent.getDescription();
-        //发生时间
-        this.occurTime = dcEvent.getStartTime();
-        //发生时间
-        this.endTime = dcEvent.getEndTime();
-        //发生路段位置桩号
-        this.stakeNumber = dcEvent.getStakeMark();
-        //影响车道
-        this.lane = dcEvent.getLang();
-        //方向：1-上 2-中 3-下
-        this.direction = dcEvent.getDirection();
-        //事件来源编码
-        this.eventSourceCode = dcEvent.getEventSource();
-        //事件来源编码  1-96659,2-交警转接,3-道路巡查,4-视频巡查,5-视频AI,6-一键救援,7-其他
-        if (dcEvent.getEventSource() > 0){
-            if (dcEvent.getEventSource() == 1){
-                this.eventSource = "96659";
-            } else if (dcEvent.getEventSource() == 2){
-                this.eventSource = "交警转接";
-            } else if (dcEvent.getEventSource() == 3){
-                this.eventSource = "道路巡查";
-            } else if (dcEvent.getEventSource() == 4){
-                this.eventSource = "视频巡查";
-            } else if (dcEvent.getEventSource() == 5){
-                this.eventSource = "视频AI";
-            } else if (dcEvent.getEventSource() == 6){
-                this.eventSource = "一键救援";
-            } else if (dcEvent.getEventSource() == 7){
-                this.eventSource = "其他";
-            }
-        }
-        //事件状态：0-待确认,1-处理中,2-已完成
-        this.eventStatus = dcEvent.getEventState();
-        //事件等级
-        this.eventLevel = dcEvent.getEventLevel();
-        //所属路段
-        if (dcEvent.getRoadId() > 0){
-            this.sectionId = dcEvent.getRoadId().toString();
-        }
-        //交通事件类型子类
-        this.eventTypeCode2 = dcEvent.getEventSubclass();
-        //事件原因
-        this.eventCause = dcEvent.getEventCause();
 
             //事件主类：
             //            1-交通事故
@@ -647,6 +603,7 @@ public class MdEvent
             //            10-异常天气
             //            11-其他事件
             String eventType = dcEvent.getEventType().toString();
+            this.eventTypeCode = eventType;
             if ("1".equals(eventType)){
                 DcEventAccident dcEventAccident = dcEvent.getDcEventAccident();
                 if (dcEventAccident != null){
@@ -705,6 +662,50 @@ public class MdEvent
 
                 }
             }
-
+        }
+        //交通事件详情
+        this.eventDesc = dcEvent.getDescription();
+        //发生时间
+        this.occurTime = dcEvent.getStartTime();
+        //发生时间
+        this.endTime = dcEvent.getEndTime();
+        //发生路段位置桩号
+        this.stakeNumber = dcEvent.getStakeMark();
+        //影响车道
+        this.lane = dcEvent.getLang();
+        //方向：1-上 2-中 3-下
+        this.direction = dcEvent.getDirection();
+        //事件来源编码
+        this.eventSourceCode = dcEvent.getEventSource();
+        //事件来源编码  1-96659,2-交警转接,3-道路巡查,4-视频巡查,5-视频AI,6-一键救援,7-其他
+        if (dcEvent.getEventSource() != null && dcEvent.getEventSource() > 0){
+            if (dcEvent.getEventSource() == 1){
+                this.eventSource = "96659";
+            } else if (dcEvent.getEventSource() == 2){
+                this.eventSource = "交警转接";
+            } else if (dcEvent.getEventSource() == 3){
+                this.eventSource = "道路巡查";
+            } else if (dcEvent.getEventSource() == 4){
+                this.eventSource = "视频巡查";
+            } else if (dcEvent.getEventSource() == 5){
+                this.eventSource = "视频AI";
+            } else if (dcEvent.getEventSource() == 6){
+                this.eventSource = "一键救援";
+            } else if (dcEvent.getEventSource() == 7){
+                this.eventSource = "其他";
+            }
+        }
+        //事件状态：0-待确认,1-处理中,2-已完成
+        this.eventStatus = dcEvent.getEventState();
+        //事件等级
+        this.eventLevel = dcEvent.getEventLevel();
+        //所属路段
+        if (dcEvent.getRoadId() != null && dcEvent.getRoadId() > 0){
+            this.sectionId = dcEvent.getRoadId().toString();
+        }
+        //交通事件类型子类
+        this.eventTypeCode2 = dcEvent.getEventSubclass();
+        //事件原因
+        this.eventCause = dcEvent.getEventCause();
     }
 }