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

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

@@ -1,6 +1,7 @@
 package com.zc.business.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -11,9 +12,12 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 交通管制事件
 
+
 "管制设施"为事件“事件子类”对象 dc_event_traffic_control
  * 
  * @author ruoyi

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

@@ -907,11 +907,11 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
                         termList.add(JSON.parseObject(device.getOtherConfig()));
                         params.put("termList", termList);
 
-                        JSONObject returnResult = broadcastController.nearCamListDistance(params);
                         JSONObject result = new JSONObject();
                         result.put("device", device.getId());
                         result.put("deviceName",device.getDeviceName());
                         result.put("content",params.get("text"));
+                        JSONObject returnResult = broadcastController.nearCamListDistance(params);
                         result.put("result", returnResult);
                         resultArray.add(result);
 
@@ -1010,25 +1010,21 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
             props11.put("parameters", list);
             AjaxResult ajaxResult13 = dcDeviceController.invokedFunction(iotDeviceId, functionId, props11);
             JSONObject result = new JSONObject();
+            result.put("device", device.getId());
+            result.put("deviceName",device.getDeviceName());
             if (ajaxResult13.get("code").equals(200)) {
                 HashMap<String, Object> props1B = new HashMap<>();
                 // 3: 执行1B功能码
                 functionId = DeviceFunctionIdConstants.VARIABLE_INFORMATION_FLAG_1B;
                 props1B.put("fileId", "11");
                 AjaxResult ajaxResult1B = dcDeviceController.invokedFunction(iotDeviceId, functionId, props1B);
-                result.put("device", device.getId());
-                result.put("deviceName",device.getDeviceName());
                 result.put("content",dcInfoBoardTemplate.getContent());
                 result.put("result", ajaxResult1B);
-                resultArray.add(result);
-
             } else {
-                result.put("device", device.getId());
-                result.put("deviceName",device.getDeviceName());
                 result.put("content","发布失败");
                 result.put("result", ajaxResult13);
-                resultArray.add(result);
             }
+            resultArray.add(result);
         }
     }
 

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

@@ -11,7 +11,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.system.service.ISysDeptService;
 import com.zc.business.domain.*;
-import com.zc.business.enums.*;
+import com.zc.business.enums.EventSubclass;
+import com.zc.business.enums.EventSubclassEnum;
+import com.zc.business.enums.ValueConverter;
 import com.zc.business.mapper.*;
 import com.zc.business.service.IDcEventProcessService;
 import com.zc.business.service.IDcEventService;
@@ -139,14 +141,19 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
     public int insertDcEvent(DcEvent dcEvent) {
 
         String dcEventId = dcEvent.getId();
-
+     //桩号校验
+        if (!StakeMarkUtils.checkStakeMark(dcEvent.getStakeMark())){
+            return -1;
+        }
         //获取事件类型
         int eventType = Math.toIntExact(dcEvent.getEventType());
 
         //设置事件Id UUID无下划线格式32
         String uuid = IdUtils.fastSimpleUUID();
         dcEvent.setId(uuid);
+        if (dcEvent.getEventState() == null) {
             dcEvent.setEventState(0L);
+        }
 //获取部门信息
         dcEvent.setDeptId(SecurityUtils.getDeptId());
 //用户
@@ -179,6 +186,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
             String facilityId = String.valueOf(dcEvent.getDcEventTrafficCongestion().getFacilityId());
             dcEvent.setStakeMark(extracted(facilityId));
         }
+
         //施工建设
         if (eventType == 7 && dcEvent.getDcEventConstruction().getFacilityId() != null) {
             String facilityId = String.valueOf(dcEvent.getDcEventConstruction().getFacilityId());
@@ -223,9 +231,23 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                 //交通管制
                 case 3:
                     if (dcEvent.getDcEventTrafficControl() != null) {
-                        if (dcEvent.getDcEventTrafficControl().getFacilityId()==null  || dcEvent.getDcEventTrafficControl().getFacilityId()>0){
+                        if (dcEventId == null) {//非首页进入
+                            if (dcEvent.getDcEventTrafficControl().getFacilityIds() ==null ) {
+                                dcEvent.getDcEventTrafficControl().setId(uuid);
+                                int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
+                                break;
+                            }
+                        }
+                        //事件处置页
+                        if (dcEvent.getEventState() == 1 && dcEvent.getDcEventTrafficControl().getFacilityIds() == null) {//新增的数据不是收费站
+                            updateDcEventState(dcEvent.getId(), dcEvent.getEventState().intValue());
                             dcEvent.getDcEventTrafficControl().setId(uuid);
                             int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
+                            DcEvent dcEvent1 = new DcEvent();
+                            dcEvent1.setId(dcEventId);//事件id
+                            dcEvent1.setEventNature(1l);//首发事件
+                            dcEvent1.setLinkId(uuid);//关联管制事件id
+                            dcEventMapper.updateDcEventLinkId(dcEvent1);//修改事件性质
                             break;
                         }
                         // 插入多个收费站
@@ -325,7 +347,11 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
 
                                     //新增第一条数据
                                     dcEvent.setId(map.get("facilityId" + i));
+
+                                    if (dcEvent.getEventState() == null) {
                                         dcEvent.setEventState(0L);
+                                    }
+
                                     dcEvent.setDeptId(SecurityUtils.getDeptId());
                                     dcEvent.setUserId(SecurityUtils.getUserId());
                                     dcEvent.setCreateTime(DateUtils.getNowDate());
@@ -346,7 +372,6 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
 
                                     String linkId = sb.toString();
                                     dcEvent.setLinkId(linkId);
-                                    System.out.println(linkId);
 
                                     //交通管制
                                     if (eventType == 3 && dcEvent.getDcEventTrafficControl().getFacilityIds()[i] != null) {
@@ -354,8 +379,11 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                                         dcEvent.setStakeMark(extracted(facilityId));
                                     }
 
+
                                     dcEventMapper.insertDcEvent(dcEvent);
                                     extracted(dcEvent);
+                                    //首页事件 交通管制事件 添加 状态默认为 1 处置中
+                                    updateDcEventState(dcEvent.getId(), dcEvent.getEventState().intValue());
                                     int i6 = dcEventTrafficControlMapper.insertDcEventTrafficControl(dcEvent.getDcEventTrafficControl());
                                 }
                             }
@@ -718,7 +746,8 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
 //事件方向
         if (dcEvent.getDirection().equals("菏泽方向")) {
             dcEvent.setDirection("1");
-        }   if (dcEvent.getDirection().equals("济南方向")){
+        }
+        if (dcEvent.getDirection().equals("济南方向")) {
             dcEvent.setDirection("3");
         }