站点道闸更新

游瑞烽
1 parent d60383a8
Showing 3 changed files with 129 additions and 19 deletions
src/main/java/com/bsth/controller/directive/UpstreamEntrance.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -6,9 +6,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.fastjson.JSON;
@@ -100,7 +102,8 @@ public class UpstreamEntrance {
 	}
 	@RequestMapping(value = "/stationSigno", method = RequestMethod.POST)
-	public Map<String, Object> stationSigno(@RequestParam Map<String, Object> map) {
+	@ResponseBody
+	public Map<String, Object> stationSigno(@RequestBody Map<String, Object> map) {
 		return directiveService.stationSigno(map);
 	}
 	@RequestMapping(value = "/tagByLines", method = RequestMethod.GET)
@@ -599,6 +599,7 @@ 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);
+
 //            String fInPlate = map.get("fInPlate")==null?"":map.get("fInPlate").toString();
 //            String fInStatus = map.get("fInStatus")==null?"":map.get("fInStatus").toString();
 //            String fOutStatus = map.get("fOutStatus")==null?"":map.get("fOutStatus").toString();
@@ -624,32 +625,79 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                 }
             }
-            ScheduleRealInfo sr = dayOfSchedule.executeCurr(basicData.plateCompanyNbbmMap.get(fPlateCode));
-            if(sr==null){
-                List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(basicData.plateCompanyNbbmMap.get(fPlateCode));
-                int size = list.size();
-
-                // 班次完成10分钟内上传道闸消息，可以标记
-                Long time = 10*60*1000L;
+            String carPlate  = basicData.plateCompanyNbbmMap.get(fPlateCode);
+            if(StringUtils.isEmpty(carPlate)){
+                rs.put("code",-1);
+                rs.put("message","失败");
+                rs.put("info","车牌号不在调度系统中");
+                return rs;
+            }
+            // 是否为补传数据
+            boolean isbc = false;
+            Long date = new Date().getTime();
+            Long timeT = 0l;
+            if (fIsOut == 1 && fInTime != 0) {
+                timeT = fInTime;
+            } else if (fIsOut == 2 && fOutTime != 0) {
+                timeT = fOutTime;
+            }
+            ScheduleRealInfo sr = null;
+            List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(carPlate);
+            int size = list.size();
+
+            // bcwcTime 补传误差允许时间，zcwcTime 正常误差允许时间
+            Long bcwcTime = 5*60*1000l;
+            Long zcwcTime = 3*60*1000l;
+            List<Map<String,Object>> timeL = jdbcTemplate.queryForList("select bcwc_time,zcwc_time from bsth_tag_time");
+            if(timeL.size() > 0){
+                bcwcTime = Long.parseLong(timeL.get(0).get("bcwc_time").toString());
+                zcwcTime = Long.parseLong(timeL.get(0).get("zcwc_time").toString());
+            }
+            // 大于当前时间5分钟为补传数据
+            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 && Math.abs(isr.getFcsjT()-fOutTime)<time){
-                        time = Math.abs(isr.getFcsjT()-fOutTime);
+                    if(fIsOut == 2 && (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 && Math.abs(isr.getZdsjT()-fInTime)<time){
-                        time = Math.abs(isr.getZdsjT()-fInTime);
+                    if(fIsOut == 1 && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){
+                        bcwcTime = Math.abs(isr.getZdsjT()-fInTime);
                         sr = isr;
                     }
                 }
                 if(sr==null){
-                    rs.put("code",-1);
-                    rs.put("message","失败");
-                    rs.put("info","未找到车辆对应班次");
+                    rs.put("code",0);
+                    rs.put("message","成功");
+                    rs.put("info","补传成功，但未找到车辆对应班次");
                     return rs;
                 }
+            } else {
+                sr = dayOfSchedule.executeCurr(carPlate);
+                if(sr==null){
+                    // 班次完成3分钟内上传道闸消息，可以标记
+                    for (int i = 0; i < size; i++) {
+                        ScheduleRealInfo isr = list.get(i);
+                        if (list.get(i).isDestroy())
+                            continue;
+                        if(fIsOut == 2 && (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 && (Math.abs(isr.getZdsjT()-fInTime)<bcwcTime || (isr.getZdsjActualTime() != null && Math.abs(isr.getZdsjActualTime()-fOutTime)<bcwcTime))){
+                            bcwcTime = Math.abs(isr.getZdsjT()-fInTime);
+                            sr = isr;
+                        }
+                    }
+                    if(sr==null){
+                        rs.put("code",-1);
+                        rs.put("message","失败");
+                        rs.put("info","未找到车辆对应班次");
+                        return rs;
+                    }
+                }
             }
             ScheduleRealInfo prevSr = dayOfSchedule.prev(sr);
             ScheduleRealInfo nextSr = dayOfSchedule.next(sr);
@@ -666,7 +714,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
              * 到达时间接近那个班次的进场/出场判定为这个班次
              */
             if (fIsOut == 1 && fInTime != 0) {
-                if(prevSr == null || (Math.abs((sr.getDfsjT()- fInTime)) < Math.abs((prevSr.getDfsjT()- fInTime)))){
+                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)
@@ -802,6 +850,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     sendUtils.stationSigno(tagNext);
                 }
+//                System.out.println("stationSigno----"+map);
+                System.out.println("stationSigno-info---:fPlateCode"+fPlateCode+",fBusID"+fBusID+",fOutTime"+fOutTime+",fIsOut"+fIsOut+",fInTime"+fInTime);
                 rs.put("code",0);
                 rs.put("message","成功");
                 return rs;
@@ -824,9 +874,14 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     public List<ScheduleRealInfoTag> tagByLines(String lines) {
         List<ScheduleRealInfoTag> list  = new ArrayList<>();
         List<String> lineList = Lists.newArrayList(Splitter.on(',').trimResults().omitEmptyStrings().split(lines));
+        String line = "";
+        for (String l:lineList) {
+            line += "'"+l+"',";
+        }
+        line = line.substring(0,line.length()-1);
         String day = DayOfSchedule.currSchDateMap.get(lineList.get(0));
         try{
-            list = jdbcTemplate.query("select * from bsth_c_s_sp_info_real_tag where xl_bm in (?) and schedule_date_str = ? ", new RowMapper<ScheduleRealInfoTag>() {
+            list = jdbcTemplate.query("select * from bsth_c_s_sp_info_real_tag where xl_bm in ("+line+") and schedule_date_str = '"+day+"'", new RowMapper<ScheduleRealInfoTag>() {
                 @Override
                 public ScheduleRealInfoTag mapRow(ResultSet resultSet, int i) throws SQLException {
                     ScheduleRealInfoTag srt = new ScheduleRealInfoTag();
@@ -848,7 +903,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
                     srt.setScheduleDateStr(resultSet.getString("schedule_date_str"));
                     return srt;
                 }
-            }, lines, day);
+            });
         }catch (Exception e){
             logger.error(e.toString(),e);
             return null;
@@ -219,10 +219,32 @@ var gb_schedule_table = (function () {
     var insertSchedule = function (sch, upArr) {
         var xls = {};
         xls[sch.xlBm] = 1;
+
+        // 道闸标记
+        var tag = line2Schedule[sch.xlBm][sch.id];
+        if(tag.sd_tag == 1){
+            sch.sd_tag = sch.sd_tag;
+            sch.sd_time = sch.sd_time;
+        }
+        if(tag.sf_tag == 1){
+            sch.sf_tag = sch.sf_tag;
+            sch.sf_time = sch.sf_time;
+        }
         line2Schedule[sch.xlBm][sch.id] = sch;
         //update
         if (isArray(upArr)) {
             $.each(upArr, function () {
+
+                // 道闸标记
+                var sch = line2Schedule[this.xlBm][this.id];
+                if(sch.sd_tag == 1){
+                    this.sd_tag = sch.sd_tag;
+                    this.sd_time = sch.sd_time;
+                }
+                if(sch.sf_tag == 1){
+                    this.sf_tag = sch.sf_tag;
+                    this.sf_time = sch.sf_time;
+                }
                 line2Schedule[this.xlBm][this.id] = this;
                 xls[this.xlBm] = 1;
             });
@@ -342,7 +364,6 @@ var gb_schedule_table = (function () {
      * @param schArr
      */
     var updateSchedule = function (schArr) {
-
         if (!isArray(schArr))
             schArr = [schArr];
@@ -353,6 +374,16 @@ var gb_schedule_table = (function () {
                     clearActualTime(this);
                 //子任务公里是否与计划平
                 this.c_t_mileage_status = calcCTaskMileageStatus(this);
+                // 道闸标记
+                var sch = line2Schedule[this.xlBm][this.id];
+                if(sch.sd_tag == 1){
+                    this.sd_tag = sch.sd_tag;
+                    this.sd_time = sch.sd_time;
+                }
+                if(sch.sf_tag == 1){
+                    this.sf_tag = sch.sf_tag;
+                    this.sf_time = sch.sf_time;
+                }
                 line2Schedule[this.xlBm][this.id] = this;
                 updateDom(this);
             }catch(e){}
@@ -397,6 +428,17 @@ var gb_schedule_table = (function () {
         $.each(schArr, function () {
             if(this.status==-1)
                 clearActualTime(this);
+
+            // 道闸标记
+            var sch = line2Schedule[this.xlBm][this.id];
+            if(sch.sd_tag == 1){
+                this.sd_tag = sch.sd_tag;
+                this.sd_time = sch.sd_time;
+            }
+            if(sch.sf_tag == 1){
+                this.sf_tag = sch.sf_tag;
+                this.sf_time = sch.sf_time;
+            }
             line2Schedule[this.xlBm][this.id] = this;
         });
     };
@@ -834,6 +876,16 @@ var gb_schedule_table = (function () {
             gb_common.$post('/realSchedule/addRemarks', {id: sch.id, remarks: remarks}, function (rs) {
                 if(rs.t){
                     sch = rs.t;
+                    // 道闸标记
+                    var tag = line2Schedule[sch.xlBm][sch.id];
+                    if(tag.sd_tag == 1){
+                        sch.sd_tag = tag.sd_tag;
+                        sch.sd_time = tag.sd_time;
+                    }
+                    if(tag.sf_tag == 1){
+                        sch.sf_tag = tag.sf_tag;
+                        sch.sf_time = tag.sf_time;
+                    }
                     line2Schedule[sch.xlBm][sch.id] = sch;
                     updateDom(sch);
                     i++;