Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 42e55421 d7124004
Showing 13 changed files with 337 additions and 49 deletions
pom.xml
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/realcontrol/LineConfig.java
src/main/java/com/bsth/entity/realcontrol/OilStationSociety.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.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/handler/SendUtils.java
src/main/resources/static/assets/js/common.js
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.bsth</groupId>
@@ -237,27 +237,33 @@
 			<version>1.13</version>
 		</dependency>
-        <dependency>
-            <groupId>org.dbunit</groupId>
-            <artifactId>dbunit</artifactId>
-            <version>2.4.9</version>
-            <scope>test</scope>
+		<dependency>
+			<groupId>org.dbunit</groupId>
+			<artifactId>dbunit</artifactId>
+			<version>2.4.9</version>
+			<scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.2.132</version>
+			<scope>test</scope>
+		</dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.2.132</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>ojdbc</groupId>
+			<artifactId>ojdbc</artifactId>
+			<version>14</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -543,4 +543,25 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 		rs.put("status", code==0? ResponseCode.SUCCESS: ResponseCode.ERROR);
 		return rs;
 	}
+
+	/**
+	 * 误点调整
+	 * @param idx
+	 * @param minute
+	 * @return
+	 */
+	@RequestMapping(value = "lateAdjust", method = RequestMethod.POST)
+	public Map<String, Object> lateAdjust(@RequestParam String idx,@RequestParam float minute ){
+		return scheduleRealInfoService.lateAdjust(idx, minute);
+	}
+
+	/**
+	 * 获取所有应发未到的班次
+	 * @param idx
+	 * @return
+	 */
+	@RequestMapping(value = "allLate2")
+	public List<ScheduleRealInfo> allLate2(@RequestParam String idx){
+		return scheduleRealInfoService.allLate2(idx);
+	}
 }
@@ -8,6 +8,7 @@ import com.bsth.data.gpsdata.arrival.utils.ScheduleSignalState;
 import com.bsth.data.gpsdata.arrival.utils.SignalSchPlanMatcher;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.directive.DirectiveService;
@@ -145,6 +146,9 @@ public class InOutStationSignalHandle extends SignalHandle{
             //持久化
             dayOfSchedule.save(sch);
+            //清理应发未发标记
+            LateAdjustHandle.remove(sch);
+
             if(sch.getBcType().equals("out")){
                 //出场时，切换成营运状态
                 directiveService.send60Operation(sch.getClZbh(), 0, Integer.parseInt(sch.getXlDir()), null, "出场@系统");
@@ -242,6 +246,10 @@ public class InOutStationSignalHandle extends SignalHandle{
             long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
             sch.setZdsjActualAll(rsT);
+
+            //通知误点停靠程序，有车辆到站
+            LateAdjustHandle.carArrive(gps);
+
             //已完成班次数
             int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
             ScheduleRealInfo next = dayOfSchedule.next(sch);
@@ -154,10 +154,10 @@ public class DayOfSchedule implements CommandLineRunner {
             diff += (1000 * 60 * 60 * 24);
         logger.info(diff / 1000 / 60 + "分钟之后提交到运管处");
-        //Application.mainServices.scheduleWithFixedDelay(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //Application.mainServices.scheduleAtFixedRate(submitToTrafficManage, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
-        Application.mainServices.scheduleWithFixedDelay(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        Application.mainServices.scheduleAtFixedRate(calcOilThread, diff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //指令持久化线程
         Application.mainServices.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
 package com.bsth.data.schedule.late_adjust;
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 /**
- * 误点调整处理程序
+ * 误点自动调整待发 处理程序
+ *
+ * 注意 ：这里的误点是指应发未到
  * Created by panzhao on 2017/4/16.
  */
-public class LateAdjustHandle {
+@Component
+public class LateAdjustHandle implements ApplicationContextAware{
+
+    static LineConfigData lineConfigData;
+    static SendUtils sendUtils;
+
+    static Logger logger = LoggerFactory.getLogger(LateAdjustHandle.class);
     /**
-     * 误点的车辆 和 班次
+     * 应发未到车辆 和 班次
      */
     private static Map<String, ScheduleRealInfo> lateSchMap;
+    static {
+        lateSchMap = new HashMap<>();
+    }
+
     /**
-     * 误点的班次ID 和 停靠时间（秒）
+     * 新增一个误点班次
+     * @param sch
      */
-    private static Map<Long, Integer> stopTimeMap;
+    public static void putLate(ScheduleRealInfo sch){
+        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
+                    return;
+            }
+
+            if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
+                    && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
+
+                ScheduleRealInfo cancel = null;
+                //之前存在误点班次没有发出
+                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+                if(old != null && old.getDfsjT() < sch.getDfsjT()){
+                    remove(old);
+                    cancel = old;
+                    logger.info("【应发未到】old 班次 " + old.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
      */
-    public static void schLate(ScheduleRealInfo sch){
+    public static Collection<ScheduleRealInfo> allLateSch(){
+        return lateSchMap.values();
+    }
+
+    public static void remove(ScheduleRealInfo sch){
+        try {
+            if(lateSchMap.get(sch.getClZbh()) == sch){
+                lateSchMap.remove(sch.getClZbh());
+                sch.setLate2(false);
+                sch.setLateMinute(0);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+
+    /**
+     * 车辆到站
+     * @param gps
+     */
+    public static void carArrive(GpsEntity gps){
+        try{
+            if(gps.getInstation() != 1)
+                return;
+
+            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
+            if(sch == null)
+                return;
+
+            //进的是班次起点
+            if(gps.getStopNo().equals(sch.getQdzCode())
+                    && sch.getLateMinute() > 0){
+                //自动调整待发 到达时间 + 停靠时间
+                long dt = gps.getTimestamp() + (Long.parseLong(String.valueOf(sch.getLateMinute() * 60 * 1000)));
+                sch.setDfsjAll(dt);
+                sch.setDfAuto(true);
+
+                lateSchMap.remove(sch.getClZbh());
+                logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        lineConfigData = applicationContext.getBean(LineConfigData.class);
+        sendUtils = applicationContext.getBean(SendUtils.class);
     }
-}
+}
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,10 +15,10 @@ import java.util.Comparator;
 import java.util.List;
 /**
- * 
- * @ClassName: ScheduleLateThread 
- * @Description: TODO(班次误点扫描线程) 
- * @author PanZhao 
+ *
+ * @ClassName: ScheduleLateThread
+ * @Description: TODO(班次误点扫描线程)
+ * @author PanZhao
  * @date 2016年8月31日 下午3:09:02 
  *
  */
@@ -26,29 +27,39 @@ public class ScheduleLateThread extends Thread{
 	@Autowired
 	DayOfSchedule dayOfSchedule;
-	
+
 	@Autowired
 	SendUtils sendUtils;
-	
+
 	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
-	
+
 	@Override
 	public void run() {
 		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
 		Collections.sort(all, cpm);
-		
+
 		long t = System.currentTimeMillis();
 		int size = all.size();
-		
+
 		ScheduleRealInfo sch;
 		for(int i = 0; i < size; i ++){
 			sch = all.get(i);
-			if(sch.getDfsjT() > t)
+			if(sch.getDfsjT() > t || sch.isLate())
 				break;
-			
-			if(sch.isLate() == false 
-					&& sch.getStatus() == 0 
+
+			if(sch.getStatus() == 0
 					&& sch.getFcsjActual() == null){
+
+				//检查应发未到 当前班次无起点到达时间
+				if(StringUtils.isEmpty(sch.getQdzArrDateSJ())){
+					ScheduleRealInfo prev = dayOfSchedule.prev(sch);
+					//上一个班次也没有实际终点到达时间
+					if(prev != null && StringUtils.isEmpty(prev.getZdsjActual())){
+						//进入误点调整程序
+						LateAdjustHandle.putLate(sch);
+					}
+				}
+
 				//应发未发
 				sch.setLate(true);
 				//通知客户端
@@ -56,4 +67,4 @@ public class ScheduleLateThread extends Thread{
 			}
 		}
 	}
-}
+}
 \ No newline at end of file
@@ -82,7 +82,9 @@ public class LineConfig {
 	 * 应急停靠
 	 */
 	private boolean enableYjtk;
+	/** HH:mm */
 	private String yjtkStart;
+	/** HH:mm */
 	private String yjtkEnd;
 	private int upStopMinute;
 	private int downStopMinute;
@@ -21,6 +21,11 @@ public class OilStationSociety {
     private String stationName;
     /**
+     * 加油站编码（为空则默认社会加油站）
+     */
+    private String stationCode;
+
+    /**
      * 上行进场距离
      */
     private Double upInMile;
@@ -137,4 +142,12 @@ public class OilStationSociety {
     public void setDownOutTime(int downOutTime) {
         this.downOutTime = downOutTime;
     }
+
+    public String getStationCode() {
+        return stationCode;
+    }
+
+    public void setStationCode(String stationCode) {
+        this.stationCode = stationCode;
+    }
 }
@@ -139,10 +139,17 @@ public class ScheduleRealInfo {
 	/** 是否是临加班次 */
 	private boolean sflj;
-	/** 是否误点*/
+	/** 是否误点  （应发未发）*/
 	@Transient
 	private boolean late;
+	/** 是否误点 （应发未到） */
+	@Transient
+	private boolean late2;
+	/** 误点停靠时间 */
+	@Transient
+	private float lateMinute;
+
 	/** 备注*/
 	private String remarks;
@@ -887,4 +894,20 @@ public class ScheduleRealInfo {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	public float getLateMinute() {
+		return lateMinute;
+	}
+
+	public void setLateMinute(float lateMinute) {
+		this.lateMinute = lateMinute;
+	}
+
+	public boolean isLate2() {
+		return late2;
+	}
+
+	public void setLate2(boolean late2) {
+		this.late2 = late2;
+	}
 }
@@ -161,4 +161,8 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	void lpChange(ScheduleRealInfo leftSch, ScheduleRealInfo rightSch, int type);
     Map<String,Object> revokeRealArrive(Long id);
+
+    Map<String,Object> lateAdjust(String idx, float minute);
+
+    List<ScheduleRealInfo> allLate2(String idx);
 }
@@ -14,6 +14,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
 import com.bsth.entity.Line;
 import com.bsth.entity.Personnel;
@@ -177,6 +178,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             schedule.setDfsjAll(dfsj);
             schedule.addRemarks(remarks);
+            //取消应发未到标记
+            if(schedule.isLate2()){
+                schedule.setLate2(false);
+                LateAdjustHandle.remove(schedule);
+            }
+
             List<ScheduleRealInfo> ts = new ArrayList<>();
             ts.add(schedule);
             //调整终点时间和下一个班次的应到时间
@@ -827,9 +834,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             sch.setFcsjActualAll(fcsjActual);
             sch.addRemarks(remarks);
             sch.calcStatus();
+            if(sch.isLate2()){
+                //取消应发未到标记
+                sch.setLate2(false);
+                LateAdjustHandle.remove(sch);
+            }
             dayOfSchedule.save(sch);
-            //scheduleRealInfoRepository.save(sch);
             ts.add(sch);
@@ -1016,8 +1027,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                         t = fmtyyyyMMddHHmm.parseMillis(sch.getScheduleDateStr() + fcsjActual);
                     //调整实发
-                    if (!fcsjActual.equals(sch.getFcsjActual()))
+                    if (!fcsjActual.equals(sch.getFcsjActual())){
                         sch.setFcsjActualAll(t);
+
+                        //取消应发未到标记
+                        if(sch.isLate2()){
+                            sch.setLate2(false);
+                            LateAdjustHandle.remove(sch);
+                        }
+                    }
                 } else {
                     //撤销实发
                     if (sch.getFcsjActual() != null)
@@ -1108,6 +1126,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 //重新计算是否误点
                 schedule.reCalcLate();
+                //取消应发未到标记
+                if(schedule.isLate2()){
+                    schedule.setLate2(false);
+                    LateAdjustHandle.remove(schedule);
+                }
                 dayOfSchedule.save(schedule);
             }
@@ -4127,4 +4150,53 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         return rs;
     }
+
+    @Override
+    public Map<String, Object> lateAdjust(String idx, float minute) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count = 0;
+            List<ScheduleRealInfo> list = new ArrayList<>();
+            List<String> ids = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(idx);
+
+            ScheduleRealInfo sch;
+            for(String id : ids){
+                sch = dayOfSchedule.get(Long.parseLong(id));
+                if(sch != null && sch.getStatus() == 0){
+                    if(minute > 0){
+                        sch.setLateMinute(minute);
+                    }
+                    else if(minute == 0){
+                        LateAdjustHandle.remove(sch);
+                    }
+                    count ++;
+                    list.add(sch);
+                }
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("count", count);
+            rs.put("ts", list);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
+
+    @Override
+    public List<ScheduleRealInfo> allLate2(String idx) {
+        List<ScheduleRealInfo> rs = new ArrayList<>();
+        List<String> ids = Splitter.on(",").trimResults().omitEmptyStrings().splitToList(idx);
+
+        Collection<ScheduleRealInfo> all = LateAdjustHandle.allLateSch();
+        for(ScheduleRealInfo sch : all){
+            if(ids.indexOf(sch.getXlBm()) != -1){
+                rs.add(sch);
+            }
+        }
+        return rs;
+    }
 }
 \ No newline at end of file
@@ -176,7 +176,7 @@ public class SendUtils{
 	public void deviceOffline(GpsEntity gps){
 		Map<String, Object> map = new HashMap<>();
 		map.put("fn", "deviceOffline");
-		map.put("gps", gps);;
+		map.put("gps", gps);
 		ObjectMapper mapper = new ObjectMapper();
 		try {
@@ -199,4 +199,26 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 通知客户端，开始进行误点调整
+	 * @param sch
+	 */
+	public void sendAutoWdtz(ScheduleRealInfo sch, ScheduleRealInfo cancel){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "auto_wdtz");
+		map.put("id", sch.getId());
+		if(cancel != null)
+			map.put("cancelId", cancel.getId());
+		map.put("lineCode", sch.getXlBm());
+		map.put("minute", sch.getLateMinute());
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			socketHandler.sendMessageToLine(sch.getXlBm() ,mapper.writeValueAsString(map));
+
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -204,6 +204,6 @@ function createVehSearch($e){
 				return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
 		   }
 		}
-	})
+	});
 	return $e;
 }