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

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

@@ -242,7 +242,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         }
                         //事件处置页
                         if (dcEvent.getEventState() == 1 && dcEvent.getDcEventTrafficControl().getFacilityIds() == null) {//新增的数据不是收费站
-                            updateDcEventState(dcEvent.getId(), dcEvent.getEventState().intValue());
+                            updateDcEventState(dcEvent.getId(), 1);
                             dcEvent.getDcEventTrafficControl().setId(uuid);
                             int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
                             DcEvent dcEvent1 = new DcEvent();
@@ -256,7 +256,6 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         if (dcEvent.getDcEventTrafficControl().getFacilityIds().length == 1) {//facilityIds==1 说明只选择了一个收费站
 
                             if (dcEventId != null && !dcEventId.equals("")) {//不等于空 事件处置页面 修改
-                                dcEventMapper.deleteDcEventById(uuid);//删除添加的事件主类
                                 DcEvent dcEvent1 = new DcEvent();
                                 dcEvent1.setId(dcEventId);//事件id
                                 dcEvent1.setEventNature(1l);//首发事件
@@ -265,6 +264,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                 dcEvent.getDcEventTrafficControl().setId(uuid);
                                 dcEvent.getDcEventTrafficControl().setFacilityId(dcEvent.getDcEventTrafficControl().getFacilityIds()[0]);//取出数组字段赋值 设施id
                                 int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());//
+                                //首页事件 交通管制事件 添加 状态默认为 1 处置中
+                                updateDcEventState(dcEvent.getId(), 1);
                             } else {
                                 extracted(dcEvent);//事件推送到 首页
 
@@ -330,6 +331,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                         dcEvent.setStakeMark(extracted(facilityId));
                                     }
                                     dcEventMapper.insertDcEvent(dcEvent);
+                                    //首页事件 交通管制事件 添加 状态默认为 1 处置中
+                                    updateDcEventState(map.get("facilityId" + i), 1);
 
                                     int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
 
@@ -384,8 +387,6 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
 
                                     dcEventMapper.insertDcEvent(dcEvent);
                                     extracted(dcEvent);
-                                    //首页事件 交通管制事件 添加 状态默认为 1 处置中
-                                    updateDcEventState(dcEvent.getId(), dcEvent.getEventState().intValue());
                                     int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
                                 }
                             }
@@ -435,8 +436,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                     break;
                 //其他事件
                 case 11:
-                    if (dcEventId != null) {//首页进入
 
+                    if (dcEventId != null) {//首页进入
                         DcEvent dcEvent1 = new DcEvent();
                         dcEvent1.setId(dcEventId);//事件id
                         dcEvent1.setEventNature(1l);//首发事件