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

娄高锋
2 parents 55929802 01d68b3d
Showing 32 changed files with 685 additions and 78 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/BasicDataController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/schedule/core/SchedulePlanController.java
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/AbnormalStateHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/gpsdata/thread/OfflineMonitorThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoService.java
src/main/java/com/bsth/service/schedule/SchedulePlanInfoServiceImpl.java
@@ -251,7 +251,7 @@
                 <groupId>org.drools</groupId>
                 <artifactId>drools-bom</artifactId>
                 <type>pom</type>
-                <version>6.2.0.Final</version>
+                <version>6.3.0.Final</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>
@@ -22,6 +22,9 @@ public class BasicDataController {
 	@Autowired
 	BasicData.BasicDataLoader dataLoader;
+	@Autowired
+	BasicData basicData;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@RequestMapping("/cars")
@@ -114,4 +117,13 @@ public class BasicDataController {
 		}
 		return rs;
 	}
+
+	/**
+	 * 车辆自编号和车牌号对照
+	 * @return
+	 */
+	@RequestMapping("/nbbm2PlateNo")
+	public Map<String, String> nbbm2PlateNo(){
+		return basicData.getNbbm2PlateNo();
+	}
 }
@@ -7,6 +7,7 @@ import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.joda.time.format.DateTimeFormat;
@@ -439,5 +440,13 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> exportWaybillMore(@RequestParam Map<String, Object> map){
 		return scheduleRealInfoService.exportWaybillMore(map);
 	}
-	
+
+	/**
+	 * 获取当日计划排班 ， 从计划表抓取数据
+	 * @return
+	 */
+	@RequestMapping(value = "currSchedulePlanByLineCode", method = RequestMethod.GET)
+	public List<SchedulePlanInfo> currentSchedulePlan(@RequestParam String lineCode){
+		return scheduleRealInfoService.currentSchedulePlan(lineCode);
+	}
 }
 package com.bsth.controller.schedule.core;
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
 import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.sys.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpSession;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * Created by xu on 16/6/16.
@@ -16,6 +25,33 @@ import org.springframework.web.bind.annotation.RestController;
 public class SchedulePlanController extends BController<SchedulePlan, Long> {
     @Autowired
     private SchedulePlanService schedulePlanService;
+    @Autowired
+    private SysUserService sysUserService;
+
+    @Override
+    public Map<String, Object> save(@RequestBody SchedulePlan schedulePlan, HttpSession httpSession) {
+        // 用户信息
+        String userName = String.valueOf(httpSession.getAttribute(Constants.SESSION_USERNAME));
+        SysUser sysUser = sysUserService.findByUserName(userName);
+
+        Date cdate = new Date();
+        schedulePlan.setCreateBy(sysUser);
+        schedulePlan.setCreateDate(cdate);
+        schedulePlan.setUpdateBy(sysUser);
+        schedulePlan.setUpdateDate(cdate);
+
+        // 如果多个公司，选第一个，以后改成页面控制
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) httpSession.getAttribute(Constants.COMPANY_AUTHORITYS);
+        if (cmyAuths == null || cmyAuths.size() == 0)
+            schedulePlanService.save(schedulePlan, new CompanyAuthority());
+        else
+            schedulePlanService.save(schedulePlan, cmyAuths.get(0));
+
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", new Object());
+        return rtn;
+    }
     /**
      * 获取明天的一歌排班计划。
@@ -31,4 +67,24 @@ public class SchedulePlanController extends BController&lt;SchedulePlan, Long&gt; {
         }
     }
+    /**
+     * 创建指定线路，指定时间范围内的排班计划，使用的时刻表情况
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @param to 结束时间
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/valttinfo/{xlid}/{from}/{to}", method = RequestMethod.GET)
+    public Map<String, Object> validateTTInfo(
+            @PathVariable(value = "xlid") Integer xlid,
+            @PathVariable(value = "from") Date from,
+            @PathVariable(value = "to") Date to
+    ) throws Exception {
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("status", ResponseCode.SUCCESS);
+        rtn.put("data", schedulePlanService.validateTTInfo(xlid, from, to));
+        return rtn;
+    }
+
 }
@@ -13,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.util.*;
@@ -89,6 +90,18 @@ public class BasicData implements CommandLineRunner {
         return name != null? name: stationCode2NameMap.get(prefix + code);
     }
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    public Map<String, String> getNbbm2PlateNo(){
+        List<Map<String, Object>> list = jdbcTemplate.queryForList("select CAR_CODE,CAR_PLATE from bsth_c_cars where CAR_CODE is not null and CAR_PLATE is not null");
+
+        Map<String, String> rs = new HashMap<>();
+        for(Map<String, Object> map : list){
+            rs.put(map.get("CAR_CODE").toString(), map.get("CAR_PLATE").toString());
+        }
+        return rs;
+    }
+
     @Component
     public static class BasicDataLoader extends Thread {
@@ -3,6 +3,7 @@ package com.bsth.data.gpsdata;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.gpsdata.thread.GpsDataLoaderThread;
+import com.bsth.data.gpsdata.thread.OfflineMonitorThread;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.google.common.collect.TreeMultimap;
@@ -35,6 +36,9 @@ public class GpsRealData implements CommandLineRunner {
     GpsDataLoaderThread gpsDataLoader;
     @Autowired
+    OfflineMonitorThread offlineMonitorThread;
+
+    @Autowired
     DayOfSchedule dayOfSchedule;
     @Autowired
@@ -52,11 +56,12 @@ public class GpsRealData implements CommandLineRunner {
     public void run(String... arg0) throws Exception {
         logger.info("gpsDataLoader,20,5");
         //定时从网关获取GPS数据
-        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 15, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
         //定时扫描掉离线
-
+        //Application.mainServices.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
     }
+
     public void put(GpsEntity gps) {
         String device = gps.getDeviceId();
         GpsEntity old = gpsMap.get(device);
@@ -19,10 +19,22 @@ public abstract class SignalHandle {
         return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
     }
-    protected boolean isDriftSignal(GpsEntity gps) {
+/*    protected boolean isDriftSignal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }*/
+
+    /**
+     * gps掉线
+     * @param gps
+     * @return
+     */
+    protected boolean isGpsOffline(GpsEntity gps){
         return gps.getLat() == 0 || gps.getLon() == 0;
     }
+    protected boolean isOffline(GpsEntity gps){
+        return gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline");
+    }
     /**
      * 是不是异常信号
      *
@@ -34,7 +46,7 @@ public abstract class SignalHandle {
     /**
      * 连续异常信号个数统计
      *
-     * @param prevs
+     * @param
      * @return protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
      * int count = 0;
      * <p>
@@ -78,9 +90,9 @@ public abstract class SignalHandle {
             return false;
         GpsEntity prev = prevs.getTail();
-        //从漂移状态恢复
-        if (isDriftSignal(prev)
-                && !isDriftSignal(gps)) {
+        //从异常状态恢复
+        if (isGpsOffline(prev)
+                && !isGpsOffline(gps)) {
             return true;
         }
@@ -30,6 +30,9 @@ public class AbnormalStateHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if(isOffline(gps))
+            return false;
+
         if(overspeed(gps))
             return true;
@@ -46,10 +46,13 @@ public class InOutStationSignalHandle extends SignalHandle{
     private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+    //最大的班次时间差，防止异常的GPS时间打乱数据
+    private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
+
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //忽略漂移信号
-        if(isDriftSignal(gps))
+        //忽略掉线信号
+        if(isGpsOffline(gps))
             return false;
         //从异常状态恢复的第一个信号
@@ -106,8 +109,14 @@ public class InOutStationSignalHandle extends SignalHandle{
         ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
         String qdzCode = sch.getQdzCode();
+        int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
+
         //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && sch.getDfsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+            return;
+
+        //正常班次最大时间差
+        if(Math.abs(diff) > MAX_NORMAL_DIFF)
             return;
         //起点发车
@@ -169,8 +178,13 @@ public class InOutStationSignalHandle extends SignalHandle{
         if(gps.getStopNo().equals(sch.getZdzCode())){
+            int diff = (int) (sch.getZdsjT() - gps.getTimestamp());
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && sch.getZdsjT() - gps.getTimestamp() > MAX_BEFORE_TIME)
+            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+                return;
+
+            //正常班次最大时间差
+            if(Math.abs(diff) > MAX_NORMAL_DIFF)
                 return;
             //实达时间不覆盖
@@ -195,7 +209,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 //进站既进场
                 inStationAndInPark(sch, next);
                 //将gps转换为下一个班次走向的站内信号
-                transformUpdown(gps, sch);
+                transformUpdown(gps, next);
             }
         }
         else if(sch.getFcsjActual() == null){
@@ -217,6 +231,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             sendUtils.refreshSch(next);
             dayOfSchedule.save(next);
+
+            //分班的时候，需要再跳过1个班次
+            next = dayOfSchedule.next(next);
+            if(next != null)
+                dayOfSchedule.addExecPlan(next);
         }
     }
@@ -21,9 +21,10 @@ public class OfflineSignalHandle extends SignalHandle{
     @Override
     public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
-        //漂移信号不管
-        if(isDriftSignal(gps)){
+        //掉线信号不管
+        if(isGpsOffline(gps)){
             gps.setSignalState("drift");
+            gps.setAbnormalStatus("gps-offline");
             return true;
         }
@@ -88,6 +88,7 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 GpsEntity old;
                 for (GpsEntity gps : list) {
+
                     //没有设备号
                     if (StringUtils.isBlank(gps.getDeviceId()))
                         continue;
@@ -2,7 +2,11 @@ package com.bsth.data.gpsdata.thread;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.GpsRealData;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 import java.util.Collection;
@@ -10,35 +14,45 @@ import java.util.Collection;
  * GPS掉离线监控
  * Created by panzhao on 2017/1/11.
  */
+@Component
 public class OfflineMonitorThread extends Thread{
     @Autowired
     GpsRealData gpsRealData;
-    //有任务时 掉线阈值
-    private final static int LOSE_TIME = 1000 * 60 * 2;
+    //掉线阈值
+    private final static int LOSE_TIME = 1000 * 60 * 10;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SendUtils sendUtils;
     //无任务时 离线阈值
-    private final static int OFFLINE_TIME = 1000 * 60 * 10;
+    //private final static int OFFLINE_TIME = 1000 * 60 * 10;
     @Override
     public void run() {
-        long t = System.currentTimeMillis();
-        Collection<GpsEntity> list = gpsRealData.all();
-
-        String state;
-        for(GpsEntity gps : list){
-            state = gps.getAbnormalStatus();
-
-            if(state.equals("offline"))
-                continue;
-
-
-            //if(state.equals("lose"))
-            //if(!state.equals("lose"))
-            //if(state.equals(""))
-            //if(gps.getTimestamp())
-            //if(gps.getAbnormalStatus().equals("lose"))
+        try{
+            long t = System.currentTimeMillis();
+            Collection<GpsEntity> list = gpsRealData.all();
+
+            String state;
+            for(GpsEntity gps : list){
+                state = gps.getAbnormalStatus();
+
+                if(state != null && state.equals("offline"))
+                    continue;
+
+                if (t - gps.getTimestamp() > LOSE_TIME){
+                    gps.setAbnormalStatus("offline");
+
+                    //通知页面有设备掉线
+                    sendUtils.deviceOffline(gps);
+                }
+            }
+        }catch (Exception e){
+            logger.error("", e);
         }
     }
 }
@@ -49,6 +49,9 @@ public class DayOfSchedule implements CommandLineRunner {
     Logger logger = LoggerFactory.getLogger(this.getClass());
+    //按线路分组的 “计划” 排班数据
+    public static Map<String, List<SchedulePlanInfo>> schedulePlanMap;
+
     // 按车辆分组的班次数据
     private static ArrayListMultimap<String, ScheduleRealInfo> nbbmScheduleMap;
@@ -101,6 +104,8 @@ public class DayOfSchedule implements CommandLineRunner {
         currSchDateMap = new HashMap<>();
         nbbm2SEStationMap = TreeMultimap.create();
         carExecutePlanMap = new HashMap<>();
+
+        schedulePlanMap = new HashMap<>();
     }
     @Autowired
@@ -328,6 +333,8 @@ public class DayOfSchedule implements CommandLineRunner {
             // 查询计划排班
             List<SchedulePlanInfo> planItr = cleanSchPlanItr(schPlanService.list(data).iterator());
+            //保存一份原始计划排班数据
+            schedulePlanMap.put(lineCode, planItr);
             // 转换为实际排班
             realList = JSONArray.parseArray(JSON.toJSONString(planItr), ScheduleRealInfo.class);
@@ -374,6 +381,7 @@ public class DayOfSchedule implements CommandLineRunner {
         } catch (Exception e) {
             logger.error("", e);
         }
+
         return realList;
     }
@@ -399,7 +407,7 @@ public class DayOfSchedule implements CommandLineRunner {
         new BatchSaveUtils<ScheduleRealInfo>().saveList(list, ScheduleRealInfo.class);
     }
-    private List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
+    public List<SchedulePlanInfo> cleanSchPlanItr(Iterator<SchedulePlanInfo> itrab) {
         List<SchedulePlanInfo> list = new ArrayList<>();
         SchedulePlanInfo sp;
@@ -157,6 +157,7 @@ public class SchedulePlanInfo {
             Line xl,
             ScheduleResult_output scheduleResult_output,
             TTInfoDetail ttInfoDetail,
+            Boolean isFb,
             CarConfigInfo carConfigInfo,
             List<EmployeeConfigInfo> employeeConfigInfoList,
             SchedulePlan schedulePlan) {
@@ -191,7 +192,7 @@ public class SchedulePlanInfo {
         // TODO：报道时间，出场时间没有
         // 关联的驾驶员
         EmployeeConfigInfo employeeConfigInfo = null;
-        if (ttInfoDetail.getIsFB()) {
+        if (isFb) {
             if (employeeConfigInfoList.size() > 1) {
                 employeeConfigInfo = employeeConfigInfoList.get(1);
             } else {
@@ -28,7 +28,7 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	@Query(value="select s from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.id,s.jGh,s.clZbh,s.lpName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo(String line,String date);
-	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName order by (lpName+1)")
+	@Query(value="select min(s.id), s.jGh,s.clZbh,s.lpName,s.jName,s.sGh,s.sName from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.jGh,s.clZbh,s.lpName ,s.jName,s.sGh,s.sName order by (lpName+1)")
 	List<ScheduleRealInfo> queryUserInfo2(String line,String date);
 	@Query(value="select min(s.id), s.clZbh from ScheduleRealInfo s where s.xlBm = ?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 GROUP BY s.clZbh ")
@@ -33,17 +33,18 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "lp_name as lpName, " +
             "cl as clId, " +
             "cl_zbh as clZbh, " +
-            "group_concat(distinct fcsj) ccsj, " +
+            "group_concat(fcsj) ccsj, " +
+            "group_concat(bc_type) bctype, " +
             "group_concat(distinct j) jsyId, " +
             "group_concat(distinct j_gh) jsyGh, " +
             "group_concat(distinct j_name) jsyName, " +
             "group_concat(distinct s) spyId, " +
             "group_concat(distinct s_gh) spyGh, " +
             "group_concat(distinct s_name) spyName, " +
-            "max(create_date) as createDate " +
+            "max(create_date) as createDate, " +
+            "group_concat(fcno) fcno " +
             "from bsth_c_s_sp_info " +
-            "where bc_type = 'out' and " +
-            "xl = ?1 and " +
+            "where xl = ?1 and " +
             "schedule_date = ?2 " +
             "group by xl_name, schedule_date, lp, lp_name, cl, cl_zbh " +
             "order by xl_name, schedule_date, lp ", nativeQuery = true)
@@ -71,14 +72,16 @@ public interface SchedulePlanInfoRepository extends BaseRepository&lt;SchedulePlanI
             "scpinfo.scheduleDate = :p3 and " +
             "scpinfo.lpName = :p4 and " +
             "scpinfo.fcsj = :p5 and " +
-            "scpinfo.bcType = :p6 ")
+            "scpinfo.bcType = :p6 and " +
+            "scpinfo.fcno = :p7 " )
     int updateGroupInfo_type_2_4(
             @Param("p1") String fcsj,
             @Param("p2") Integer xlid,
             @Param("p3") Date scheduleDate,
             @Param("p4") String lpName,
             @Param("p5") String fcsj_src,
-            @Param("p6") String bcType);
+            @Param("p6") String bcType,
+            @Param("p7") Integer fcno);
     @Modifying
     @Query(value = "update " +
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -148,4 +149,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String, Object>> scheduleDailyExport(Map<String, Object> map);
 	Map<String, Object> exportWaybillMore(Map<String, Object> map);
+
+	List<SchedulePlanInfo> currentSchedulePlan(String lineCode);
 }
@@ -24,6 +24,7 @@ import com.bsth.entity.realcontrol.SvgAttribute;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.entity.schedule.EmployeeConfigInfo;
 import com.bsth.entity.schedule.GuideboardInfo;
+import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.entity.sys.DutyEmployee;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.LineRepository;
@@ -38,6 +39,7 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.SectionRouteService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
@@ -55,11 +57,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.*;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -2179,7 +2177,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         for (ChangePersonCar cpc : cpcs) {
-            if (map.get(cpc.getClZbh()) == null) {
+            if (cpc.getClZbh() != null && map.get(cpc.getClZbh()) == null) {
                 rs.put("msg", "车辆 " + cpc.getClZbh() + " <a href=\"/#/busInfoManage\" target=_blank>车辆基础信息</a> 里找不到！");
                 rs.put("status", ResponseCode.ERROR);
                 return rs;
@@ -3228,5 +3226,25 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		map.put("fileName", file.getName());
 		return map;
 	}
-	
+
+    @Autowired
+    SchedulePlanInfoService schPlanService;
+    @Override
+    public List<SchedulePlanInfo> currentSchedulePlan(String lineCode) {
+        List<SchedulePlanInfo> rs = dayOfSchedule.schedulePlanMap.get(lineCode);
+
+        if(rs==null || rs.size()==0){
+            //尝试刷新内存
+            Map<String, Object> data = new HashMap<>();
+            data.put("scheduleDate_eq", dayOfSchedule.currSchDateMap.get(lineCode));
+            data.put("xlBm_eq", lineCode);
+            List<SchedulePlanInfo> planItr = dayOfSchedule.cleanSchPlanItr(schPlanService.list(data).iterator());
+
+            if(planItr.size() > 0){
+                dayOfSchedule.schedulePlanMap.put(lineCode, planItr);
+                return planItr;
+            }
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.bsth.entity.schedule.SchedulePlanInfo;
 import com.bsth.service.BaseService;
 import org.joda.time.DateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -117,6 +118,11 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         /** 创建时间 */
         private Date createDate;
+        /** 出场班次1发车的顺序号 */
+        private Integer fcno1;
+        /** 出场班次2发车的顺序号 */
+        private Integer fcno2;
+
         public GroupInfo() {}
         public GroupInfo(Object[] datas) {
@@ -132,19 +138,40 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             this.clId = Integer.valueOf(String.valueOf(datas[4]));
             // 车辆自编号
             this.clZbh = String.valueOf(datas[5]);
-            // 出场时间，如果有多个，需要分开
+            // 出场时间，出场班次，如果有多个，需要分开
             Object ccsj = datas[6];
+            Object bctype = datas[7];
+            Object fcno = datas[15];
+
             if (ccsj != null) {
                 String[] ccsj_array = ((String) ccsj).split(",");
-                if (ccsj_array.length > 1) {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
-                    this.ccsj2 = String.valueOf(ccsj_array[1]);
-                } else {
-                    this.ccsj1 = String.valueOf(ccsj_array[0]);
+                String[] bctype_array = ((String) bctype).split(",");
+                String[] fcno_array = ((String) fcno).split(",");
+                List<Integer> bctype_index = new ArrayList<>();
+
+                for (int i = 0; i < bctype_array.length; i++) {
+                    if (bctype_index.size() == 2) { // 只记录2个出场
+                        break;
+                    }
+                    if (bctype_array[i].equals("out")) {
+                        bctype_index.add(i);
+                    }
+                }
+
+                if (bctype_index.size() == 1) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                } else if (bctype_index.size() == 2) {
+                    this.ccsj1 = String.valueOf(ccsj_array[bctype_index.get(0)]);
+                    this.ccsj2 = String.valueOf(ccsj_array[bctype_index.get(1)]);
+
+                    this.fcno1 = Integer.valueOf(fcno_array[bctype_index.get(0)]);
+                    this.fcno2 = Integer.valueOf(fcno_array[bctype_index.get(1)]);
                 }
+
             }
             // 驾驶员id，如果有多个，需要分开
-            Object jsyId = datas[7];
+            Object jsyId = datas[8];
             if (jsyId != null) {
                 String[] jsyId_array = ((String) jsyId).split(",");
                 if (jsyId_array.length > 1) {
@@ -155,7 +182,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员工号，如果有多个，需要分开
-            Object jsyGh = datas[8];
+            Object jsyGh = datas[9];
             if (jsyGh != null) {
                 String[] jsyGh_array = ((String) jsyGh).split(",");
                 if (jsyGh_array.length > 1) {
@@ -166,7 +193,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 驾驶员名字，如果有多个，需要分开
-            Object jsyName = datas[9];
+            Object jsyName = datas[10];
             if (jsyName != null) {
                 String[] jsyName_array = ((String) jsyName).split(",");
                 if (jsyName_array.length > 1) {
@@ -178,7 +205,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员id，如果有多个，需要分开
-            Object spyId = datas[10];
+            Object spyId = datas[11];
             if (spyId != null) {
                 String[] spyId_array = ((String) spyId).split(",");
                 if (spyId_array.length > 1) {
@@ -190,7 +217,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
             }
             // 售票员工号，如果有多个，需要分开
-            Object spyGh = datas[11];
+            Object spyGh = datas[12];
             if (spyGh != null) {
                 String[] spyGh_array = ((String) spyGh).split(",");
                 if (spyGh_array.length > 1) {
@@ -201,7 +228,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 售票员名字，如果有多个，需要分开
-            Object spyName = datas[12];
+            Object spyName = datas[13];
             if (spyName != null) {
                 String[] spyName_array = ((String) spyName).split(",");
                 if (spyName_array.length > 1) {
@@ -212,7 +239,7 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
                 }
             }
             // 创建时间
-            this.createDate = new DateTime(datas[13]).toDate();
+            this.createDate = new DateTime(datas[14]).toDate();
             // TODO：可能还有其他字段
         }
@@ -384,5 +411,21 @@ public interface SchedulePlanInfoService extends BaseService&lt;SchedulePlanInfo, L
         public void setXlId(Integer xlId) {
             this.xlId = xlId;
         }
+
+        public Integer getFcno1() {
+            return fcno1;
+        }
+
+        public void setFcno1(Integer fcno1) {
+            this.fcno1 = fcno1;
+        }
+
+        public Integer getFcno2() {
+            return fcno2;
+        }
+
+        public void setFcno2(Integer fcno2) {
+            this.fcno2 = fcno2;
+        }
     }
 }
@@ -55,7 +55,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj1(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno1()
                 );
             }
@@ -94,7 +95,8 @@ public class SchedulePlanInfoServiceImpl extends BaseServiceImpl&lt;SchedulePlanInf
                         groupInfoUpdate.getUpdate().getScheduleDate(),
                         groupInfoUpdate.getSrc().getLpName(),
                         groupInfoUpdate.getSrc().getCcsj2(),
-                        "out"
+                        "out",
+                        groupInfoUpdate.getSrc().getFcno2()
                 );
             }
 package com.bsth.service.schedule;
 import com.bsth.entity.schedule.SchedulePlan;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.service.schedule.rules.ttinfo2.Result;
+
+import java.util.Date;
 /**
  * Created by xu on 16/6/16.
  */
 public interface SchedulePlanService extends BService<SchedulePlan, Long> {
+
+    SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority);
+
     /**
      * 获取有明日排班的计划。
      * @return
      */
     SchedulePlan findSchedulePlanTommorw();
-}
+
+    /**
+     * 验证使用的时刻表。
+     * @param xlid 线路id
+     * @param from 开始时间
+     * @param to 结束时间
+     * @return
+     */
+    Result validateTTInfo(Integer xlid, Date from, Date to);
+}
 \ No newline at end of file
@@ -3,19 +3,27 @@ package com.bsth.service.schedule.impl;
 import com.bsth.entity.Line;
 import com.bsth.entity.schedule.*;
 import com.bsth.entity.schedule.rule.ScheduleRule1Flat;
+import com.bsth.entity.sys.CompanyAuthority;
 import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 import com.bsth.repository.schedule.SchedulePlanRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.schedule.SchedulePlanService;
+import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.TTInfoService;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleCalcuParam_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResults_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_input;
 import com.bsth.service.schedule.rules.strategy.IStrategy;
+import com.bsth.service.schedule.rules.ttinfo2.CalcuParam;
+import com.bsth.service.schedule.rules.ttinfo2.Result;
 import com.google.common.collect.Multimap;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.kie.api.KieBase;
 import org.kie.api.runtime.KieSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
@@ -37,10 +45,18 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
     private SchedulePlanRepository schedulePlanRepository;
     @Autowired
     private SchedulePlanInfoRepository schedulePlanInfoRepository;
+    @Autowired
+    private LineService lineService;
+    @Autowired
+    private TTInfoService ttInfoService;
+    @Autowired
+    private TTInfoDetailService ttInfoDetailService;
+
+    /** 日志记录器 */
+    private Logger logger = LoggerFactory.getLogger(SchedulePlanServiceImpl.class);
     @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)
-    @Override
-    public SchedulePlan save(SchedulePlan schedulePlan) {
+    public SchedulePlan save(SchedulePlan schedulePlan, CompanyAuthority companyAuthority) {
         // 1-1、查找线路具体信息
         Line xl = strategy.getLine(schedulePlan.getXl().getId());
         // 1-2、查出指定线路的所有规则
@@ -106,18 +122,41 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
                 employeeConfigInfoList.add(employeeConfigMaps.get(Long.valueOf(eid)));
             }
             // 排班明细（这个要迭代的）
-            Collection<TTInfoDetail> ttInfoDetails = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
+            Collection<TTInfoDetail> ttInfoDetails_ = gbdTTinfoMaps.get(scheduleResult_output.getSd().toDate()).get(
                     Long.parseLong(scheduleResult_output.getGuideboardId()));
+            List<TTInfoDetail> ttInfoDetails = new ArrayList<>(ttInfoDetails_);
+
+            // 排序ttInfoDetails
+            Collections.sort(ttInfoDetails, new Comparator<TTInfoDetail>() {
+                @Override
+                public int compare(TTInfoDetail o1, TTInfoDetail o2) {
+                    return o1.getFcno().compareTo(o2.getFcno());
+                }
+            });
+
+            Boolean isFb = false; // 是否分班
             for (TTInfoDetail ttInfoDetail : ttInfoDetails) {
+                if (ttInfoDetail.getIsFB())
+                    isFb = ttInfoDetail.getIsFB();
+
                 SchedulePlanInfo schedulePlanInfo = new SchedulePlanInfo(
                         xl,
                         scheduleResult_output,
                         ttInfoDetail,
+                        isFb,
                         configInfo,
                         employeeConfigInfoList,
                         schedulePlan);
+
+                // 公司，分公司编码
+                schedulePlanInfo.setGsBm(companyAuthority.getCompanyCode());
+                schedulePlanInfo.setGsName(companyAuthority.getCompanyName());
+                schedulePlanInfo.setFgsBm(companyAuthority.getSubCompanyCode());
+                schedulePlanInfo.setFgsName(companyAuthority.getSubCompanyName());
+
                 schedulePlanInfos.add(schedulePlanInfo);
                 ttInfoMap.put(ttInfoDetail.getTtinfo().getId(), ttInfoDetail.getTtinfo().getName());
+
             }
         }
@@ -144,4 +183,36 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
         }
         return null;
     }
+
+    @Override
+    public Result validateTTInfo(Integer xlid, Date from, Date to) {
+        // 构造drools session->载入数据->启动规则->计算->销毁session
+        // 创建session，内部配置的是stateful
+        KieSession session = kieBase.newKieSession();
+        // 设置gloable对象，在drl中通过别名使用
+        session.setGlobal("log", logger);
+        session.setGlobal("lineService", lineService);
+        session.setGlobal("ttInfoDetailService", ttInfoDetailService);
+
+        Result rs = new Result(); // 输出gloable对象
+        session.setGlobal("rs", rs);
+
+        // 载入数据
+        CalcuParam calcuParam = new CalcuParam(
+                new DateTime(from), new DateTime(to), xlid);
+        session.insert(calcuParam);
+        List<TTInfo> ttInfos = ttInfoService.findAll();
+        for (TTInfo ttInfo: ttInfos)
+                session.insert(ttInfo);
+
+
+        // 执行rule
+        session.fireAllRules();
+
+        // 执行完毕销毁，有日志的也要关闭
+        session.dispose();
+
+
+        return rs;
+    }
 }
@@ -169,8 +169,10 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
             Map<String, Object> ktrParms = new HashMap<>();
             File ktrFile = new File(this.getClass().getResource(
                     dataToolsProperties.getTtinfodetailMetadatainputktr()).toURI());
+//            File ktrFile2 = new File(this.getClass().getResource(
+//                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
             File ktrFile2 = new File(this.getClass().getResource(
-                    dataToolsProperties.getTtinfodetailDatainputktr()).toURI());
+                    dataToolsProperties.getTtinfodetailDatainputktr2()).toURI());
             // 通用参数，转换文件路径，excel输入文件路径，错误输出文件路径
             ktrParms.put("transpath", ktrFile.getAbsolutePath());
@@ -52,6 +52,9 @@ public class MyDroolsConfiguration {
         // 3.2、写入drl（写法超多，有点混乱）
         // 这里使用文件的形式写入，TODO：以后考虑从数据库中读drl写入
         // 注意kfs写的时候如果指定path，强制为src/main/resources/加上文件名，还有就是文件名不要重复否则会覆盖的
+        kfs.write("src/main/resources/functions.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/functions.drl"), "UTF-8"));
         kfs.write("src/main/resources/HelloWorld.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/HelloWorld.drl"), "UTF-8"));
@@ -61,6 +64,9 @@ public class MyDroolsConfiguration {
         kfs.write("src/main/resources/ttinfo.drl", kieServices.getResources()
                 .newInputStreamResource(this.getClass().getResourceAsStream(
                         "/rules/ttinfo.drl"), "UTF-8"));
+        kfs.write("src/main/resources/ttinfo2.drl", kieServices.getResources()
+                .newInputStreamResource(this.getClass().getResourceAsStream(
+                        "/rules/ttinfo2.drl"), "UTF-8"));
         // TODO：还有其他drl....
         // 4、创建KieBuilder，使用KieFileSystem构建
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import org.joda.time.DateTime;
+
+/**
+ * 时刻表计算参数。
+ */
+public class CalcuParam {
+    /** 开始计算时间 */
+    private DateTime fromDate;
+    /** 结束计算时间 */
+    private DateTime toDate;
+    /** 线路id */
+    private Integer xlId;
+
+    public CalcuParam() {}
+    public CalcuParam(
+            DateTime fromDate,
+            DateTime toDate,
+            Integer xlId) {
+        this.fromDate = fromDate;
+        this.toDate = toDate;
+        this.xlId = xlId;
+    }
+
+    public DateTime getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(DateTime fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public DateTime getToDate() {
+        return toDate;
+    }
+
+    public void setToDate(DateTime toDate) {
+        this.toDate = toDate;
+    }
+
+    public Integer getXlId() {
+        return xlId;
+    }
+
+    public void setXlId(Integer xlId) {
+        this.xlId = xlId;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import com.bsth.entity.schedule.TTInfoDetail;
+import org.kie.api.runtime.rule.AccumulateFunction;
+
+import java.io.*;
+
+/**
+ * Created by xu on 17/2/28.
+ */
+public class ErrorBcCountFunction implements AccumulateFunction {
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+    }
+
+    protected static class ErrorCountData implements Externalizable {
+        public long errorcount = 0;
+        public TTInfoDetail ttInfoDetail;
+
+        public ErrorCountData() {
+        }
+
+        @Override
+        public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            errorcount = in.readLong();
+            ttInfoDetail = (TTInfoDetail) in.readObject();
+        }
+
+        @Override
+        public void writeExternal(ObjectOutput out) throws IOException {
+            out.writeLong(errorcount);
+            out.writeObject(ttInfoDetail);
+        }
+    }
+
+    @Override
+    public Serializable createContext() {
+        return new ErrorCountData();
+    }
+
+    @Override
+    public void init(Serializable context) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        errorCountData.errorcount = 0;
+    }
+
+    @Override
+    public void accumulate(Serializable context, Object value) {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getTtinfo() == null) {
+            errorCountData.errorcount ++;
+            return;
+        }
+
+        if ("in".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getTcc() == null) {
+                errorCountData.errorcount ++;
+            }
+        } else if ("out".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getTcc() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount ++;
+            }
+        } else {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount ++;
+            }
+        }
+    }
+
+    @Override
+    public void reverse(Serializable context, Object value) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        TTInfoDetail ttInfoDetail = (TTInfoDetail) value;
+
+        if (ttInfoDetail.getTtinfo() == null) {
+            errorCountData.errorcount --;
+            return;
+        }
+
+        if ("in".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getTcc() == null) {
+                errorCountData.errorcount --;
+            }
+        } else if ("out".equals(ttInfoDetail.getBcType())) {
+            if (ttInfoDetail.getTcc() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount --;
+            }
+        } else {
+            if (ttInfoDetail.getQdz() == null || ttInfoDetail.getZdz() == null) {
+                errorCountData.errorcount --;
+            }
+        }
+
+    }
+
+    @Override
+    public Object getResult(Serializable context) throws Exception {
+        ErrorCountData errorCountData = (ErrorCountData) context;
+        return errorCountData.errorcount;
+    }
+
+    @Override
+    public boolean supportsReverse() {
+        return true;
+    }
+
+    @Override
+    public Class<?> getResultType() {
+        return Number.class;
+    }
+}
+package com.bsth.service.schedule.rules.ttinfo2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 输出结果值。
+ */
+public class Result {
+    private List<StatInfo> infos = new ArrayList<>();
+
+    public List<StatInfo> getInfos() {
+        return infos;
+    }
+
+    public void setInfos(List<StatInfo> infos) {
+        this.infos = infos;
+    }
+
+    public static class StatInfo {
+        /** 时刻表id */
+        private Long ttid;
+        /** 时刻表名字 */
+        private String ttname;
+
+        /** 所有班次数 */
+        private Long allbc;
+        /** 进场班次数 */
+        private Long inbc;
+        /** 出场班次数 */
+        private Long outbc;
+        /** 营运班次数 */
+        private Long yybc;
+
+        /** 错误班次数 */
+        private Long errorbc;
+
+        public Long getTtid() {
+            return ttid;
+        }
+
+        public void setTtid(Long ttid) {
+            this.ttid = ttid;
+        }
+
+        public String getTtname() {
+            return ttname;
+        }
+
+        public void setTtname(String ttname) {
+            this.ttname = ttname;
+        }
+
+        public Long getAllbc() {
+            return allbc;
+        }
+
+        public void setAllbc(Long allbc) {
+            this.allbc = allbc;
+        }
+
+        public Long getInbc() {
+            return inbc;
+        }
+
+        public void setInbc(Long inbc) {
+            this.inbc = inbc;
+        }
+
+        public Long getOutbc() {
+            return outbc;
+        }
+
+        public void setOutbc(Long outbc) {
+            this.outbc = outbc;
+        }
+
+        public Long getYybc() {
+            return yybc;
+        }
+
+        public void setYybc(Long yybc) {
+            this.yybc = yybc;
+        }
+
+        public Long getErrorbc() {
+            return errorbc;
+        }
+
+        public void setErrorbc(Long errorbc) {
+            this.errorbc = errorbc;
+        }
+    }
+}
@@ -72,6 +72,9 @@ public class DataToolsProperties {
     /** 时刻表明细信息导入 */
     @NotNull
     private String ttinfodetailDatainputktr;
+    /** 时刻表明细信息导入 */
+    @NotNull
+    private String ttinfodetailDatainputktr2;
     /** 排班规则信息导入 */
     @NotNull
     private String scheduleruleDatainputktr;
@@ -320,4 +323,12 @@ public class DataToolsProperties {
     public void setGuideboardsDataoutputktr(String guideboardsDataoutputktr) {
         this.guideboardsDataoutputktr = guideboardsDataoutputktr;
     }
+
+    public String getTtinfodetailDatainputktr2() {
+        return ttinfodetailDatainputktr2;
+    }
+
+    public void setTtinfodetailDatainputktr2(String ttinfodetailDatainputktr2) {
+        this.ttinfodetailDatainputktr2 = ttinfodetailDatainputktr2;
+    }
 }
@@ -3,6 +3,7 @@ package com.bsth.websocket.handler;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.gpsdata.arrival.entity.SignalState;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -170,4 +171,17 @@ public class SendUtils{
 		list.add(sch);
 		refreshSch(list);
 	}
+
+	public void deviceOffline(GpsEntity gps){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "deviceOffline");
+		map.put("gps", gps);;
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(gps.getLineId().toString(), mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201/:3306/mh_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://localhost:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -30,11 +30,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
 # 时刻表基础信息导入
 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
 # 时刻表明细信息导入（元数据）
-datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailMetaData.ktr
+datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
 # 时刻表明细编辑用数据
 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
 # 时刻表明细信息导入
 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
+# 时刻表明细信息导入2
+datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr
@@ -31,11 +31,13 @@ datatools.guideboards_datainputktr=/datatools/ktrs/guideboardDataInput.ktr
 # 时刻表基础信息导入
 datatools.ttinfo_datainputktr=/datatools/ktrs/ttinfoDataInput.ktr
 # 时刻表明细信息导入（元数据）
-datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailMetaData.ktr
+datatools.ttinfodetail_metadatainputktr=/datatools/ktrs/ttinfodetailDataInputMetaData.ktr
 # 时刻表明细编辑用数据
 datatools.ttinfodetail_foreditktr=/datatools/ktrs/ttinfodetailoutputforedit.ktr
 # 时刻表明细信息导入
 datatools.ttinfodetail_datainputktr=/datatools/ktrs/ttinfodetailDataInput.ktr
+# 时刻表明细信息导入2
+datatools.ttinfodetail_datainputktr2=/datatools/ktrs/ttinfodetailDataInput2.ktr
 # 车辆配置信息导入
 datatools.carsconfig_datainputktr=/datatools/ktrs/carsConfigDataInput.ktr