自然-自燃 修改 事件推送修改

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

@@ -138,7 +138,7 @@ public class DcEvent {
      * 3-4 服务区封闭和限行
      */
 
-    @ApiModelProperty("事件子类 例：事件子类：* 1-1 追尾* 1-2 侧翻* 1-3 撞护栏* 1-4 自然* 1-5 其他事故* 2-1 车辆故障")
+    @ApiModelProperty("事件子类 例：事件子类：* 1-1 追尾* 1-2 侧翻* 1-3 撞护栏* 1-4 自燃* 1-5 其他事故* 2-1 车辆故障")
 
     private String eventSubclass;
     /**

zc-business/src/main/java/com/zc/business/enums/EventSubclassEnum.java

@@ -8,7 +8,7 @@ public enum EventSubclassEnum {
     REAR_END_COLLISION("1-1", "追尾","前方*发生追尾 注意避让"),
     ROLLOVER("1-2", "侧翻","前方*发生侧翻 注意避让"),
     COLLISION_WITH_GUARDRAIL("1-3", "撞护栏","前方*车撞击护栏注意避让"),
-    NATURAL("1-4", "自然","前方*发生自然现象请注意"),
+    NATURAL("1-4", "自燃","前方*发生自燃现象请注意"),
     OTHER_ACCIDENTS("1-5", "其他事故","前方*发生事故谨慎驾驶"),
     VEHICLE_MALFUNCTION("2-1", "车辆故障","前方*发生故障注意避让"),
     THE_MAIN_LINE_IS_CLOSED_AND_RESTRICTED("3-1", "主线封闭和限行","前方*主线封闭和限行"),

zc-business/src/main/java/com/zc/business/enums/ValueConverter.java

@@ -126,7 +126,7 @@ public  class ValueConverter {
             eventSubclassName.put("1-1","追尾");
             eventSubclassName.put("1-2","侧翻");
             eventSubclassName.put("1-3","撞护栏");
-            eventSubclassName.put("1-4","自然");
+            eventSubclassName.put("1-4","自燃");
             eventSubclassName.put("1-5","其他事故");
             eventSubclassName.put("2-1","车辆故障");
             eventSubclassName.put("3-1","主线封闭和限行");

zc-business/src/main/java/com/zc/business/service/impl/DcEventServiceImpl.java

@@ -216,9 +216,9 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
 
         int i7 = dcEventMapper.insertDcEvent(dcEvent);
 
-        if (i7 > 0 && eventType != 3) {
+/*        if (i7 > 0 && eventType != 3) {
             extracted(dcEvent);//事件推送到 首页
-        }
+        }*/
         if (i7 > 0) {
 
 //if (dcEvent.getDcEventTrafficControl().getFacilityIds().length<1 &&dcEventId == null){//非 事件处置 和收费站等多条数据添加
@@ -235,6 +235,9 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         int i1 = dcEventAccidentMapper.insertDcEventAccident(dcEvent.getDcEventAccident());
                         if (dcEvent.getEventState() == 1) {
                             updateDcEventState(uuid,1);//直接确认
+                        }else {
+                            extracted(dcEvent);//事件推送到 首页
+
                         }
                     }
                     break;
@@ -245,6 +248,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         int i5 = dcEventVehicleAccidentMapper.insertDcEventVehicleAccident(dcEvent.getDcEventVehicleAccident());
                         if (dcEvent.getEventState() ==1) {
                             updateDcEventState(uuid,1);//直接确认
+                        }else {
+                            extracted(dcEvent);//事件推送到 首页
                         }
                     }
                     break;
@@ -318,7 +323,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                 //首页事件 交通管制事件 添加 状态默认为 1 处置中
                                 updateDcEventState(dcEvent.getId(), 1);
                             } else {
-                                extracted(dcEvent);//事件推送到 首页
+                           //     extracted(dcEvent);//事件推送到 首页
 
                                 dcEvent.getDcEventTrafficControl().setId(uuid);
                                 dcEvent.getDcEventTrafficControl().setFacilityId(dcEvent.getDcEventTrafficControl().getFacilityIds()[0]);//取出数组字段赋值 设施id
@@ -394,7 +399,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                     //交通管制
                                     if (eventType == 3 && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) {
                                         String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]);
-                                        dcEvent.setStakeMark(extracted(facilityId));
+                                     //   dcEvent.setStakeMark(extracted(facilityId));
                                     }
                                     dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间
                                     dcEventMapper.insertDcEvent(dcEvent);
@@ -447,12 +452,12 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                     //交通管制
                                     if (eventType == 3 && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) {
                                         String facilityId = String.valueOf(dcEvent.getDcEventTrafficControl().getFacilityIds()[i]);
-                                        dcEvent.setStakeMark(extracted(facilityId));
+                                    //    dcEvent.setStakeMark(extracted(facilityId));
                                     }
 
                                     dcEvent.setOccurrenceTime(DateUtils.getNowDate());//默认发生时间
                                     dcEventMapper.insertDcEvent(dcEvent);
-                                    extracted(dcEvent);
+                                //    extracted(dcEvent);
                                     int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
                                     updateDcEventState(map.get("facilityId" + i),1);//直接确认