Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

游瑞烽
2 parents f26deb0e 68598adc
Showing 23 changed files with 683 additions and 74 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/schedule/e_state_check/ScheduleStationCodeChecker.java
src/main/java/com/bsth/data/schedule/e_state_check/entity/SCodeInfo.java
src/main/java/com/bsth/data/schedule/e_state_check/thread/FixedCheckStationCodeThread.java
src/main/java/com/bsth/repository/calc/CalcWaybillRepository.java
src/main/java/com/bsth/service/calc/CalcToolService.java
src/main/java/com/bsth/service/calc/impl/CalcToolServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/tzrc.html
src/main/resources/static/real_control_v2/fragments/line_schedule/layout.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config.html
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
@@ -13,6 +13,7 @@ import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.safe_driv.SafeDrivDataLoadThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.auto_exec.AutoExecScanThread;
+import com.bsth.data.schedule.e_state_check.thread.FixedCheckStationCodeThread;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
@@ -82,6 +83,9 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     SafeDrivDataLoadThread safeDrivDataLoadThread;
+    @Autowired
+    FixedCheckStationCodeThread fixedCheckStationCodeThread;
+
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -128,8 +132,11 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 60, 4, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
         //sexec.scheduleWithFixedDelay(autoExecScanThread, 100, 50, TimeUnit.SECONDS);//班次自动执行
         //WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+
+        //sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 50, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         //实际排班延迟入库线程
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
@@ -155,6 +162,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
@@ -162,7 +170,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
         sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
-        sexec.scheduleWithFixedDelay(basicDataLoader, 2, 2, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
         sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
         DirectivePushQueue.start();//消息队列 -指令，系统下发的
         WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
@@ -5,6 +5,8 @@ import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.GpsOverspeed;
 import com.bsth.data.gpsdata_v2.handlers.overspeed.OverspeedProcess;
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
 import com.bsth.service.gps.GpsService;
 import com.bsth.service.gps.entity.GpsSpeed;
 import com.google.common.base.Splitter;
@@ -56,8 +58,13 @@ public class GpsController {
         //超速信息
         List<GpsOverspeed> overspeedList = overspeedProcess.findByLines(lineArray);
+
+        //班次站点检查信息
+        List<SCodeInfo> scis = ScheduleStationCodeChecker.findByLineIdx(lineArray);
+
         rs.put("gpsList", gpsList);
         rs.put("overspeedList", overspeedList);
+        rs.put("scis", scis);
         return rs;
     }
@@ -29,6 +29,11 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	@Autowired
 	DayOfSchedule dayOfSchedule;
+	@RequestMapping(value = "check_fgs_ascription", method = RequestMethod.POST)
+	public Map<String, Object> checkPCFgsAscription(@RequestParam Long schId,@RequestParam String jGh, String sGh,@RequestParam String nbbm){
+		return scheduleRealInfoService.checkPCFgsAscription(schId, jGh, sGh, nbbm);
+	}
+
 	@RequestMapping(value = "/lines")
 	public Map<String, Collection<ScheduleRealInfo>> findByLines(@RequestParam String lines) {
 		return scheduleRealInfoService.findByLines(lines);
@@ -36,6 +36,9 @@ public class BasicData {
     //车辆自编号和公司代码对照 （K: 车辆自编号 ，V：公司代码）
     public static Map<String, String> nbbm2CompanyCodeMap;
+
+    //车辆自编号和分公司代码对照 （K: 车辆自编号 ，V：公司代码_分公司代码）
+    public static Map<String, String> nbbm2FgsCompanyCodeMap;
     //车辆自编号和牌照号对照 （K: 车辆自编号 ，V：牌照号）
     public static Map<String, String> nbbmCompanyPlateMap;
@@ -141,6 +144,7 @@ public class BasicData {
          */
         public int loadAllData() {
             try {
+                logger.info("开始加载基础数据..，");
                 //设备信息
                 loadDeviceInfo();
                 //站点信息
@@ -154,6 +158,7 @@ public class BasicData {
                 //公司信息
                 loadBusinessInfo();
+                logger.info("load geo cache..，");
                 geoCacheData.loadData();
                 station2ParkBuffer.saveAll();
                 logger.info("加载基础数据成功！，");
@@ -189,6 +194,8 @@ public class BasicData {
             BiMap<String, String> deviceId2Nbbm = HashBiMap.create();
             //车辆和公司代码对照
             Map<String, String> nbbm2CompanyCode = new HashMap<>();
+            //车辆和分公司代码对照
+            Map<String, String> nbbm2FgsCompanyCode = new HashMap<>();
             //车辆自编号和拍照号对照
             Map<String, String> nbbmCompanyPlate = new HashMap<>();
@@ -199,11 +206,13 @@ public class BasicData {
                 car = carIterator.next();
                 deviceId2Nbbm.put(car.getEquipmentCode(), car.getInsideCode());
                 nbbm2CompanyCode.put(car.getInsideCode(), car.getBusinessCode());
+                nbbm2FgsCompanyCode.put(car.getInsideCode(), car.getBusinessCode() + "_" + car.getBrancheCompanyCode());
                 nbbmCompanyPlate.put(car.getInsideCode(), car.getCarPlate());
             }
             deviceId2NbbmMap = deviceId2Nbbm;
             nbbm2CompanyCodeMap = nbbm2CompanyCode;
+            nbbm2FgsCompanyCodeMap = nbbm2FgsCompanyCode;
             nbbmCompanyPlateMap =nbbmCompanyPlate;
         }
+package com.bsth.data.schedule.e_state_check;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.e_state_check.entity.SCodeInfo;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.google.common.collect.ArrayListMultimap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 检查班次站点编码和路由编码是否相符合
+ * Created by panzhao on 2018/4/2.
+ */
+@Component
+public class ScheduleStationCodeChecker {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    private static ArrayListMultimap<String, SCodeInfo> multimap;
+
+    static {
+        multimap = ArrayListMultimap.create();
+    }
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public static List<SCodeInfo> findByLineIdx(List<String> lineArray){
+        List<SCodeInfo> rs = new ArrayList<>();
+
+        for(String coed : lineArray){
+            rs.addAll(multimap.get(coed));
+        }
+        return rs;
+    }
+
+    public void checkAll() {
+        try {
+            logger.info("start....");
+            List<ScheduleRealInfo> all = new ArrayList(dayOfSchedule.findAll());
+
+            //按线路站点分组数据（上行）
+            Map<String, ScheduleRealInfo> ups = new HashMap<>();
+            //按线路站点分组数据（下行）
+            Map<String, ScheduleRealInfo> downs = new HashMap();
+
+            String key;
+            for (ScheduleRealInfo sch : all) {
+                if (sch.getBcType().equals("out")
+                        || sch.getBcType().equals("in"))
+                    continue;
+                key = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+                ups.put(key + sch.getQdzCode(), sch);
+                downs.put(key + sch.getZdzCode(), sch);
+            }
+
+            //获取全部实际的站点编码
+            Map<String, SCodeInfo> realMap = allRealCodeInfo();
+
+            List<SCodeInfo> rs = new ArrayList<>();
+            rs.addAll(checkCode(ups.values(), realMap, "qd"));
+            rs.addAll(checkCode(downs.values(), realMap, "zd"));
+
+            //按线路分组
+            ArrayListMultimap<String, SCodeInfo> mList = ArrayListMultimap.create();
+            for (SCodeInfo sci : rs) {
+                mList.put(sci.getLineCode(), sci);
+            }
+
+            multimap = mList;
+            logger.info("end....");
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+
+    private List<SCodeInfo> checkCode(Collection<ScheduleRealInfo> list, Map<String, SCodeInfo> realMap, String qdOrZd) {
+        List<SCodeInfo> rs = new ArrayList<>();
+        String k;
+        SCodeInfo sci;
+        for(ScheduleRealInfo sch : list){
+            k = sch.getXlBm() + "_" + sch.getXlDir() + "_";
+
+            sci = realMap.get(k + getName(sch, qdOrZd));//名称和编码都不存在
+            if(null == sci && !realMap.containsKey(k + getCode(sch, qdOrZd))){
+                sci = SCodeInfo.getInstance(sch, qdOrZd);
+                rs.add(sci);
+                continue;
+            }
+            else if(null != sci && !sci.getRealStationCode().equals(getCode(sch, qdOrZd))){//名称一致的站点，编码不一致
+                sci.setStationCode(getCode(sch, qdOrZd));
+                rs.add(sci);
+                continue;
+            }
+        }
+        return rs;
+    }
+
+    private String getName(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?sch.getQdzName():sch.getZdzName();
+    }
+
+    private String getCode(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?sch.getQdzCode():sch.getZdzCode();
+    }
+
+
+    private Map<String, SCodeInfo> allRealCodeInfo() {
+        String sql = "select line_code,directions as up_down,station_code as real_station_code,station_name from bsth_c_stationroute where line in (select id from bsth_c_line where destroy=0)";
+        List<SCodeInfo> realList = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(SCodeInfo.class));
+        Map<String, SCodeInfo> realMap = new HashMap<>();
+
+        for (SCodeInfo sci : realList) {
+            realMap.put(sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getStationName(), sci);
+            realMap.put(sci.getLineCode() + "_" + sci.getUpDown() + "_" + sci.getStationCode(), sci);
+        }
+
+        return realMap;
+    }
+}
+package com.bsth.data.schedule.e_state_check.entity;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+/**
+ * Created by panzhao on 2018/4/2.
+ */
+public class SCodeInfo {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int upDown;
+
+    /**
+     * 站点编码
+     */
+    private String stationCode;
+
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 实际站点编码
+     */
+    private String realStationCode;
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getRealStationCode() {
+        return realStationCode;
+    }
+
+    public void setRealStationCode(String realStationCode) {
+        this.realStationCode = realStationCode;
+    }
+
+    public static SCodeInfo getUpInstance(ScheduleRealInfo sch) {
+        SCodeInfo sci = new SCodeInfo();
+        sci.setLineCode(sch.getXlBm());
+        sci.setUpDown(Integer.parseInt(sch.getXlDir()));
+        sci.setStationName(sch.getQdzName());
+        sci.setStationCode(sch.getQdzCode());
+        return sci;
+    }
+
+    public static SCodeInfo geDownInstance(ScheduleRealInfo sch) {
+        SCodeInfo sci = new SCodeInfo();
+        sci.setLineCode(sch.getXlBm());
+        sci.setUpDown(Integer.parseInt(sch.getXlDir()));
+        sci.setStationName(sch.getZdzName());
+        sci.setStationCode(sch.getZdzCode());
+        return sci;
+    }
+
+    public static SCodeInfo getInstance(ScheduleRealInfo sch, String qdOrZd) {
+        return qdOrZd.equals("qd")?getUpInstance(sch):geDownInstance(sch);
+    }
+}
+package com.bsth.data.schedule.e_state_check.thread;
+
+import com.bsth.data.schedule.e_state_check.ScheduleStationCodeChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时检查班次站点编码线程
+ * Created by panzhao on 2018/4/2.
+ */
+@Component
+public class FixedCheckStationCodeThread extends Thread {
+
+    @Autowired
+    ScheduleStationCodeChecker scheduleStationCodeChecker;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try {
+            scheduleStationCodeChecker.checkAll();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
+}
@@ -49,4 +49,13 @@ public interface CalcWaybillRepository extends BaseRepository&lt;CalcWaybill, Integ
 	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1 and s.xlBm=?2")
 	List<ScheduleRealInfo> findAllSchedule(String schDate, String lineCode);
+	/**
+	 * 根据日期获取班次信息
+	 * @param schDate
+	 * @return
+	 */
+	@EntityGraph(value = "scheduleRealInfo_cTasks", type = EntityGraph.EntityGraphType.FETCH)
+	@Query("select DISTINCT s from ScheduleRealInfo s where s.scheduleDateStr=?1")
+	List<ScheduleRealInfo> findAllScheduleByDate(String schDate);
+	
 }
@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import com.bsth.entity.calc.CalcWaybill;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.sys.Interval;
 /**
@@ -11,6 +12,6 @@ import com.bsth.entity.sys.Interval;
  */
 public interface CalcToolService {
-	List<CalcWaybill> findAll(String date, String line, List<Map<String, Object>> xlList, List<Interval> djgList);
+	List<CalcWaybill> findAll(String date, String line, List<ScheduleRealInfo> list, List<Map<String, Object>> xlList, List<Interval> djgList);
 }
@@ -5,12 +5,11 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.swing.text.Keymap;
-
 import com.bsth.entity.calc.CalcInterval;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
@@ -53,26 +52,29 @@ public class CalcToolServiceImpl implements CalcToolService {
 	@Override
-    public List<CalcWaybill> findAll(String rq, String lineCode, List<Map<String, Object>> xlList, List<Interval> djgList) {
+    public List<CalcWaybill> findAll(String rq, String lineCode, List<ScheduleRealInfo> list, List<Map<String, Object>> xlList, List<Interval> djgList) {
     	List<CalcWaybill> listCal=new ArrayList<CalcWaybill>();
-        List<ScheduleRealInfo> list = clacRepository.findAllSchedule(rq,lineCode);
-        String sql ="select r.j_gh ,r.s_gh,r.cl_zbh,r.xl_bm, r.lp_name FROM"
-        		+ "  bsth_c_s_sp_info_real r  where  "
-        		+ " r.schedule_date_str='"+rq+"' and r.xl_bm = '"+lineCode+"'"
-        		+ " GROUP BY r.j_gh,r.s_gh,r.cl_zbh,r.xl_bm,r.lp_name ";
-
-		List<Map<String, String>> listMap = jdbcTemplate.query(sql, new RowMapper<Map<String, String>>() {
-			@Override
-			public Map<String, String> mapRow(ResultSet arg0, int arg1) throws SQLException {
-				Map<String, String> c = new HashMap<String,String>();
-				c.put("jGh", arg0.getString("j_gh"));
-				c.put("sGh", arg0.getString("s_gh")==null?"":arg0.getString("s_gh"));
-				c.put("clZbh", arg0.getString("cl_zbh"));
-				c.put("xlBm", arg0.getString("xl_bm"));
-				c.put("lpName", arg0.getString("lp_name"));
-				return c;
+		
+        List<Map<String, String>> listMap = new ArrayList<Map<String, String>>();
+		Set<String> tempSet = new HashSet<String>();
+		for(ScheduleRealInfo s : list){
+			String jGh = s.getjGh()!=null?s.getjGh().trim():"";
+			String sGh = s.getsGh()!=null?s.getsGh().trim():"";
+			String clZbh = s.getClZbh()!=null?s.getClZbh().trim():"";
+			String xlBm = s.getXlBm()!=null?s.getXlBm().trim():"";
+			String lpName = s.getLpName()!=null?s.getLpName().trim():"";
+			String key = jGh + sGh + clZbh + xlBm + lpName;
+			if(tempSet.add(key)){
+				Map<String, String> m = new HashMap<String, String>();
+				m.put("jGh", jGh);
+				m.put("sGh", sGh);
+				m.put("clZbh", clZbh);
+				m.put("xlBm", xlBm);
+				m.put("lpName", lpName);
+				listMap.add(m);
 			}
-		});
+		}
+		
         for (int i = 0; i < listMap.size(); i++) {
 			Map<String, String> m=listMap.get(i);
 			String jGh=m.get("jGh");
@@ -196,6 +198,7 @@ public class CalcToolServiceImpl implements CalcToolService {
     //list_ 全部班次  lists_执行了的班次（实到实发不为空）
     private List<CalcWaybill> cul(List<ScheduleRealInfo> list_,List<ScheduleRealInfo> list_s, List<Map<String, Object>> xlList, List<Interval> djgList){
     	List<CalcWaybill> list=new ArrayList<CalcWaybill>();
+    	List<CalcWaybill> list2=new ArrayList<CalcWaybill>();
     	if(list_.size()>0){
     		Date date=list_.get(0).getScheduleDate();
     		String dateStr=list_.get(0).getScheduleDateStr();
@@ -356,8 +359,28 @@ public class CalcToolServiceImpl implements CalcToolService {
 		    	t_.setDtbczgf(0);
 		    	t_.setDtbcwgf(0);
 		    	list.add(t_);
+		    	list2.add(t_);
 	    	}
     	}
+    	for(CalcWaybill c2 : list2){
+    		boolean flag = true;
+			String key2 = c2.getjGh() + c2.getsGh()==null?"":c2.getsGh().trim()
+					+ c2.getCl() + c2.getXl() + c2.getLp();
+    		for(CalcWaybill c : list){
+    			String key = c.getjGh() + c.getsGh()==null?"":c.getsGh().trim()
+    					+ c.getCl() + c.getXl() + c.getLp();
+    			if(key2.equals(key)){
+    				c.setSjyylc(Arith.add(c.getSjyylc(), c2.getSjyylc()));
+    				c.setSjfyylc(Arith.add(c.getSjfyylc(), c2.getSjfyylc()));
+    				c.setLjyylc(Arith.add(c.getLjyylc(), c2.getLjyylc()));
+    				c.setLjfyylc(Arith.add(c.getLjfyylc(), c2.getLjfyylc()));
+    				flag = false;
+    				break;
+    			}
+    		}
+    		if(flag)
+    			list.add(c2);
+    	}
     	return list;
     }
@@ -33,6 +33,7 @@ import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ReportUtils;
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;
@@ -80,7 +81,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		if(date == null || date.trim().length() == 0){
 			Date d = new Date();
-			d.setTime(d.getTime() - (2 * 1000 * 60 * 60 * 24));
+			d.setTime(d.getTime() - (4 * 1000 * 60 * 60 * 24));
 			date = sdf.format(d);
 		}
 		if(line == null || line.trim().length() == 0){
@@ -120,7 +121,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        	sql += " and xl_bm = '"+line+"'";
 //				sql += " where t.line_code = " + line;
 	        }
-	        sql += "group by xl_bm";
+	        sql += " group by xl_bm";
 			List<Map<String, Object>> listLineConfig = jdbcTemplate.query(sql,
 						new RowMapper<Map<String, Object>>(){
 					@Override
@@ -148,7 +149,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			Map<String, List<Map<String, Object>>> xlMap = new HashMap<String, List<Map<String, Object>>>();
 			for(Map<String, Object> m : xlList){
 				if(m.containsKey("line") && m.get("line").toString().trim().length() > 0){
-					String key = m.get("line").toString();
+					String key = m.get("line").toString().trim();
 					if(!xlMap.containsKey(key))
 						xlMap.put(key, new ArrayList<Map<String, Object>>());
 					xlMap.get(key).add(m);
@@ -166,7 +167,18 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					return m;
 			}});
+			Map<String, List<ScheduleRealInfo>> scheMap = new HashMap<String, List<ScheduleRealInfo>>();
+			List<ScheduleRealInfo> list = calcRepository.findAllScheduleByDate(date);
+			for(ScheduleRealInfo s : list){
+				String xlBm = s.getXlBm();
+				if(!scheMap.containsKey(xlBm)){
+					scheMap.put(xlBm, new ArrayList<ScheduleRealInfo>());
+				}
+				scheMap.get(xlBm).add(s);
+			}
+			
 			Set<String> lineSet = new HashSet<String>();
+			List<CalcWaybill> all = new ArrayList<CalcWaybill>();
 			for (int i = 0; i < listLineConfig.size(); i++) {
 				Map<String, Object> m =listLineConfig.get(i);
 				String lineCode=m.get("line_code").toString().trim();
@@ -179,13 +191,14 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 					tempList = xlMap.get(lineCode);
 				}
-				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, tempList, djgList);
+				if(!scheMap.containsKey(lineCode))
+					continue;
+				List<CalcWaybill> findAll = calcToolService.findAll(date, lineCode, scheMap.get(lineCode), tempList, djgList);
+				all.addAll(findAll);
-//				new BatchSaveUtils<CalcWaybill>().saveList2(findAll, CalcWaybill.class);
-
-//				if(xlMap.get(lineCode).size() == 0)
-				calcRepository.save(findAll);
 			}
+//			new BatchSaveUtils<CalcWaybill>().saveList2(all, CalcWaybill.class);
+			calcRepository.save(all);
 			newMap.put("status", ResponseCode.SUCCESS);
 		} catch (Exception e) {
@@ -405,7 +418,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	}
 	/**
-	 * @param rq 格式如：2018-03-22（留空""默认当前日期前一天）
+	 * @param rq 格式如：2018-03-22（留空""默认当前日期前两天）
 	 * @param line （留空""默认全部线路）
 	 */
 	@Transactional
@@ -419,7 +432,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 				Date dBefore = new Date();
 				Calendar calendar = Calendar.getInstance(); //得到日历
 				calendar.setTime(dNow);//把当前时间赋给日历
-				calendar.add(Calendar.DAY_OF_MONTH, -1);  //设置为前一天
+				calendar.add(Calendar.DAY_OF_MONTH, -2);  //设置为前一天
 				dBefore = calendar.getTime();   //得到前一天的时间
 				rq = sdf.format(dBefore);
 			} else {
@@ -527,11 +527,17 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			}
 			e.printStackTrace();
 		}finally{
-			//发送邮件
-			EmailBean mail = new EmailBean();
-			mail.setSubject("路单日志数据"+date);
-			mail.setContent(logSuccess+"<br/>成功数："+countSuccess+"<br/>" +logFailure+"<br/>失败数："+countFailure);
-			sendEmailController.sendMail(emailSendToAddress, mail);
+			try {
+				//发送邮件
+				EmailBean mail = new EmailBean();
+				mail.setSubject("路单日志数据"+date);
+				mail.setContent(logSuccess+"<br/>成功数："+countSuccess+"<br/>" +logFailure+"<br/>失败数："+countFailure);
+				sendEmailController.sendMail(emailSendToAddress, mail);
+				logger.info("setLD-sendMail:邮件发送成功！");
+			}catch (Exception e){
+				e.printStackTrace();
+				logger.error("setLD-sendMail:",e);
+			}
 		}
 		return result;
 	}
@@ -15,6 +15,8 @@ import java.util.Map;
 @Service
 public interface ScheduleRealInfoService extends BaseService<ScheduleRealInfo, Long>{
+	Map<String, Object> checkPCFgsAscription(Long schId, String jsy, String spy, String nbbm);
+
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
 	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType,String userId);
@@ -169,6 +169,85 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     /**
+     * 校验人车 和 班次的公司和分公司归属
+     * @param schId
+     * @param jsy
+     * @param spy
+     * @param nbbm
+     * @return
+     * -2 跨营运公司，校验不过
+     * -1 跨分公司，二次确认
+     * 1 校验通过
+     */
+    @Override
+    public Map<String, Object> checkPCFgsAscription(Long schId, String jGh, String sGh, String nbbm) {
+        Map<String, Object> rs = new HashMap<>();
+        try{
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("checkStatus", -2);
+
+            String msg = null;
+            ScheduleRealInfo sch = dayOfSchedule.get(schId);
+            String gsbm = sch.getGsBm(), fgsbm = sch.getFgsBm();
+
+            //校验运营公司
+            Personnel jsy = BasicData.perMap.get(gsbm + "-" + jGh);
+            if(null == jsy){
+                msg = "【驾驶员】:" + sch.getGsName() + "暂无工号为" + "【"+jGh+"】的人员";
+                rs.put("msg", msg);
+                return rs;
+            }
+            if(!carExist(gsbm, nbbm)){
+                msg = sch.getGsName() + "没有自编号为" + "["+nbbm+"]的车辆";
+                rs.put("msg", msg);
+                return rs;
+            }
+
+            Personnel spy = null;
+            if(StringUtils.isNotEmpty(sGh)){
+                spy = BasicData.perMap.get(gsbm + "-" + sGh);
+                if(null == spy){
+                    msg = "【售票员】: " + sch.getGsName() + "暂无工号为" + "【"+sGh+"】的人员";
+                    rs.put("msg", msg);
+                    return rs;
+                }
+            }
+
+
+            //校验分公司
+            if(null != jsy && !fgsbm.equals(jsy.getBrancheCompanyCode())){
+                msg = ("【驾驶员】:" + jGh + "/" + jsy.getPersonnelName() + "是" + jsy.getBrancheCompany() + "的人员");
+                rs.put("msg", msg);
+                rs.put("checkStatus", -1);
+                return rs;
+            }
+
+            if(StringUtils.isNotEmpty(sGh)){
+                if(null != spy && !fgsbm.equals(spy.getBrancheCompanyCode())){
+                    msg = ("【售票员】: " + jGh + "/" + spy.getPersonnelName() + "是" + spy.getBrancheCompany() + "的人员");
+                    rs.put("msg", msg);
+                    rs.put("checkStatus", -1);
+                    return rs;
+                }
+            }
+
+            if(!(gsbm + "_" + fgsbm).equals(BasicData.nbbm2FgsCompanyCodeMap.get(nbbm))){
+                msg = ("【" + nbbm + "】" + "是" + sch.getFgsName() + "的车辆！");
+                rs.put("msg", msg);
+                rs.put("checkStatus", -1);
+                return rs;
+            }
+
+            rs.put("checkStatus", 1);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+        return rs;
+    }
+
+
+    /**
      * 车辆是否存在
      * @param gsbm 公司编码
      * @param nbbm 车辆自编号
@@ -2062,4 +2062,18 @@ dl.active &gt; dd.disabled {
 .uk-tab>li.uk-active.destroy>a:hover{
     background: #fff !important;
+}
+
+.warn_multi_station{
+    font-size: 12px;
+    margin-left: 40px;
+    background: yellow;
+    color: #1c1c1c;
+    padding: 4px 10px;
+    cursor: pointer;
+    display: none;
+}
+
+.warn_multi_station:hover{
+    background: #f8f81e;
 }
 \ No newline at end of file
@@ -238,14 +238,17 @@
                         });
                     });
-                    gb_common.$post('/realSchedule/multi_tzrc', {
-                        cpcsJson: JSON.stringify(data)
-                    }, function (rs) {
-                        if (rs.ts && rs.ts.length > 0) {
-                            gb_schedule_table.updateSchedule(rs.ts);
-                            UIkit.modal(modal).hide();
-                            notify_succ('调整人车成功');
-                        }
+                    //提交之前做一次公司校验
+                    check_fgs_ascription(data[0], function () {
+                        gb_common.$post('/realSchedule/multi_tzrc', {
+                            cpcsJson: JSON.stringify(data)
+                        }, function (rs) {
+                            if (rs.ts && rs.ts.length > 0) {
+                                gb_schedule_table.updateSchedule(rs.ts);
+                                UIkit.modal(modal).hide();
+                                notify_succ('调整人车成功');
+                            }
+                        });
                     });
                     return false;
                 });
@@ -281,6 +284,34 @@
                 });
             });
+            function check_fgs_ascription(data, cb) {
+                var jGh = data.jsy.split('/')[0]
+                        ,sGh
+                        ,nbbm = data.clZbh;
+                if(data.spy)
+                    sGh = data.spy.split('/')[0];
+
+                gb_common.$post('/realSchedule/check_fgs_ascription',{
+                            schId: data.schId,
+                            jGh: jGh,
+                            sGh: sGh,
+                            nbbm: nbbm
+                        }
+                , function (rs) {
+                    $('form.tzrc_form [type=submit]', modal).removeAttr('disabled');
+                    if(rs['checkStatus']==1)
+                        cb && cb();
+                    else if (rs['checkStatus']==-2){
+                        UIkit.modal.alert('<p style="color: #ff4141;font-size: 15px;">'+rs.msg+'</p>', {labels: {Ok: '确定'}});
+                        return;
+                    }
+                    else if (rs['checkStatus']==-1){
+                        //二次确认
+                        alt_confirm('<p style="font-weight: 600;font-size: 15px;">'+rs.msg+'</p>', cb, '我确定要操作！', true);
+                    }
+                });
+            }
+
             function renderCell() {
                 var jsy = $('input[name=jsy]:enabled', modal).val();
                 var spy = $('input[name=spy]', modal).val();
@@ -42,4 +42,18 @@
             </div>
         </div>
     </script>
+
+    <script id="sch-table-m_station_error-temp" type="text/html">
+        <div class="tl-tip-panel">
+            <ul class="uk-list uk-list-line" style="margin-bottom: 0;">
+                {{each list as obj i}}
+                    {{if obj.realStationCode!=null}}
+                        <li>【{{obj.stationName}}】班次编码 <span style="color: red;">{{obj.stationCode}}</span> -实际：{{obj.realStationCode}}</li>
+                    {{else}}
+                        <li>【{{obj.stationName}}】班次编码 <span style="color: red;">{{obj.stationCode}}</span> -在当前线路站点中不存在</li>
+                    {{/if}}
+                {{/each}}
+            </ul>
+        </div>
+    </script>
 </div>
@@ -24,6 +24,7 @@
                     </div>
                 </div>
                 <i class="uk-icon-eye uk-icon-hover ct_eye_icon"></i>
+                <span class="warn_multi_station" data-updown="{{dir}}" data-code="{{line.lineCode}}"></span>
                 <div class="search_sch_panel">
                     <form class="uk-form" onsubmit="javascript:return false;">
                         <div class="uk-autocomplete sch-search-autocom">
@@ -94,7 +94,7 @@
             var loadConfigEntity = function () {
                 $.get('/real_control_v2/fragments/north/nav/line_config/line_config_entity.html', function (attrDom) {
                     $('.right-container #line_config_entity_panel', modal)
-                            .append(attrDom)
+                            .html(attrDom)
                             .find('#line_config_entity_wrap')
                             .trigger('init', {lineConfig: lineConfig});
                 });
@@ -104,7 +104,7 @@
             var loadBufferConfig = function () {
                 $.get('/real_control_v2/fragments/north/nav/line_config/buffer_config.html', function (attrDom) {
                     $('.right-container #buffer_config_panel', modal)
-                            .append(attrDom)
+                            .html(attrDom)
                             .find('#buffer_config_wrap')
                             .trigger('init', {lineConfig: lineConfig});
                 });
@@ -114,18 +114,19 @@
             <span>停车场</span>
             <select class="z-depth-input" name="twinsPark">
                 {{each parks as p i}}
-                <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
+                <option value="{{p.code}}" {{if p.code==cPark}}selected{{/if}}>{{p.name}}</option>
                 {{/each}}
             </select>
             <span>&nbsp;既是站点</span>
             <select class="z-depth-input" name="twinsStation">
                 {{each routes as r i}}
-                <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
+                <option value="{{r.stationCode}}" {{if r.stationCode==cStation}}selected{{/if}}>{{r.stationName}}
                 </option>
                 {{/each}}
             </select>
-
-
+            {{if index>0}}
+                <a class="uk-close uk-close-alt"></a>
+            {{/if}}
         </div>
     </script>
@@ -134,16 +135,17 @@
             <span>停车场</span>
             <select class="z-depth-input" name="twinsPark">
                 {{each parks as p i}}
-                <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
+                <option value="{{p.code}}" {{if p.code==cPark}}selected{{/if}}>{{p.name}}</option>
                 {{/each}}
             </select>
             <span>&nbsp;既是站点</span>
             <select class="z-depth-input" name="twinsStation">
                 {{each routes as r i}}
-                <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
+                <option value="{{r.stationCode}}" {{if r.stationCode==cStation}}selected{{/if}}>{{r.stationName}}
                 </option>
                 {{/each}}
             </select>
+            <a class="uk-close uk-close-alt"></a>
         </div>
     </script>
     <script>
@@ -196,6 +198,10 @@
                     for (var code in rs) {
                         parks.push({code: code, name: rs[code]});
                     }
+
+                    parks.sort(function (a, b) {
+                        return $.trim(a.name).localeCompare($.trim(b.name), 'zh-CN');
+                    });
                     renderPSDom();
                 });
                 //上行站点路由
@@ -221,14 +227,28 @@
             });
             function changeTwinsParkAndStation() {
-                var park = $('select[name=twinsPark]', wrap).val();
-                var station = $('select[name=twinsStation]', wrap).val();
+                var parks='',stations=''
+                        ,$panel = $('.park-and-station-wrap', wrap);
+
+                $('select[name=twinsPark]', $panel).each(function () {
+                    parks += ($(this).val() + ',');
+                });
+
+                $('select[name=twinsStation]', $panel).each(function () {
+                    stations += ($(this).val() + ',');
+                });
+
+                if(parks.length > 0)
+                    parks = parks.substr(0, parks.length - 1);
+                if(stations.length > 0)
+                    stations = stations.substr(0, stations.length - 1);
+
                 gb_common.$post('/lineConfig/parkAndStationSet', {
                     lineCode: conf.line.lineCode,
-                    twinsPark: park,
-                    twinsStation: station
+                    twinsPark: parks,
+                    twinsStation: stations
                 }, function (rs) {
-                    notify_succ('设置成功！！');
+                    notify_succ('已保存！！');
                     conf = rs.conf;
                 });
             }
@@ -261,10 +281,15 @@
                 var data = {lineCode: lineCode, type: type, parkCode: '', stationCode: ''};
                 //出站既是出场
                 if (type == 2) {
-                    //默认关联 线路标准停车场
-                    data.parkCode = gb_data_basic.getLineInformation(lineCode).carPark;
-                    //和上行起点站
-                    data.stationCode = upStationRoutes[0].stationCode;
+                    //如果配置上有信息
+                    if(conf.twinsParks){
+                        data.parkCode = conf.twinsParks;
+                        data.stationCode = conf.twinsStations;
+                    }
+                    else{
+                        data.parkCode = gb_data_basic.getLineInformation(lineCode).carPark;//默认关联 线路标准停车场
+                        data.stationCode = upStationRoutes[0].stationCode;//和上行起点站
+                    }
                 }
                 gb_common.$post('/lineConfig/editOutTimeType', data, function (rs) {
                     notify_succ('调整出场时间类型成功！');
@@ -292,22 +317,36 @@
              * 渲染场既是站dom
              */
             function renderPSDom() {
+                $('.c_2_s_list', $panel).html('');
+                var pArray = conf.twinsParks.split(','),
+                        cArray = conf.twinsStations.split(',');
                 var htmlStr = '',
                         $panel = $('.park-and-station-wrap', wrap);
-                if (conf['outConfig'] == 2) {
+
+                if(conf['outConfig']!=2){
+                    $panel.hide().find('.c_2_s_list').empty();
+                    return;
+                }
+
+                if(!conf.twinsParks)
+                    return;
+
+                for(var i=0,len=pArray.length; i<len; i++){
                     htmlStr = template('park-and-station-temp', {
                         parks: parks,
                         conf: conf,
+                        cPark: pArray[i],
+                        cStation: cArray[i],
+                        index: i,
                         routes: [upStationRoutes[0], upStationRoutes[upStationRoutes.length - 1]]
                     });
-                    $panel.show().find('.c_2_s_list').html(htmlStr);
+                    $('.c_2_s_list', $panel).append(htmlStr);
                 }
-                else
-                    $panel.hide().find('.c_2_s_list').empty();
+                $panel.show();
                 //切换场既是站的，停车场和站点
-                $('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
-                $('select[name=twinsStation]', wrap).on('change', changeTwinsParkAndStation);
+                //$('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
+                //$('select[name=twinsStation]', wrap).on('change', changeTwinsParkAndStation);
             }
             /**
@@ -352,20 +391,35 @@
              */
             $(wrap).on('click', '.add_btn_span', function () {
                 var htmlStr = '',
-                        $panel = $('.park-and-station-2-wrap', wrap);
+                        $panel = $('.park-and-station-wrap', wrap);
+
+                var $lastItem = $('.c_2_s_list>.item:last', $panel)
+                        ,lastTcc = $('select[name=twinsPark]', $lastItem).val()
+                        ,lastStation = $('select[name=twinsStation]', $lastItem).val();
+
                 if (conf['outConfig'] == 2) {
-                    htmlStr = template('park-and-station-temp', {
+                    htmlStr = template('park-and-station-2-temp', {
                         parks: parks,
                         conf: conf,
+                        cPark: lastTcc,
+                        cStation: lastStation,
                         routes: [upStationRoutes[0], upStationRoutes[upStationRoutes.length - 1]]
                     });
                     $('.c_2_s_list', $panel).append(htmlStr);
                 }
+            });
-                //切换场既是站的，停车场和站点
-                //$('select[name=twinsPark]', wrap).on('change', changeTwinsParkAndStation);
-                //$('select[name=twinsStation]', wrap).on('change', changeTwinsParkAndStation);
+            /**
+             * 删除  场既是站 项目
+             */
+            $(wrap).on('click', '.c_2_s_list .item .uk-close', function () {
+                $(this).parents('.item').remove();
+                changeTwinsParkAndStation();
             });
+
+
+            $(wrap).on('change', 'select[name=twinsPark]', changeTwinsParkAndStation);
+            $(wrap).on('change', 'select[name=twinsStation]', changeTwinsParkAndStation);
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -72,6 +72,10 @@ var gb_data_gps = (function () {
             cb(addArr, upArr, upDownChange, rs.overspeedList);
         });
+        //班次站点编码检查信息
+        if(rs['scis'] && rs['scis'].length > 0)
+            gb_schedule_table.putSCodeErrorInfo(rs['scis']);
+
         //超速数据回调
         //console.log('超速,,,', rs.overspeedList);
@@ -52,6 +52,44 @@ var gb_line_layout = (function() {
         });
     });
+    //站点编码不符 tootip
+    $(document).on('mouseenter', '.schedule-wrap .header-title span.warn_multi_station', function() {
+        $(this).qtip({
+            show: {
+                ready: true,
+                delay: 300
+            },
+            content: {
+                text: function() {
+                    var lineCode = $(this).data('code')
+                        ,updown = $(this).data('updown')
+                        ,list = gb_schedule_table.findSCodeErrorInfo(lineCode, updown);
+                    //console.log('this', this);
+                    //var data = gb_schedule_table.findSCodeErrorInfo();
+                    return temps['sch-table-m_station_error-temp']({list: list});
+                }
+            },
+            position: {
+                viewport: $(window),
+                my: 'top left',
+                at: 'bottom center'
+            },
+            style: {
+                classes: 'qtip-rounded qtip-shadow sch-tl-tip'
+            },
+            hide: {
+                fixed: true,
+                delay: 300
+            },
+            events: {
+                hidden: function(event, api) {
+                    //destroy dom
+                    $(this).qtip('destroy', true);
+                }
+            }
+        });
+    });
+
     return {
         layout: layout
     };
@@ -7,6 +7,8 @@ var gb_schedule_table = (function () {
     var line2Schedule = {};
     //车辆应发未发车辆数
     var car_yfwf_map = {};
+    //班次站点编码和实际不符数据
+    var errorCodeData = {};
     var bcTypeOrderMap = {
         'out':0,
@@ -812,6 +814,38 @@ var gb_schedule_table = (function () {
             console.log(e);
         }
     };
+
+    /**
+     * 班次站点编码异常信息
+     * @param list
+     */
+    var putSCodeErrorInfo = function (list) {
+        //按线路走向分组
+        var data = {};
+        var k;
+        for(var i=0,obj;obj=list[i++];){
+            k = obj.lineCode+'_'+obj.upDown;
+            if(!data[k])
+                data[k] = [];
+            data[k].push(obj);
+        }
+
+        var wrap;
+        for(var k in data){
+            wrap = $('.line_schedule[data-id=' + (k.split('_')[0]) + ']');
+            if(wrap.length==0)
+                continue;
+
+            $('.schedule-wrap span.warn_multi_station', wrap)
+                .html('班次站点编码与实际不符！！！').show();
+        }
+
+        errorCodeData = data;
+    };
+
+    var findSCodeErrorInfo = function (lineCode, upDown) {
+        return errorCodeData[lineCode+'_'+upDown];
+    };
     return {
         show: show,
@@ -837,6 +871,8 @@ var gb_schedule_table = (function () {
         getNextNormalSch: getNextNormalSch,
         findNbbmByLineCode:findNbbmByLineCode,
         showLpMileageTipBySch: showLpMileageTipBySch,
-        renderCarRemark: renderCarRemark
+        renderCarRemark: renderCarRemark,
+        putSCodeErrorInfo: putSCodeErrorInfo,
+        findSCodeErrorInfo: findSCodeErrorInfo
     };
 })();