1.道闸逻辑修正

王通
1 parent b37d4e5b
Showing 1 changed file with 17 additions and 15 deletions
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
@@ -602,6 +602,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             Long fOutTime = map.get("fOutTime")==null?0:(Long.parseLong(map.get("fOutTime").toString())*1000);
             int fIsOut = map.get("fIsOut")==null?0:Integer.parseInt(map.get("fIsOut").toString());
             Long fInTime = map.get("fInTime")==null?0:(Long.parseLong(map.get("fInTime").toString())*1000);
+            int fInStatus = map.get("fInStatus")==null?0:Integer.parseInt(map.get("fInStatus").toString());
+            String fOutParkName = map.get("fOutParkName")==null?"":map.get("fOutParkName").toString().trim();
 //            String fInPlate = map.get("fInPlate")==null?"":map.get("fInPlate").toString();
 //            String fInStatus = map.get("fInStatus")==null?"":map.get("fInStatus").toString();
@@ -639,7 +641,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             boolean isbc = false;
             Long date = new Date().getTime();
             Long timeT = 0l;
-            if (fIsOut == 1 && fInTime != 0) {
+            if (fIsOut == 1 && fInStatus != 0 && fInTime != 0) {
                 timeT = fInTime;
             } else if (fIsOut == 2 && fOutTime != 0) {
                 timeT = fOutTime;
@@ -662,11 +664,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     ScheduleRealInfo isr = list.get(i);
                     if (list.get(i).isDestroy())
                         continue;
-                    if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<bcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<bcwcTime))){
+                    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;
                     }
-                    if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){
+                    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;
                     }
@@ -685,11 +687,11 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                         ScheduleRealInfo isr = list.get(i);
                         if (list.get(i).isDestroy())
                             continue;
-                        if(fIsOut == 2 && (isr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getDfsjT()-fOutTime)<zcwcTime || (isr.getFcsjActualTime() != null && Math.abs(isr.getFcsjActualTime()-fOutTime)<zcwcTime))){
+                        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;
                         }
-                        if(fIsOut == 1 && (isr.getZdzName().trim().indexOf(fInParkName) != -1) && (Math.abs(isr.getZdsjT()-fInTime)<zcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<zcwcTime))){
+                        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;
                         }
@@ -716,7 +718,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
              *
              * 到达时间接近那个班次的进场/出场判定为这个班次
              */
-            if (fIsOut == 1 && fInTime != 0) {
+            if (fIsOut == 1 && fInStatus != 0 && fInTime != 0) {
                 /*if(prevSr == null || (Math.abs((sr.getZdsjT()- fInTime)) < Math.abs((prevSr.getZdsjT()- fInTime)))){
                     isMatch = true;
                     matchSr = sr;
@@ -733,10 +735,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 }
                 inTimeStr = fmtHHmm.print(fInTime);
             } else if (fIsOut == 2 && fOutTime != 0) {
-                if(nextSr == null && (sr.getQdzName().trim().indexOf(fInParkName) != -1) && (Math.abs((sr.getDfsjT()- fOutTime)) < Math.abs((nextSr.getDfsjT()- fOutTime)))){
+                if(nextSr == null && (sr.getQdzName().trim().indexOf(fOutParkName) != -1) && (Math.abs((sr.getDfsjT()- fOutTime)) < Math.abs((nextSr.getDfsjT()- fOutTime)))){
                     isMatch = true;
                     matchSr = sr;
-                } else if(nextSr.getQdzName().trim().indexOf(fInParkName) != -1){ // if(Math.abs((nextSr.getDfsjT())- fInTime) < 120)
+                } else if(nextSr.getQdzName().trim().indexOf(fOutParkName) != -1){ // if(Math.abs((nextSr.getDfsjT())- fInTime) < 120)
                     isMatch = true;
                     matchSr = nextSr;
                 }
@@ -774,15 +776,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 if(tagList.size() > 0){
                     tag = tagList.get(0);
                     tag.setfBusIdIn(fBusID);
-                    if(fIsOut==1){
-                        sql = "UPDATE bsth_c_s_sp_info_real_tag set `in` = ? ,in_time=?,in_time_str=?,f_bus_id_in=?,out_name=? WHERE real_id=?";
+                    if(fIsOut==1 && fInStatus != 0){
+                        sql = "UPDATE bsth_c_s_sp_info_real_tag set `in` = ? ,in_time=?,in_time_str=?,f_bus_id_in=?,in_name=? WHERE real_id=?";
                         jdbcTemplate.update(sql,1,fInTime,inTimeStr,fBusID,fInParkName,real_id);
                         tag.setIn(1);
                         tag.setfBusIdIn(fInTime.toString());
                         tag.setInTimeStr(inTimeStr);
                     } else if(fIsOut==2){
-                        sql = "UPDATE bsth_c_s_sp_info_real_tag set `out` =?,out_time=?,out_time_str=?,f_bus_id_out=?,in_name=? WHERE real_id=?";
-                        jdbcTemplate.update(sql,1,fOutTime,outTimeStr,fBusID,fInParkName,real_id);
+                        sql = "UPDATE bsth_c_s_sp_info_real_tag set `out` =?,out_time=?,out_time_str=?,f_bus_id_out=?,out_name=? WHERE real_id=?";
+                        jdbcTemplate.update(sql,1,fOutTime,outTimeStr,fBusID,fOutParkName,real_id);
                         tag.setOut(1);
                         tag.setOutTime(fOutTime);
                         tag.setOutTimeStr(outTimeStr);
@@ -794,7 +796,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     tag.setCarPlate(fPlateCode);
                     tag.setXlBm(lineCode);
                     tag.setScheduleDateStr(dateStr);
-                    if(fIsOut==1){
+                    if(fIsOut==1 && fInStatus != 0){
                         sql = "INSERT INTO bsth_c_s_sp_info_real_tag (real_id,`in`,in_time,in_time_str,cl_zbh,car_plate,f_bus_id_in,xl_bm,schedule_date_str,qdz_name,zdz_name,in_name)VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
                         jdbcTemplate.update(sql,real_id,1,fInTime,inTimeStr,matchSr.getClZbh(),fPlateCode,fBusID,lineCode,dateStr,matchSr.getQdzName(),matchSr.getZdzName(),fInParkName);
                         tag.setIn(1);
@@ -802,7 +804,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                         tag.setInTimeStr(inTimeStr);
                     } else if(fIsOut==2){
                         sql = "INSERT INTO bsth_c_s_sp_info_real_tag (real_id,`out`,out_time,out_time_str,cl_zbh,car_plate,f_bus_id_out,xl_bm,schedule_date_str,qdz_name,zdz_name,out_name)VALUES (?,?,?,?,?,?,?,?,?,?,?,?)";
-                        jdbcTemplate.update(sql,real_id,1,fOutTime,outTimeStr,matchSr.getClZbh(),fPlateCode,fBusID,lineCode,dateStr,matchSr.getQdzName(),matchSr.getZdzName(),fInParkName);
+                        jdbcTemplate.update(sql,real_id,1,fOutTime,outTimeStr,matchSr.getClZbh(),fPlateCode,fBusID,lineCode,dateStr,matchSr.getQdzName(),matchSr.getZdzName(),fOutParkName);
                         tag.setOut(1);
                         tag.setOutTime(fOutTime);
                         tag.setOutTimeStr(outTimeStr);
@@ -812,7 +814,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 // 进场班次，匹配的下一个班次中放实到字段内容
                 ScheduleRealInfo mNextSr = dayOfSchedule.next(matchSr);
-                if(fIsOut==1 && mNextSr != null){
+                if(fIsOut==1 && fInStatus != 0 && mNextSr != null){
                     ScheduleRealInfoTag tagNext = new ScheduleRealInfoTag();
                     Long nextId = mNextSr.getId();
 //                    int haveNext = jdbcTemplate.queryForObject("select count(*) from bsth_c_s_sp_info_real_tag where real_id = "+nextId,Integer.class);