事件 桩号验证修订

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

@@ -143,10 +143,7 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
     public int insertDcEvent(DcEvent dcEvent) {
 
         String dcEventId = dcEvent.getId();
-     //桩号校验
+
-        if (!com.ruoyi.common.utils.StakeMarkUtils.checkStakeMark(dcEvent.getStakeMark())){
-            return -1;
-        }
         //获取事件类型
         int eventType = Math.toIntExact(dcEvent.getEventType());
 
@@ -199,7 +196,10 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
             String facilityId = String.valueOf(dcEvent.getDcEventServiceArea().getFacilityId());
             dcEvent.setStakeMark(extracted(facilityId));
         }
-
+        //桩号校验
+        if (!com.ruoyi.common.utils.StakeMarkUtils.checkStakeMark(dcEvent.getStakeMark())){
+            return -1;
+        }
 
         int i7 = dcEventMapper.insertDcEvent(dcEvent);