1.修正道闸逻辑

王通
1 parent b65d207c
Showing 1 changed file with 12 additions and 20 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
@@ -659,18 +659,18 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 zcwcTime = Long.parseLong(timeL.get(0).get("zcwc_time").toString());
             }
             // 大于当前时间5分钟为补传数据
-            if(Math.abs(date-timeT) > bcwcTime){
+            if(Math.abs(date-timeT) >= bcwcTime){
                 for (int i = 0; i < size; i++) {
                     ScheduleRealInfo isr = list.get(i);
                     if (list.get(i).isDestroy())
                         continue;
                     if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fOutParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<bcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<bcwcTime))){
-                        bcwcTime = Math.abs(isr.getDfsjT()-fOutTime);
                         sr = isr;
+                        break;
                     }
                     if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){
-                        bcwcTime = Math.abs(isr.getZdsjT()-fInTime);
                         sr = isr;
+                        break;
                     }
                 }
                 if(sr==null){
@@ -680,7 +680,6 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     return rs;
                 }
             } else {
-                sr = dayOfSchedule.executeCurr(carPlate);
                 if(sr==null){
                     // 班次完成3分钟内上传道闸消息，可以标记
                     for (int i = 0; i < size; i++) {
@@ -688,12 +687,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                         if (list.get(i).isDestroy())
                             continue;
                         if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fOutParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<zcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<zcwcTime))){
-                            zcwcTime = Math.abs(isr.getDfsjT()-fOutTime);
                             sr = isr;
+                            break;
                         }
                         if(fIsOut == 1 && fInStatus != 0 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<zcwcTime))){
-                            zcwcTime = Math.abs(isr.getZdsjT()-fInTime);
                             sr = isr;
+                            break;
                         }
                     }
                     if(sr==null){
@@ -704,12 +703,12 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     }
                 }
             }
-            ScheduleRealInfo prevSr = dayOfSchedule.prev(sr);
-            ScheduleRealInfo nextSr = dayOfSchedule.next(sr);
+            //ScheduleRealInfo prevSr = dayOfSchedule.prev(sr);
+            //ScheduleRealInfo nextSr = dayOfSchedule.next(sr);
-            boolean isMatch = false;
-            ScheduleRealInfo matchSr = null;
-            String inTimeStr ="",outTimeStr="";
+            boolean isMatch = sr == null ? false : true;
+            ScheduleRealInfo matchSr = sr;
+            String inTimeStr = fmtHHmm.print(fInTime),outTimeStr = fmtHHmm.print(fOutTime);
             /**
                fIsOut 1：进场 2：出场
              * 进场 如果道闸信息先发，则为当前班次， 道闸信息后发，则为上一个班次信息
@@ -718,14 +717,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
              *
              * 到达时间接近那个班次的进场/出场判定为这个班次
              */
-            if (fIsOut == 1 && fInStatus != 0 && fInTime != 0) {
-                /*if(prevSr == null || (Math.abs((sr.getZdsjT()- fInTime)) < Math.abs((prevSr.getZdsjT()- fInTime)))){
-                    isMatch = true;
-                    matchSr = sr;
-                } else {//if(Math.abs((prevSr.getDfsjT())- fInTime) < 120)
-                    isMatch = true;
-                    matchSr = prevSr;
-                }*/
+            /*if (fIsOut == 1 && fInStatus != 0 && fInTime != 0) {
                 if(prevSr == null && (sr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs((sr.getZdsjT()- fInTime)) < Math.abs((prevSr.getZdsjT()- fInTime)))){
                     isMatch = true;
                     matchSr = sr;
@@ -743,7 +735,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     matchSr = nextSr;
                 }
                 outTimeStr = fmtHHmm.print(fOutTime);
-            }
+            }*/
             if(isMatch){
                 ScheduleRealInfoTag tag = new ScheduleRealInfoTag();
                 Long real_id = matchSr.getId();