Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents 1f99ffe5 25878614
Showing 21 changed files with 750 additions and 64 deletions
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/InStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/rfid/handle/RfidSignalHandle.java
src/main/java/com/bsth/data/gpsdata_v2/status_manager/gps_service_state/ServiceStateHandle.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/msg_queue/QueueData_Directive.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/websocket/dto/WsScheduleRealInfo.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/static/pages/base/carpark/add.html
src/main/resources/static/pages/base/carpark/js/add-form-wizard.js
src/main/resources/static/pages/base/lineinformation/js/lineinformation-add-form.js
src/main/resources/static/real_control_v2/fragments/north/nav/directive_history.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/layout.html
@@ -111,6 +111,15 @@ public class TrafficManageController {
         }
     }
+    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
+    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setJHBC(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
     public String setSKB(@RequestParam("ids") String ids) throws Exception {
         try {
@@ -67,6 +67,8 @@ public class DataHandleProcess {
             //数据均分给线程
             ArrayListMultimap dataListMap = ArrayListMultimap.create();
             int size = deviceList.size(), threadIndex = 0, threadSize = size / POOL_SIZE;
+            if(threadSize==0)
+                threadSize = size;
             for (int i = 0; i < size; i++) {
                 if (i % threadSize == 0)
                     threadIndex++;
@@ -78,7 +80,6 @@ public class DataHandleProcess {
             logger.info(JSON.toJSONString(ks));
             for (Integer index : ks) {
-                //logger.info("execute index: " + index);
                 threadPool.execute(new SignalHandleThread(dataListMap.get(index), count));
             }
@@ -112,20 +113,17 @@ public class DataHandleProcess {
         public void run() {
             try {
                 Collections.sort(list, comp);
-                //logger.info("sort end --" + Thread.currentThread().getName() + " -list size: " + list.size());
-
                 GpsEntity gps;
                 for(int i = 0,len = list.size(); i< len ;i ++){
                     gps = list.get(i);
-                    //logger.info("run |--" + Thread.currentThread().getName() + " -i: " + i);
                     try {
                         if (StringUtils.isEmpty(gps.getNbbm()))
                             continue;
                         if (Math.abs(gps.getTimestamp() - gps.getServerTimestamp()) > 1000 * 60 * 20)
                             continue;
-                        gpsStateProcess.process(gps);//状态处理
+                        //gpsStateProcess.process(gps);//状态处理
                         stationInsideProcess.process(gps);//场站内外判定
                         reverseRouteProcess.process(gps);//反向路由处理
                         abnormalStateProcess.process(gps);//超速越界
@@ -134,20 +132,14 @@ public class DataHandleProcess {
                         outStationProcess.process(gps);//出站
-                        //logger.info("put start --" + Thread.currentThread().getName() + " -i: " + i);
                         GpsCacheData.putGps(gps);//历史gps缓存
-                        //logger.info("put end --" + Thread.currentThread().getName() + " -i: " + i);
                     } catch (Throwable e) {
                         logger.error("", e);
                     }
                 }
-
-                //logger.info("for end --" + Thread.currentThread().getName() + " -list size: " + list.size());
-
             } finally {
                 if (count != null)
                     count.countDown();
-                //logger.info(Thread.currentThread().getName() + " -countDown : " + count.getCount());
             }
         }
     }
@@ -164,19 +164,23 @@ public class InStationProcess {
         //将gps转换成下一个班次走向的站内信号（应对只有一个站内信号 即 发出时）
         transformUpDown(gps, next);
-        //下发调度指令
-        DirectivePushQueue.put6002(next, doneSum, "到站@系统");
-
         //套跑  -下发线路切换指令
         if (null != next && !next.getXlBm().equals(sch.getXlBm())) {
             gpsStatusManager.changeLine(next.getClZbh(), next.getXlBm(), "套跑@系统");
         }
+        /**
+         * 注意：
+         * 要先发运营指令，再发调度指令
+         */
+        if(null == next && gps.isService()){
+            nonService(sch, "结束@系统");//营运结束
+        }
+        //下发运营指令
+        DirectivePushQueue.put6003(next, "到站@系统");
-        if (null == next && gps.isService())
-            nonService(sch, "结束@系统");//班次结束
-        else if (null != next && dayOfSchedule.emptyService(next))
-            nonService(sch, "空驶@系统");//下一班非营运
+        //下发调度指令
+        DirectivePushQueue.put6002(next, doneSum, "到站@系统", "");
     }
     /**
@@ -123,7 +123,7 @@ public class RfidSignalHandle {
                 logger.info("RFID; 车辆：" + nbbm + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
                 //下发调度指令
-                DirectivePushQueue.put6002(next, doneSum, "rfid@系统");
+                DirectivePushQueue.put6002(next, doneSum, "rfid@系统", "");
                 //套跑  -下发线路切换指令
                 if(null != next && !next.getXlBm().equals(sch.getXlBm())){
@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 设备营运状态/上下行 处理
@@ -19,7 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class ServiceStateHandle {
-    private static ConcurrentHashMap<String, StateBean> map;
+    private static ConcurrentMap<String, StateBean> map;
     @Autowired
     DirectiveService directiveService;
 package com.bsth.data.msg_queue;
+import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
 import org.slf4j.Logger;
@@ -9,7 +10,9 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
 /**
  * 到网关的指令推送队列 （系统发送的队列， 用户手动发送的不走这里）
@@ -22,13 +25,23 @@ public class DirectivePushQueue implements ApplicationContextAware {
     static DataPushThread thread;
     static DirectiveService directiveService;
     static long t;
-    static final int IDLE_TIME = 1000 * 30;
+
+    /**
+     * 下发运营指令6003的最小间隔时间
+     */
+    static final int MIN_SEND6003_SPACE = 1000 * 60;
+
+    /**
+     * 车辆 ——> 上次下发6003的时间
+     */
+    static ConcurrentMap<String, Long> lastSend6003Map;
     static {
         linkedList = new ConcurrentLinkedQueue<>();
+        lastSend6003Map = new ConcurrentHashMap<>();
     }
-    public static void put6002(ScheduleRealInfo sch, int finish, String sender){
+    public static void put6002(ScheduleRealInfo sch, int finish, String sender, String txtPrefix){
         if(null == sch)
             return;
         QueueData_Directive qd6002 = new QueueData_Directive();
@@ -36,21 +49,36 @@ public class DirectivePushQueue implements ApplicationContextAware {
         qd6002.setFinish(finish);
         qd6002.setSender(sender);
         qd6002.setCode("60_02");
+        qd6002.setTxtPrefix(txtPrefix);
         linkedList.add(qd6002);
     }
     public static void put6003(String nbbm, int state, int upDown, String sender){
+        long t = System.currentTimeMillis();
+        if(lastSend6003Map.containsKey(nbbm)
+                && t - lastSend6003Map.get(nbbm) < MIN_SEND6003_SPACE)
+            return; //最短下发间隔
+
         QueueData_Directive qd6003 = new QueueData_Directive();
         qd6003.setNbbm(nbbm);
         qd6003.setState(state);
         qd6003.setUpDown(upDown);
-        //qd6003.setSch(sch);
         qd6003.setSender(sender);
-
         qd6003.setCode("60_03");
         linkedList.add(qd6003);
+        lastSend6003Map.put(nbbm, t);
+    }
+
+    public static void put6003(ScheduleRealInfo sch, String sender){
+        if(null == sch)
+            return;
+        int state = 0;//营运状态
+        if(DayOfSchedule.emptyService(sch))
+            state = 1;
+
+        put6003(sch.getClZbh(), state, Integer.parseInt(sch.getXlDir()), sender);
     }
     public static void put64(String nbbm, String lineCode, String sender){
@@ -64,10 +92,6 @@ public class DirectivePushQueue implements ApplicationContextAware {
         linkedList.add(qd64);
     }
-    public static boolean isIdle(){
-        return System.currentTimeMillis() - t > IDLE_TIME;
-    }
-
     public static void start(){
         if(thread != null){
             thread.interrupt();
@@ -108,7 +132,7 @@ public class DirectivePushQueue implements ApplicationContextAware {
                         code = qd.getCode();
                         if(code.equals("60_02")){
-                            directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender());
+                            directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender(), qd.getTxtPrefix());
                             log.info("directive 60_02 sch id: " + qd.getSch().getId());
                         }
                         else if(code.equals("60_03")){
@@ -29,6 +29,8 @@ public class QueueData_Directive {
     private String sender;
+    private String txtPrefix;
+
     public ScheduleRealInfo getSch() {
         return sch;
@@ -93,4 +95,12 @@ public class QueueData_Directive {
     public void setLineCode(String lineCode) {
         this.lineCode = lineCode;
     }
+
+    public String getTxtPrefix() {
+        return txtPrefix;
+    }
+
+    public void setTxtPrefix(String txtPrefix) {
+        this.txtPrefix = txtPrefix;
+    }
 }
@@ -93,7 +93,7 @@ public class PilotReport {
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
                         //下发调度指令
-                        DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统");
+                        DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
                     }
                     break;
             }
@@ -904,6 +904,7 @@ public class DayOfSchedule {
     public List<ScheduleRealInfo> changeCar(ScheduleRealInfo sch, String newClZbh) {
         List<ScheduleRealInfo> ups = new ArrayList<>();
+        String oldClZbh = sch.getClZbh();
         //变更相关映射信息
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
@@ -914,7 +915,7 @@ public class DayOfSchedule {
         //重新计算车辆当前执行班次
         reCalcExecPlan(newClZbh);
-        reCalcExecPlan(sch.getClZbh());
+        reCalcExecPlan(oldClZbh);
         //重新分组计划用车
         reCalcLineNbbms();
         return ups;
@@ -935,6 +936,8 @@ public class DayOfSchedule {
         ScheduleRealInfo sch = schAttrCalculator.calcCurrentExecSch(list);
         if(null != sch)
             carExecutePlanMap.put(nbbm, sch);
+        else
+            carExecutePlanMap.remove(nbbm);
     }
     /**
@@ -70,6 +70,8 @@ public interface TrafficManageService {
 	 */
 	String setJHBC();
+	String setJHBC(String theDate);
+
 	String setLD(String theDate);
 	String setLD();
@@ -32,7 +32,7 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @param @param finish  已完成的班次数
 	 * @throws
 	 */
-	int send60Dispatch(ScheduleRealInfo sch, int finish, String sender);
+	int send60Dispatch(ScheduleRealInfo sch, int finish, String sender,String txtPrefix);
 	/**
 	 * 
@@ -26,6 +26,7 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -78,6 +79,8 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     public int send60Phrase(String nbbm, String text, String sender) {
         D60 d60 = null;
         try {
+            text = StringEscapeUtils.unescapeHtml4(text);
+            text = text.replaceAll("#", "");
             d60 = create60Data(nbbm, text, (short) 0x00, null);
         } catch (Exception e) {
             logger.error("发送消息短语出现异常", e);
@@ -105,7 +108,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
     }
     @Override
-    public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender) {
+    public int send60Dispatch(ScheduleRealInfo sch, int finish, String sender, String txtPrefix) {
         D60 d60 = null;
         try {
             if (sch.isDestroy()) {
@@ -129,8 +132,15 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             long t = System.currentTimeMillis() + 1000 * 30,
                     alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
+            if(StringUtils.isNotEmpty(txtPrefix)){
+                text = txtPrefix + text;
+            }
+            text = StringEscapeUtils.unescapeHtml4(text);
+            int state = 0;//营运状态
+            if(dayOfSchedule.emptyService(sch))
+                state = 1;
             d60 = new DirectiveCreator().createD60_01(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
-                    , 0, new Date(alarmTime));
+                    , state, new Date(alarmTime));
             d60.setLineCode(sch.getXlBm());
         } catch (Exception e) {
@@ -170,6 +180,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
             dayOfDirectives.put60(d60, false);
             d60Repository.save(d60);
         }
+
         return code;
     }
@@ -196,7 +207,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         ScheduleRealInfo sch = dayOfSchedule.get(id);
         // 车辆已完成班次
         int finish = dayOfSchedule.doneSum(sch.getClZbh());
-        return send60Dispatch(sch, finish, sender);
+        return send60Dispatch(sch, finish, sender, "");
     }
     @Override
@@ -812,10 +812,26 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 上传计划班次 指定日期 yyyy-MM-dd
+	 * @param theDate
+	 * @return
+	 */
+	public String setJHBC(String theDate){
+		return uploadJHBC(theDate);
+	}
+
+	/**
+	 * 上传计划班次
+	 * @return
+	 */
+	public String setJHBC(){
+		return uploadJHBC(null);
+	}
+	/**
 	 * 上传线路计划班次表
 	 */
-	@Override
-	public String setJHBC() {
+
+	private String uploadJHBC(String theDate) {
 		String result = "failure";
 		Line line;
 		StringBuffer sBuffer =new StringBuffer();
@@ -825,8 +841,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			SchedulePlanInfo schedulePlanInfo;
 			String xlbm,zbh = "";
 			Long lp = 0L;
-			// 取明天的日期
-			String tomorrow = sdfnyr.format(DateUtils.addDays(new Date(), +1));
+			// 取得计划班次时间
+			String tomorrow = theDate == null ? sdfnyr.format(DateUtils.addDays(new Date(), +1)) : theDate;
 			// 查询所有班次
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
 			int j = 0; // 初始化标识
+package com.bsth.websocket.dto;
+
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
+import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 精简字段的实际排班 entity
+ * webSocket 传输用，去掉了页面不需要的一些字段
+ * Created by panzhao on 2017/11/14.
+ */
+public class WsScheduleRealInfo {
+
+    public static WsScheduleRealInfo getInstance(ScheduleRealInfo sch){
+        if(null == sch)
+            return null;
+        WsScheduleRealInfo wss = new WsScheduleRealInfo();
+        wss.id = sch.getId();
+        wss.scheduleDateStr = sch.getScheduleDateStr();
+        wss.realExecDate = sch.getRealExecDate();
+        wss.xlName = sch.getXlName();
+        wss.xlBm = sch.getXlBm();
+        wss.lpName = sch.getLpName();
+        wss.clZbh = sch.getClZbh();
+        wss.jGh = sch.getjGh();
+        wss.jName = sch.getjName();
+        wss.sGh = sch.getsGh();
+        wss.sName = sch.getsName();
+        wss.xlDir = sch.getXlDir();
+        wss.qdzCode = sch.getQdzCode();
+        wss.qdzName = sch.getQdzName();
+        wss.zdzCode = sch.getZdzCode();
+        wss.zdzName = sch.getZdzName();
+        wss.fcsj = sch.getFcsj();
+        wss.fcsjT = sch.getFcsjT();
+        wss.zdsj = sch.getZdsj();
+        wss.zdsjT = sch.getZdsjT();
+        wss.jhlc = sch.getJhlc();
+        wss.jhlcOrig = sch.getJhlcOrig();
+        wss.bcsj = sch.getBcsj();
+        wss.bcType = sch.getBcType();
+        wss.majorStationName = sch.getMajorStationName();
+        wss.fcsjActual = sch.getFcsjActual();
+        wss.fcsjActualTime = sch.getFcsjActualTime();
+        wss.zdsjActual = sch.getZdsjActual();
+        wss.zdsjActualTime = sch.getZdsjActualTime();
+        wss.status = sch.getStatus();
+        wss.adjustExps = sch.getAdjustExps();
+        wss.sflj = sch.isSflj();
+        wss.late = sch.isLate();
+        wss.late2 = sch.isLate2();
+        wss.lateMinute = sch.getLateMinute();
+        wss.remarks = sch.getRemarks();
+        wss.dfsj = sch.getDfsj();
+        wss.dfsjT = sch.getDfsjT();
+        wss.directiveState = sch.getDirectiveState();
+        wss.qdzArrDatejh = sch.getQdzArrDatejh();
+        wss.qdzArrDatesj = sch.getQdzArrDatesj();
+        wss.cTasks = sch.getcTasks();
+        wss.gsName = sch.getGsName();
+        wss.gsBm = sch.getGsBm();
+        wss.fgsName = sch.getFgsName();
+        wss.fgsBm = sch.getFgsBm();
+        wss.ccService = sch.isCcService();
+        return wss;
+    }
+
+
+    public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
+        List<WsScheduleRealInfo> rs = new ArrayList<>();
+        for(ScheduleRealInfo sch : list){
+            rs.add(getInstance(sch));
+        }
+        return rs;
+    }
+
+    /** 主键Id */
+    private Long id;
+
+    /** 排班日期字符串 YYYY-MM-DD */
+    private String scheduleDateStr;
+
+    /** 真实执行时间 yyyy-MM-dd */
+    private String realExecDate;
+
+    /** 线路名称 */
+    private String xlName;
+    /** 线路编码 */
+    private String xlBm;
+
+    /** 路牌名称 */
+    private String lpName;
+
+    /** 车辆自编号 */
+    private String clZbh;
+
+    /** 驾驶员工号 */
+    private String jGh;
+    /** 驾驶员名字 */
+    private String jName;
+    /** 售票员工号 */
+    private String sGh;
+    /** 售票员名字 */
+    private String sName;
+
+    /** 线路方向 */
+    private String xlDir;
+    /** 起点站code*/
+    private String qdzCode;
+    /** 起点站名字 */
+    private String qdzName;
+
+    /** 终点站code*/
+    private String zdzCode;
+    /** 终点站名字 */
+    private String zdzName;
+
+    /** 计划发车时间（格式 HH:mm） */
+    private String fcsj;
+    /** 计划发车时间戳*/
+    @Transient
+    private Long fcsjT;
+
+    /** 计划终点时间（格式 HH:mm） */
+    private String zdsj;
+    /** 计划终点时间戳*/
+    @Transient
+    private Long zdsjT;
+
+    /** 计划里程 */
+    private Double jhlc;
+
+    /** 原始计划里程 （原计调的数据） */
+    private Double jhlcOrig;
+    /** 班次历时 */
+    private Integer bcsj;
+
+    /**
+     * 班次类型 TODO：正常班次、出场、进场、加油、区间班次、放空班次、放大站班次、两点间空驶
+     */
+    private String bcType;
+
+    //放站班次 站点名称
+    private String majorStationName;
+
+    /** 实际发车时间*/
+    private String fcsjActual;
+    /** 实际发车时间戳*/
+    @Transient
+    private Long fcsjActualTime;
+    /**实际终点时间 */
+    private String zdsjActual;
+    /** 实际终点时间戳*/
+    @Transient
+    private Long zdsjActualTime;
+
+    /**班次状态 0 未执行 1 正在执行 2 已执行 -1 已烂班 */
+    private int status;
+
+    private String adjustExps;
+
+    /** 是否是临加班次 */
+    private boolean sflj;
+
+    /** 是否误点  （应发未发）*/
+    @Transient
+    private boolean late;
+
+    /** 是否误点 （应发未到） */
+    @Transient
+    private boolean late2;
+    /** 误点停靠时间 */
+    @Transient
+    private float lateMinute;
+
+    /** 备注*/
+    private String remarks;
+
+    /**待发时间（格式 HH:mm） */
+    private String dfsj;
+
+    /**待发时间戳 */
+    @Transient
+    private Long dfsjT;
+
+    /** 指令下发状态  60: 已发送， 100： 设备确认收到， 200：驾驶员确认   0：失败 */
+    private Integer directiveState = -1;
+
+    /** 起点站计划到达时间 */
+    @Transient
+    private String qdzArrDatejh;
+
+    /** 起点站实际到达时间 */
+    @Transient
+    private String qdzArrDatesj;
+
+    /** 子任务 */
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "schedule")
+    private Set<ChildTaskPlan> cTasks = new HashSet<>();
+
+    /** 关联的公司名称 */
+    private String gsName;
+    /** 关联的公司编码 */
+    private String gsBm;
+    /** 关联的分公司名称 */
+    private String fgsName;
+    /** 关联的分公司编码 */
+    private String fgsBm;
+
+    /**
+     * 换车营运标记 true 表示该主任务由 【中途换车子任务】 级联生成
+     */
+    private boolean ccService;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getScheduleDateStr() {
+        return scheduleDateStr;
+    }
+
+    public void setScheduleDateStr(String scheduleDateStr) {
+        this.scheduleDateStr = scheduleDateStr;
+    }
+
+    public String getRealExecDate() {
+        return realExecDate;
+    }
+
+    public void setRealExecDate(String realExecDate) {
+        this.realExecDate = realExecDate;
+    }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getXlBm() {
+        return xlBm;
+    }
+
+    public void setXlBm(String xlBm) {
+        this.xlBm = xlBm;
+    }
+
+    public String getLpName() {
+        return lpName;
+    }
+
+    public void setLpName(String lpName) {
+        this.lpName = lpName;
+    }
+
+    public String getClZbh() {
+        return clZbh;
+    }
+
+    public void setClZbh(String clZbh) {
+        this.clZbh = clZbh;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getjName() {
+        return jName;
+    }
+
+    public void setjName(String jName) {
+        this.jName = jName;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public String getsName() {
+        return sName;
+    }
+
+    public void setsName(String sName) {
+        this.sName = sName;
+    }
+
+    public String getXlDir() {
+        return xlDir;
+    }
+
+    public void setXlDir(String xlDir) {
+        this.xlDir = xlDir;
+    }
+
+    public String getQdzCode() {
+        return qdzCode;
+    }
+
+    public void setQdzCode(String qdzCode) {
+        this.qdzCode = qdzCode;
+    }
+
+    public String getQdzName() {
+        return qdzName;
+    }
+
+    public void setQdzName(String qdzName) {
+        this.qdzName = qdzName;
+    }
+
+    public String getZdzCode() {
+        return zdzCode;
+    }
+
+    public void setZdzCode(String zdzCode) {
+        this.zdzCode = zdzCode;
+    }
+
+    public String getZdzName() {
+        return zdzName;
+    }
+
+    public void setZdzName(String zdzName) {
+        this.zdzName = zdzName;
+    }
+
+    public String getFcsj() {
+        return fcsj;
+    }
+
+    public void setFcsj(String fcsj) {
+        this.fcsj = fcsj;
+    }
+
+    public Long getFcsjT() {
+        return fcsjT;
+    }
+
+    public void setFcsjT(Long fcsjT) {
+        this.fcsjT = fcsjT;
+    }
+
+    public String getZdsj() {
+        return zdsj;
+    }
+
+    public void setZdsj(String zdsj) {
+        this.zdsj = zdsj;
+    }
+
+    public Long getZdsjT() {
+        return zdsjT;
+    }
+
+    public void setZdsjT(Long zdsjT) {
+        this.zdsjT = zdsjT;
+    }
+
+    public Double getJhlc() {
+        return jhlc;
+    }
+
+    public void setJhlc(Double jhlc) {
+        this.jhlc = jhlc;
+    }
+
+    public Double getJhlcOrig() {
+        return jhlcOrig;
+    }
+
+    public void setJhlcOrig(Double jhlcOrig) {
+        this.jhlcOrig = jhlcOrig;
+    }
+
+    public Integer getBcsj() {
+        return bcsj;
+    }
+
+    public void setBcsj(Integer bcsj) {
+        this.bcsj = bcsj;
+    }
+
+    public String getBcType() {
+        return bcType;
+    }
+
+    public void setBcType(String bcType) {
+        this.bcType = bcType;
+    }
+
+    public String getMajorStationName() {
+        return majorStationName;
+    }
+
+    public void setMajorStationName(String majorStationName) {
+        this.majorStationName = majorStationName;
+    }
+
+    public String getFcsjActual() {
+        return fcsjActual;
+    }
+
+    public void setFcsjActual(String fcsjActual) {
+        this.fcsjActual = fcsjActual;
+    }
+
+    public Long getFcsjActualTime() {
+        return fcsjActualTime;
+    }
+
+    public void setFcsjActualTime(Long fcsjActualTime) {
+        this.fcsjActualTime = fcsjActualTime;
+    }
+
+    public String getZdsjActual() {
+        return zdsjActual;
+    }
+
+    public void setZdsjActual(String zdsjActual) {
+        this.zdsjActual = zdsjActual;
+    }
+
+    public Long getZdsjActualTime() {
+        return zdsjActualTime;
+    }
+
+    public void setZdsjActualTime(Long zdsjActualTime) {
+        this.zdsjActualTime = zdsjActualTime;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public String getAdjustExps() {
+        return adjustExps;
+    }
+
+    public void setAdjustExps(String adjustExps) {
+        this.adjustExps = adjustExps;
+    }
+
+    public boolean isSflj() {
+        return sflj;
+    }
+
+    public void setSflj(boolean sflj) {
+        this.sflj = sflj;
+    }
+
+    public boolean isLate() {
+        return late;
+    }
+
+    public void setLate(boolean late) {
+        this.late = late;
+    }
+
+    public boolean isLate2() {
+        return late2;
+    }
+
+    public void setLate2(boolean late2) {
+        this.late2 = late2;
+    }
+
+    public float getLateMinute() {
+        return lateMinute;
+    }
+
+    public void setLateMinute(float lateMinute) {
+        this.lateMinute = lateMinute;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getDfsj() {
+        return dfsj;
+    }
+
+    public void setDfsj(String dfsj) {
+        this.dfsj = dfsj;
+    }
+
+    public Long getDfsjT() {
+        return dfsjT;
+    }
+
+    public void setDfsjT(Long dfsjT) {
+        this.dfsjT = dfsjT;
+    }
+
+    public Integer getDirectiveState() {
+        return directiveState;
+    }
+
+    public void setDirectiveState(Integer directiveState) {
+        this.directiveState = directiveState;
+    }
+
+    public String getQdzArrDatejh() {
+        return qdzArrDatejh;
+    }
+
+    public void setQdzArrDatejh(String qdzArrDatejh) {
+        this.qdzArrDatejh = qdzArrDatejh;
+    }
+
+    public String getQdzArrDatesj() {
+        return qdzArrDatesj;
+    }
+
+    public void setQdzArrDatesj(String qdzArrDatesj) {
+        this.qdzArrDatesj = qdzArrDatesj;
+    }
+
+    public Set<ChildTaskPlan> getcTasks() {
+        return cTasks;
+    }
+
+    public void setcTasks(Set<ChildTaskPlan> cTasks) {
+        this.cTasks = cTasks;
+    }
+
+    public String getGsName() {
+        return gsName;
+    }
+
+    public void setGsName(String gsName) {
+        this.gsName = gsName;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsName() {
+        return fgsName;
+    }
+
+    public void setFgsName(String fgsName) {
+        this.fgsName = fgsName;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
+
+    public boolean isCcService() {
+        return ccService;
+    }
+
+    public void setCcService(boolean ccService) {
+        this.ccService = ccService;
+    }
+}
@@ -7,6 +7,7 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.safe_driv.SafeDriv;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.dto.WsScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
@@ -38,7 +39,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "faChe");
-		map.put("t", sch);
+		map.put("t", WsScheduleRealInfo.getInstance(sch));
 		map.put("dataStr", sdf.format(new Date()));
 		ObjectMapper mapper = new ObjectMapper();
@@ -62,7 +63,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "refreshSch");
-		map.put("ts", list);
+		map.put("ts", WsScheduleRealInfo.getMultiInstance(list));
 		ObjectMapper mapper = new ObjectMapper();
@@ -82,8 +83,8 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "zhongDian");
-		map.put("t", sch);
-		map.put("nt", nextSch);
+		map.put("t", WsScheduleRealInfo.getInstance(sch));
+		map.put("nt", WsScheduleRealInfo.getInstance(nextSch));
 		map.put("finish", finish);
 		map.put("dataStr", sdf.format(new Date()));
@@ -123,7 +124,7 @@ public class SendUtils{
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "directive");
-		map.put("t", sch);;
+		map.put("t", WsScheduleRealInfo.getInstance(sch));;
 		ObjectMapper mapper = new ObjectMapper();
@@ -208,7 +208,7 @@
 							<!-- 所属公司 -->
 							<div class="form-body">
 								<div class="form-group">
-									<label class="col-md-3 control-label">所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
+									<label class="col-md-3 control-label"><span class="required"> * </span>所属公司&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
 										<select name="company" class="form-control" style="width:100%" id="companySelect"></select>
 									</div>
@@ -217,7 +217,7 @@
 							<!-- 所属分公司 -->
 							<div class="form-body">
 								<div class="form-group">
-									<label class="col-md-3 control-label">所属分公司&nbsp;&nbsp;&nbsp;:</label>
+									<label class="col-md-3 control-label"><span class="required"> * </span>所属分公司&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
 										<select name="brancheCompany" class="form-control" style="width:100%" id="brancheCompanySelect">
 										</select>
@@ -33,6 +33,8 @@ var FormWizard = function() {
                         data : {'parkCode' : function() { return $("#parkCodeInput").val(); }},
 					}},// 停车场编码  必填项
 					'bCenterPoint' : {required : true,},//  经纬度坐标点 必填项
+					'company' : {required : true,},//  必填项
+					'brancheCompany' : {required : true,},// 必填项
 					'shapesType' : {required : true,},//  几何图形类型 必填项
 					'radius' : {required : true,digits:true},//  圆形半径 必填项
 					'destroy' : {required : true,},// 是否撤销 必填项
@@ -204,7 +204,7 @@ $(function(){
 				if (params.line) {
 					// 添加数据
-					$post('/lineInformation1', params, function(result) {
+					$post('/lineInformation', params, function(result) {
 						// 如果返回结果不为空
 						if(result){
@@ -17,7 +17,7 @@
                     <select name="dType">
                         <option value="-1">全部</option>
                         <option value="3">消息短语</option>
-                        <option value="0">调度指令</option>
+                        <option value="0" selected>调度指令</option>
                         <option value="1">运营指令</option>
                         <option value="2">线路切换指令</option>
                     </select>
@@ -118,15 +118,14 @@
         {{/if}}
     </script>
     <script id="pbv3_park_dropdown-temp" type="text/html">
-        <li style="text-align: center;">
+        <div style="text-align: center;border-bottom: 1px solid #e2e2e2;padding-bottom: 9px;margin-bottom: 9px;">
             <form class="uk-form" data-uk-margin>
                 <div class="uk-form-icon">
                     <i class="uk-icon-search"></i>
-                    <input type="text" placeholder="搜索" >
+                    <input type="text" placeholder="搜索" class="park_list_search_input">
                 </div>
             </form>
-        </li>
-        <li class="uk-nav-divider"></li>
+        </div>
         {{each list as p i}}
         <li data-code="{{p.parkCode}}" ><a>{{p.parkName}}</a></li>
         {{/each}}
@@ -649,22 +649,37 @@
         (function (lineCode) {
             //从地图模块获取停车场数据
             var parks = gb_map_spatial_data.carparkArray();
-           /* //将线路标准停车场排在第一个
-            var information = gb_data_basic.getLineInformation(lineCode);
-            if(information){
-                var index;
-                for(var i = 0,p; p=parks[i++];){
-                    if(p.parkCode == information.carPark){
-                        index = i - 1;
-                        break;
-                    }
-                }
-                parks[index] = parks.splice(0, 1 , parks[index])[0];
-            }*/
             //渲染
             var htmlStr = template('pbv3_park_dropdown-temp', {list: parks});
             $('.buffer_area_form .parks_list', rightWrap).html(htmlStr);
+            console.log('parksparks', parks);
+            //拼音映射
+            var searchData=[];
+            for(var i=0,p;p=parks[i++];){
+                searchData.push({
+                    code: p.parkCode,
+                    name: p.parkName,
+                    fullChars: pinyin.getFullChars(p.parkName).toUpperCase(),
+                    camelChars: pinyin.getCamelChars(p.parkName).toUpperCase()
+                })
+            }
+            //搜索
+            var listWrap = $('.buffer_area_form .parks_list', rightWrap);
+            $('.park_list_search_input', rightWrap).on('input', function () {
+                var v = $(this).val();
+                if(!v){
+                    $('li', listWrap).show();
+                    return;
+                }
+                v = v.toUpperCase();
+                $('li', listWrap).hide();
+                for(var i=0,obj;obj=searchData[i++];){
+                    if(obj.name.indexOf(v)!=-1 || obj.fullChars.indexOf(v)!=-1 || obj.camelChars.indexOf(v)!=-1)
+                        $('li[data-code="'+obj.code+'"]', listWrap).show();
+                }
+            });
+
             //停车场点击
             $('.buffer_area_form .parks_list>li', rightWrap).on('click', function () {
                 var code = $(this).data('code');