update...

潘钊
1 parent 24cac276
Showing 17 changed files with 448 additions and 151 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/dto/DftzAndDestroy.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/edit_logs/FormLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
src/main/java/com/bsth/data/schedule/external/TccExternalService.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.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/websocket/dto/WsScheduleRealInfo.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -48,7 +48,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
 										   @RequestParam String dfsj,String bcType,
 										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType);
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
 	}
 	/**
@@ -59,7 +59,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> destroy(@RequestParam String idsStr
 			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
 									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
 	}
 	/**
@@ -520,7 +520,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
 		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
 		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
 	}
 	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
 package com.bsth.controller.realcontrol;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
 import com.bsth.data.BasicData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectiveCreator;
@@ -8,10 +12,12 @@ import com.bsth.data.directive.GatewayHttpUtils;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.external.TccExternalService;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,12 +50,16 @@ public class ServiceDataInterface {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    TccExternalService tccExternalService;
+
     /**
      * 获取车辆 和 当前执行班次对照信息
+     *
      * @return
      */
     @RequestMapping("/execSchList")
-    public List<Map<String, Object>> execSchList(@RequestParam String secretKey){
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -57,8 +67,8 @@ public class ServiceDataInterface {
         Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
         Map<String, Object> map;
-        for(ScheduleRealInfo sch : list){
-            if(null == sch)
+        for (ScheduleRealInfo sch : list) {
+            if (null == sch)
                 continue;
             map = new HashMap<>();
             map.put("clZbh", sch.getClZbh());
@@ -105,7 +115,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnCCInfo")
-    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -123,7 +133,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnJCInfo")
-    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -141,10 +151,11 @@ public class ServiceDataInterface {
     /**
      * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     *
      * @return
      */
     @RequestMapping("/findCurrInAndOut")
-    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey){
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -161,30 +172,29 @@ public class ServiceDataInterface {
     /**
      * 向指定的车辆下发消息短语
-     * @param nbbm
-     * @param txt
+     *
      * @return
      */
     @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
-    public int send60Phrase(@RequestBody Map<String, String> map,@RequestParam String secretKey){
-        try{
+    public int send60Phrase(@RequestBody Map<String, String> map, @RequestParam String secretKey) {
+        try {
             String nbbm = map.get("nbbm");
             String txt = map.get("txt");
             String sender = map.get("sender");
-            if(txt.length() > 50)
+            if (txt.length() > 50)
                 txt = txt.substring(0, 50);
             if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
                 return -500;
             //车辆和设备号对照
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-            if(StringUtils.isEmpty(deviceId))
+            if (StringUtils.isEmpty(deviceId))
                 return -404;
             //检查设备是否在线
             long t = System.currentTimeMillis();
             GpsEntity gps = gpsRealData.get(deviceId);
-            if(null == gps ||  (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
+            if (null == gps || (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
                 return -405;
             Short dispatchInstruct = 0;//消息短语
@@ -199,7 +209,7 @@ public class ServiceDataInterface {
             dayOfDirectives.put60(d60);
             return d60.getMsgId();
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             return -500;
         }
@@ -207,23 +217,24 @@ public class ServiceDataInterface {
     /**
      * 根据msg id 查询指令响应情况
-     * @param msgIDs
+     *
+     * @param msgIds
      * @return
      */
     @RequestMapping("/findD60Reply")
-    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds){
+    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds) {
         List<Map<String, Object>> rs = new ArrayList<>();
-        try{
+        try {
             Map<String, Object> map = new HashMap();
             List<String> ids = Splitter.on(",").splitToList(msgIds);
             D60 d60;
-            for(String id : ids){
-                if(StringUtils.isEmpty(id))
+            for (String id : ids) {
+                if (StringUtils.isEmpty(id))
                     continue;
                 d60 = dayOfDirectives.get(Integer.parseInt(id));
-                if(null == d60)
+                if (null == d60)
                     continue;
                 map.put("msgId", d60.getMsgId());
@@ -231,7 +242,7 @@ public class ServiceDataInterface {
                 map.put("jsyReplyTime", d60.getReply47Time());
                 rs.add(map);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
         return rs;
@@ -239,18 +250,52 @@ public class ServiceDataInterface {
     /**
      * 获取路牌下所有班次
+     *
      * @param lineCode
      * @param lpName
      * @return
      */
     @RequestMapping("/findByLpName")
-    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode,@RequestParam String lpName){
-        try{
+    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode, @RequestParam String lpName, @RequestParam String secretKey) {
+        try {
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return null;
+
             List<ScheduleRealInfo> list = dayOfSchedule.getLpScheduleMap().get(lineCode + "_" + lpName);
             return list;
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
         return null;
     }
+
+    /**
+     * 调整出场班次待发，并烂掉后续班次（调派用）
+     *
+     * @param dad
+     * @return
+     */
+    @RequestMapping(value = "/dftzAndDestroy", method = RequestMethod.POST)
+    public Map<String, Object> dftzAndDestroy(@RequestBody DftzAndDestroy dad, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+        return tccExternalService.dftz(dad);
+    }
+
+    /**
+     * 换人换车，（调派用）
+     * @return
+     */
+    @RequestMapping(value = "/tccHrhc", method = RequestMethod.POST)
+    public Map<String, Object> hrhc(@RequestBody String jsonStr, @RequestParam String secretKey){
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        JSONObject rootObj = JSON.parseObject(jsonStr);
+
+        List<ChangePersonCar> cpcs = JSONArray.parseArray(rootObj.getString("cpcs"), ChangePersonCar.class);
+        return tccExternalService.hrhc(cpcs, rootObj.getString("tccCode"), rootObj.getString("userId"));
+    }
 }
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2018/3/22.
+ */
+public class DftzAndDestroy {
+
+    /**
+     * 要调整待发的出场班次ID
+     */
+    private Long dftzId;
+
+    /**
+     * 要设置的待发时间
+     */
+    private String newTimeStr;
+
+    /**
+     * 要烂掉的班次的 班次id ,号分割多个
+     */
+    private String destroyIdx;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    private String reason;
+
+    /**
+     * 调派工号
+     */
+    private String userId;
+
+    public String getNewTimeStr() {
+        return newTimeStr;
+    }
+
+    public void setNewTimeStr(String newTimeStr) {
+        this.newTimeStr = newTimeStr;
+    }
+
+    public String getDestroyIdx() {
+        return destroyIdx;
+    }
+
+    public void setDestroyIdx(String destroyIdx) {
+        this.destroyIdx = destroyIdx;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Long getDftzId() {
+        return dftzId;
+    }
+
+    public void setDftzId(Long dftzId) {
+        this.dftzId = dftzId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
@@ -129,8 +129,11 @@ public class GpsRealData {
         Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
         Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        String deviceId;
         for(String nbbm : nbbmSet){
-            set.add(nbbm2deviceMap.get(nbbm));
+            deviceId = nbbm2deviceMap.get(nbbm);
+            if(StringUtils.isNotEmpty(deviceId))
+                set.add(deviceId);
         }
         List<GpsEntity> rs = new ArrayList<>();
@@ -979,18 +979,21 @@ public class DayOfSchedule {
             String rq = currSchDateMap.get(lineCode);
             if (StringUtils.isNotEmpty(rq)) {
                 List<ScheduleRealInfo> all = findByLineCode(lineCode);
-                //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
-                for (ScheduleRealInfo sch : unions) {
-                    removeExecPlan(sch.getClZbh());
-                }
-                //解除调度指令和班次的外键约束
-                StringBuilder inStr = new StringBuilder("(");
-                for (ScheduleRealInfo sch : all) {
-                    inStr.append(sch.getId() + ",");
+
+                if(null != all && all.size() > 0){
+                    //解除gps 和班次之间的关联
+                    List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
+                    for (ScheduleRealInfo sch : unions) {
+                        removeExecPlan(sch.getClZbh());
+                    }
+                    //解除调度指令和班次的外键约束
+                    StringBuilder inStr = new StringBuilder("(");
+                    for (ScheduleRealInfo sch : all) {
+                        inStr.append(sch.getId() + ",");
+                    }
+                    inStr.deleteCharAt(inStr.length() - 1).append(")");
+                    jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 }
-                inStr.deleteCharAt(inStr.length() - 1).append(")");
-                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 //删除班次数据
                 removeRealSch(lineCode, rq);
@@ -37,7 +37,7 @@ public class FormLogger {
     /**
      * 换人换车情况表
      */
-    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc){
+    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc, String userId){
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -51,7 +51,6 @@ public class FormLogger {
                 return;
             Date d = new Date();
-            SysUser user = SecurityUtils.getCurrentUser();
             Changetochange cc = new Changetochange();
             cc.setRq(sch.getScheduleDateStr());
             cc.setGs(sch.getGsBm());
@@ -61,8 +60,13 @@ public class FormLogger {
             cc.setFssj(sch.getFcsj());
             cc.setXgsj(fmtHHmm.print(d.getTime()));
             cc.setsId(sch.getId());
-            if(user != null)
+
+            if(StringUtils.isEmpty(userId)){
+                SysUser user = SecurityUtils.getCurrentUser();
                 cc.setXgr(user.getUserName());
+            }
+            else
+                cc.setXgr(userId);
             cc.setPcch(sch.getClZbh());
             cc.setPcry(oldJsy);
@@ -86,7 +90,7 @@ public class FormLogger {
         ChangePersonCar cpc = new ChangePersonCar();
         cpc.setClZbh(nbbm);
         cpc.setJsy(jsy);
-        saveChangetochange(sch, cpc);
+        saveChangetochange(sch, cpc, null);
     }
     public void saveDb(){
@@ -28,14 +28,14 @@ public class ScheduleModifyLogger {
     /**
      * 待发调整
-     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整
+     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整、4：调派系统调整
      */
-    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks) {
+    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks, String userId) {
         try {
             if (oldDfsj.equals(nowDfsj))
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.DFTZ);
             sei.setType2(opType);
             sei.setRemarks(remarks == null ? "" : remarks);
@@ -78,9 +78,9 @@ public class ScheduleModifyLogger {
      *
      * @param remarks
      */
-    public static void jhlb(ScheduleRealInfo sch, String remarks) {
+    public static void jhlb(ScheduleRealInfo sch, String remarks, String userId) {
         try {
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setRemarks(remarks);
             sei.setType(EditType.JHLB);
@@ -182,7 +182,7 @@ public class ScheduleModifyLogger {
      * @param sch
      * @param cpc
      */
-    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc) {
+    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc, String userId) {
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -218,7 +218,7 @@ public class ScheduleModifyLogger {
             if(jobj.size() == 0)
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.TZRC);
             sei.setJsonArray(jobj.toJSONString());
@@ -160,6 +160,20 @@ public class SchEditInfo {
         return sei;
     }
+    public static SchEditInfo getInstance(ScheduleRealInfo sch, String userId){
+        SchEditInfo sei = new SchEditInfo();
+        long t = System.currentTimeMillis();
+        sei.setTs(t);
+        sei.setTimeStr(fmtHHmm.print(t));
+        sei.setUser(userId);
+        sei.setRq(sch.getScheduleDateStr());
+        sei.setSchId(sch.getId());
+        sei.setLineCode(sch.getXlBm());
+        sei.setGsbm(sch.getGsBm());
+        sei.setFgsbm(sch.getFgsBm());
+        return sei;
+    }
+
     public String getLineCode() {
         return lineCode;
     }
+package com.bsth.data.schedule.external;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 对停车场开放的班次调度服务
+ * Created by panzhao on 2018/3/22.
+ */
+@Component
+public class TccExternalService {
+
+    Logger logger = LoggerFactory.getLogger(TccExternalService.class);
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ScheduleRealInfoService scheduleRealInfoService;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    /**
+     * 待发调整
+     *
+     * @param dad
+     * @return
+     */
+    public Map<String, Object> dftz(DftzAndDestroy dad) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            List<ScheduleRealInfo> updateList = new ArrayList<>();//要刷新的班次
+            ScheduleRealInfo sch = dayOfSchedule.get(dad.getDftzId());
+            if (null == sch) {
+                rs.put("msg", "班次已经不存在了！");
+                return rs;
+            }
+
+            if (!sch.getBcType().equals("out")) {
+                rs.put("msg", "只能操作出场班次！");
+                return rs;
+            }
+
+            //调整待发时间
+            scheduleRealInfoService.outgoAdjust(sch.getId(), dad.getRemarks(), dad.getNewTimeStr(), sch.getBcType(), "4", dad.getUserId());
+            updateList.add(sch);
+
+            //需要烂班的班次
+            if (StringUtils.isNotEmpty(dad.getDestroyIdx())) {
+                Map<String, Object> dMap =
+                        scheduleRealInfoService.destroy(dad.getDestroyIdx(), dad.getRemarks(), dad.getReason(), dad.getUserId());
+
+
+                updateList.addAll((Collection<? extends ScheduleRealInfo>) dMap.get("ts"));
+            }
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(updateList);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        } catch (Exception e) {
+            rs.put("msg", "内部调度服务接口出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
+     * 换人换车
+     *
+     * @param cpcs
+     * @return
+     */
+    public Map<String, Object> hrhc(List<ChangePersonCar> cpcs,String tccCode, String userId) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            rs = scheduleRealInfoService.multi_tzrc(cpcs, userId);
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(new ArrayList<ScheduleRealInfo>((Set)rs.get("ts")));
+
+            //返回更新结果集中指定停车场的进出场班次
+            Set<ScheduleRealInfo> ts = (Set<ScheduleRealInfo>) rs.get("ts");
+            List<ScheduleRealInfo> list = new ArrayList<>();
+            for(ScheduleRealInfo sch : ts){
+                if((sch.getBcType().equals("out") && sch.getQdzCode().equals(tccCode))
+                        || (sch.getBcType().equals("in") && sch.getZdzCode().equals(tccCode)))
+                    list.add(sch);
+            }
+            rs.put("list", list);
+            rs.remove("ts");
+        } catch (Exception e) {
+            rs.put("msg", "服务器出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+
+    public void sendUpdate2Page(List<ScheduleRealInfo> list) {
+        sendUtils.refreshSch(list);
+    }
+}
@@ -8,6 +8,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -16,8 +17,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 /**
  * 误点自动调整待发 处理程序
@@ -35,12 +35,14 @@ public class LateAdjustHandle implements ApplicationContextAware{
     /**
      * 应发未到车辆 和 班次
+     *
+     * 起点相同的，保留最后一个班次
      */
-    private static Map<String, ScheduleRealInfo> lateSchMap;
+    private static ArrayListMultimap lateSchMaps;
     static {
-        lateSchMap = new HashMap<>();
+        lateSchMaps = ArrayListMultimap.create();
     }
     /**
@@ -48,125 +50,140 @@ public class LateAdjustHandle implements ApplicationContextAware{
      * @param sch
      */
     public static void putLate(ScheduleRealInfo sch){
-        try {
-            //出场班次不需要
-            if(sch.getBcType().equals("out"))
-                return;
+        try{
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
             if(sch.getLateMinute() == 0){
-                if(config.isEnableYjtk()){
-                    sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
-                }
-                else
+                if(!config.isEnableYjtk())
                     return;
+
+                sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
             }
             if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
                     && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
-                ScheduleRealInfo cancel = null;
-                //之前存在误点班次没有发出
-                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+                ScheduleRealInfo old = popLateSch(sch);
+                if(null != old){
+                    //通知客户端
+                    sch.setLate2(true);
+                    sendUtils.sendAutoWdtz(sch, old);
-                if(old != null && old.getDfsjT() < sch.getDfsjT()){
-                    //如果之前班次的 待发应到时间已经过了 3 分钟
-                    long t = System.currentTimeMillis();
-                    long dfEndTime = old.getDfsjT() + (old.getBcsj() * 60 * 1000);
-                    if((t - dfEndTime) > 1000 * 60 * 3){
-
-                        remove(old);
-                        cancel = old;
-                        logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
-                    }
+                    logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                 }
-
-                lateSchMap.put(sch.getClZbh(), sch);
-                //通知客户端
-                sch.setLate2(true);
-                sendUtils.sendAutoWdtz(sch, cancel);
-
-                logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
             }
+
         }catch (Exception e){
             logger.error("", e);
         }
     }
+    /**
+     * 压入新的误点班次
+     * @param sch
+     * @return 返回被移除的误点班次
+     */
+    private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getXlBm());
+
+        if(null == list || list.size() == 0)
+            lateSchMaps.put(sch.getClZbh(), sch);
+        else {
+            ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName());
+
+            //同一个起点，保留时间最大的班次
+            if(null == old || old.getDfsjT() < sch.getDfsjT()){
+                lateSchMaps.remove(old.getClZbh(), old);
+                lateSchMaps.put(sch.getClZbh(), sch);
+
+                logger.info(sch.getClZbh() + "【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                return old;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 搜索同样起点的班次
+     * @param list
+     * @return
+     */
+    private static ScheduleRealInfo findExistQdz(List<ScheduleRealInfo> list, String qdzCode, String qdzName) {
+        for(ScheduleRealInfo item : list){
+            if(item.getQdzCode().equals(qdzCode)
+                    || item.getQdzName().equals(qdzName))
+                return item;
+        }
+        return null;
+    }
+
     /**
      * 获取所有应发未到的班次
      * @return
      */
     public static Collection<ScheduleRealInfo> allLateSch(){
-        return lateSchMap.values();
+        return lateSchMaps.values();
     }
     public static void remove(ScheduleRealInfo sch){
         try {
-            if(lateSchMap.get(sch.getClZbh()) == sch){
-                lateSchMap.remove(sch.getClZbh());
+            if(lateSchMaps.containsEntry(sch.getClZbh(), sch)){
+                lateSchMaps.remove(sch.getClZbh(), sch);
+
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
-                logger.info("移除误点调整 -" + sch.getClZbh());
+                logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId());
             }
         }catch (Exception e){
             logger.error("", e);
         }
     }
-/*    public static void remove(String nbbm){
-        if(lateSchMap.containsKey(nbbm)){
-            ScheduleRealInfo sch = lateSchMap.get(nbbm);
-            sch.setLate2(false);
-            sch.setLateMinute(0);
-            sch.setDfAuto(false);
-
-            lateSchMap.remove(nbbm);
-            logger.info("移除误点调整 nbbm -" + nbbm);
-        }
-    }*/
-
     /**
      * 车辆到站
      * @param gps
      */
     public static void carArrive(GpsEntity gps){
         try{
-            if(gps.getInstation() != 1)
+            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
+
+            if(null == list || list.size() == 0)
                 return;
-            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
-            if(sch == null)
+            String key = gps.getStopNo();
+            if(gps.getInstation()==1)//站点名称
+                key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo();
+
+            gps.setStationName(BasicData.stationCode2NameMap.get(key));
+            //根据起点站获取误点班次
+            ScheduleRealInfo sch = findExistQdz(list, gps.getStopNo(), gps.getStationName());
+
+            if(null == sch)
                 return;
             //可能是延迟信号，gps时间没有误点
             if(gps.getTimestamp() <= sch.getDfsjT()){
                 sch.setLate2(false);
-                lateSchMap.remove(sch.getClZbh());
+                lateSchMaps.remove(sch.getClZbh(), sch);
                 return;
             }
-            //进的是班次起点（名称一样即可）
-            gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
+
             if(gps.getStationName().equals(sch.getQdzName())
-                    /*&& sch.getLateMinute() > 0*/){
+                    || gps.getStopNo().equals(sch.getQdzCode())){
+
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                //超过2小时最大阈值，放弃 -临时代码，待删除
-                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
-                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
-                }
-                else{
-                    sch.setDfsjAll(dt);
-                    sch.setDfAuto(true);
-                    //取消应发未到标记
-                    sch.setLate2(false);
-                }
+                sch.setDfsjAll(dt);
+                sch.setDfAuto(true);
+                //取消应发未到标记
+                sch.setLate2(false);
-                lateSchMap.remove(sch.getClZbh());
+                lateSchMaps.remove(sch.getClZbh(), sch);
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
             }
         }catch (Exception e){
@@ -17,9 +17,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType,String userId);
-	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
+	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/, String userId);
 	List<Map<String, String>> findDriverByLine(String lineCode);
@@ -135,7 +135,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> yesterdayDataList(String line);
-	Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs);
+	Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId);
 	Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs);
@@ -229,7 +229,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
-    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType) {
+    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType, String userId) {
         Map<String, Object> map = new HashMap<>();
         try {
@@ -251,7 +251,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //记录日志
-            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks);
+            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks, userId);
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
@@ -316,7 +316,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks, String reason/*, int spaceNum*/) {
+    public Map<String, Object> destroy(String idsStr, String remarks, String reason, String userId) {
         Map<String, Object> map = new HashMap<>();
         List<ScheduleRealInfo> rsList = new ArrayList<>();
@@ -333,7 +333,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     return map;
                 }
                 //记录日志
-                ScheduleModifyLogger.jhlb(schedule, remarks);
+                ScheduleModifyLogger.jhlb(schedule, remarks, userId);
                 schedule.setAdjustExps(reason);
                 schedule.destroy();
@@ -1354,7 +1354,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sch = list.get(i);
                     //调整待发
-                    tempRs = outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3");
+                    tempRs = outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3", null);
                     if(null != tempRs && tempRs.get("ts") != null)
                         tempTs = (List<ScheduleRealInfo>) tempRs.get("ts");
@@ -1532,7 +1532,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              */
             if (map.get("status") != null
                     && Integer.parseInt(map.get("status").toString()) == -1) {
-                destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null);
                 fLog.log("烂班");
             }
@@ -1544,7 +1544,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
                 if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout() && !sch.isDestroy()){
-                    destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null);
                     fLog.log("里程设置为0，自动烂班");
                 }
                 else if(jhlcNum != sch.getJhlc()){
@@ -1600,7 +1600,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(id);
                 if(schedule != null)
-                    outgoAdjust(id, null, dfsj, null, "2");
+                    outgoAdjust(id, null, dfsj, null, "2", null);
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -3179,7 +3179,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * 批量调整人车
      */
     @Override
-    public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs) {
+    public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId) {
         Map<String, Object> rs = new HashMap<>();
         Set<ScheduleRealInfo> set = new HashSet<>();
@@ -3218,9 +3218,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //为换人换车情况表写入数据
-            schModifyLog.saveChangetochange(sch, cpc);
+            schModifyLog.saveChangetochange(sch, cpc, userId);
             //日志记录
-            ScheduleModifyLogger.tzrc(sch, cpc);
+            ScheduleModifyLogger.tzrc(sch, cpc, userId);
             //换驾驶员
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
@@ -3232,7 +3232,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //换售票员
-            if (StringUtils.isNotEmpty(cpc.getSpy())) {
+            if (StringUtils.isNotEmpty(cpc.getSpy())
+                    && cpc.getSpy().indexOf("/")!=-1
+                    && cpc.getSpy().length() > 1) {
                 sGh = cpc.getSpy().split("/")[0];
                 sName = getPersonName(sch.getGsBm(), sGh);
                 if(StringUtils.isEmpty(sName)){
@@ -3322,7 +3324,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2");
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2", null);
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
@@ -6,10 +6,7 @@ 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;
+import java.util.*;
 /**
  * 精简字段的实际排班 entity
@@ -73,7 +70,7 @@ public class WsScheduleRealInfo {
     }
-    public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
+    public static List<WsScheduleRealInfo> getMultiInstance(Collection<ScheduleRealInfo> list){
         List<WsScheduleRealInfo> rs = new ArrayList<>();
         for(ScheduleRealInfo sch : list){
             rs.add(getInstance(sch));
@@ -936,17 +936,25 @@ option.oil_station_opt {
 }
 .park-and-station-wrap {
-    margin-top: 9px;
-    border: 1px solid #3dce69;
+    margin-top: 25px;
+    border: 1px solid #b9b9b9;
     width: 580px;
     padding: 12px;
     border-radius: 5px;
+    box-shadow: 0 2px 5px rgba(0,0,0,.1);
+    margin-bottom: 15px;
 }
 .park-and-station-wrap select {
     width: auto !important;
 }
+.park-and-station-wrap>span{
+    vertical-align: middle;
+    margin-top: 9px;
+    display: inline-block;
+}
+
 /** 安全驾驶相关css */
 .safe_driv_pop_wrap {
     position: absolute;
@@ -330,6 +330,8 @@
     padding-top: 20px;
     overflow: auto;
     padding-bottom: 20px;
+    position: relative;
+    padding-left: 45px;
 }
 #nav-line_config-modal select,
@@ -534,4 +536,9 @@ span.sm-grey{
 .voip_call_info_panel ._title{
     padding: 15px;
     background: #e6e6e6;
+}
+
+#line_config_entity_wrap .uk-list{
+    display: block;
+    margin-top: 25px;
 }
 \ No newline at end of file
@@ -108,13 +108,13 @@
     </script>
     <script id="park-and-station-temp" type="text/html">
-        停车场
+        <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>
             {{/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}}
@@ -163,14 +163,12 @@ var gb_schedule_table = (function () {
     //计算实发时间差值
     var calc_sch_real_shift = function (sch) {
         if (sch['fcsjActualTime']){
-            var diff = sch['fcsjActualTime'] - sch['dfsjT'], fcsj_diff;
-            fcsj_diff = parseInt(diff / 60000, 10);
-            if(diff % 60000 != 0){
-                /*if(fcsj_diff > 0)
-                    fcsj_diff ++;
-                else */if(fcsj_diff < 0)
-                    fcsj_diff --;
-            }
+            var fs = 'YYYY-MM-DD HH:mm'
+                ,m1 = moment(sch['fcsjActualTime']).format(fs)
+                ,m2 = moment(sch['dfsjT']).format(fs);//去掉秒
+
+            var diff = moment(m1, fs).format('X') - moment(m2, fs).format('X')
+                ,fcsj_diff = parseInt(diff / 60, 10);;
             if(fcsj_diff > 0)
                 sch.fcsj_diff = '( +' + fcsj_diff + ' )';
@@ -181,8 +179,6 @@ var gb_schedule_table = (function () {
         }
     };
-
-
     function arrayIsNull(array) {
         return !array || array.length == 0;
     }