修改事件比对方向

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

@@ -783,12 +783,15 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
         int i7 = dcEventMapper.updateDcEvent(dcEvent);
         if (i7 > 0) {
             String context = comparisonInfo(oldEvent, dcEvent);
-            //事件处置流程记录
-            DcEventProcess dcEventProcess = new DcEventProcess();
-            dcEventProcess.setEventId(dcEvent.getId());
-            dcEventProcess.setSource(1);
-            dcEventProcess.setContext(context);
-            dcEventProcessService.insertDcEventProcess(dcEventProcess);
+            if (context.length() > 0){
+                //事件处置流程记录
+                DcEventProcess dcEventProcess = new DcEventProcess();
+                dcEventProcess.setEventId(dcEvent.getId());
+                dcEventProcess.setSource(1);
+                dcEventProcess.setContext(context);
+                dcEventProcessService.insertDcEventProcess(dcEventProcess);
+            }
+
 
             //中间库
             MdEvent mdEvent = new MdEvent(dcEvent);
@@ -1230,6 +1233,15 @@ public class DcEventServiceImpl extends ServiceImpl<DcEventMapper, DcEvent> impl
                         e.printStackTrace();
                     }
                 } else if ("direction".equals(result.getRightPath())) {
+
+                    if (("1".equals(result.getRight()) || "上行".equals(result.getRight()) || "菏泽方向".equals(result.getRight()))
+                            && ("1".equals(result.getLeft()) || "上行".equals(result.getLeft()) || "菏泽方向".equals(result.getLeft()))){
+                        continue;
+                    } else if(("3".equals(result.getRight()) || "下行".equals(result.getRight()) || "济南方向".equals(result.getRight()))
+                            && ("3".equals(result.getLeft()) || "下行".equals(result.getLeft()) || "济南方向".equals(result.getLeft()))){
+                        continue;
+                    }
+
                     if ("1".equals(result.getRight())) {
                         result.setRight("菏泽方向");
                     } else if ("2".equals(result.getRight())) {