update...

潘钊
1 parent 0ea46b62
Showing 8 changed files with 351 additions and 44 deletions
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/signal/SchSiginUpdateDBThread.java
src/main/java/com/bsth/data/schedule/signal/SignalComplateHandler.java
src/main/java/com/bsth/data/schedule/signal/entity/SchSiginCompate.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/resources/static/pages/summary/work_hours/list.html
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(15);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(16);
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -11,6 +11,7 @@ import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.edit_logs.SeiPstThread;
 import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
+import com.bsth.data.schedule.signal.SchSiginUpdateDBThread;
 import com.bsth.data.schedule.thread.CalcOilThread;
 import com.bsth.data.schedule.thread.SchedulePstThread;
 import com.bsth.data.schedule.thread.ScheduleRefreshThread;
@@ -61,6 +62,7 @@ public class XDApplication implements CommandLineRunner {
     SeiPstThread seiPstThread;
     @Autowired
     SampleTimeDataLoader sampleTimeDataLoader;
+    SchSiginUpdateDBThread schSiginUpdateDBThread;
     private static long timeDiff;
     private static long timeDiffTraffic;
@@ -140,8 +142,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
         //线路首末班数据（网关用，班次更新时写入）
         //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
-        //靠GPS信号无法自动完成的班次信息（网关用，补信号）
-
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 60, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
@@ -163,6 +163,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             //实发时间
             sch.setFcsjActualAll(rsT);
+            sch.setSiginCompate(1);
             //通知客户端
             sendUtils.sendFcsj(sch);
             //持久化
@@ -316,7 +317,7 @@ public class InOutStationSignalHandle extends SignalHandle{
             long rsT = lineConfigData.applyIn(sch, gps.getTimestamp());
             sch.setZdsjActualAll(rsT);
-
+            sch.setSiginCompate(2);
             //通知误点停靠程序，有车辆到站
             LateAdjustHandle.carArrive(gps);
+package com.bsth.data.schedule.signal;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by panzhao on 2017/8/14.
+ */
+@Component
+public class SchSiginUpdateDBThread extends Thread{
+
+    SignalComplateHandler signalComplateHandler;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+        try{
+            signalComplateHandler.handler();
+        }catch (Exception e){
+            logger.error("", e);
+        }
+    }
+}
+package com.bsth.data.schedule.signal;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.signal.entity.SchSiginCompate;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.util.db.DBUtils_MS;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 班次信号补全（写入数据库，网关以补发的形式提交运管处）
+ * Created by panzhao on 2017/8/13.
+ */
+@Component
+public class SignalComplateHandler {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public void handler(){
+        Collection<ScheduleRealInfo> all = dayOfSchedule.findAll();
+        List<SchSiginCompate> list = new ArrayList<>();
+
+        SchSiginCompate siginCompate;
+        Date d = new Date();
+        long et = System.currentTimeMillis() - (1000 * 60 * 60 * 2),
+            st = et - (1000 * 60 * 60 * 2);
+        for(ScheduleRealInfo sch : all){
+            if(sch.getDfsjT() > et || sch.getDfsjT() < st)
+                continue;
+
+            //能自动完成的
+            if(sch.getSiginCompate() >= 2)
+                continue;
+
+            //烂班
+            if(sch.isDestroy())
+                continue;
+
+            //空驶任务
+            if(dayOfSchedule.emptyService(sch))
+                continue;
+
+            siginCompate = new SchSiginCompate(sch);
+            if(siginCompate == null || StringUtils.isEmpty(siginCompate.getDeciveId()))
+                continue;
+
+            //标记已经补发
+            sch.setSiginCompate(3);
+            siginCompate.setCreateDate(d);
+            list.add(siginCompate);
+        }
+
+        put(list);
+    }
+
+    public void put(final List<SchSiginCompate> list){
+        if(null == list || list.size() == 0)
+            return;
+
+        JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
+        //编程式事务
+        DataSourceTransactionManager tran = new DataSourceTransactionManager(jdbcTemp.getDataSource());
+        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
+        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
+        TransactionStatus status = tran.getTransaction(def);
+
+        try{
+            jdbcTemp.batchUpdate("insert into bsth_t_sigin_complate(id, rq, line_code, decive_id, up_down, s_code, e_code, st, et, create_date, status) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", new BatchPreparedStatementSetter() {
+                @Override
+                public void setValues(PreparedStatement ps, int i) throws SQLException {
+                    SchSiginCompate sc = list.get(i);
+                    ps.setLong(1, sc.getId());
+                    ps.setString(2, sc.getRq());
+                    ps.setString(3, sc.getLineCode());
+                    ps.setString(4, sc.getDeciveId());
+                    ps.setInt(5, sc.getUpDown());
+                    ps.setString(6, sc.getsCode());
+                    ps.setString(7, sc.geteCode());
+                    ps.setLong(8, sc.getSt());
+                    ps.setLong(9, sc.getEt());
+                    ps.setDate(10, new java.sql.Date(sc.getCreateDate().getTime()));
+                    ps.setInt(11, sc.getStatus());
+                }
+
+                @Override
+                public int getBatchSize() {
+                    return list.size();
+                }
+            });
+
+            tran.commit(status);
+            log.info("补信号班次入库，" + list.size());
+        }catch (Exception e){
+            log.error("", e);
+            tran.rollback(status);
+        }
+    }
+
+
+}
+package com.bsth.data.schedule.signal.entity;
+
+import com.bsth.data.BasicData;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Date;
+
+/**
+ * 班次信号补偿
+ * Created by panzhao on 2017/8/13.
+ */
+public class SchSiginCompate {
+
+    /** 实际班次ID */
+    private long id;
+
+    /** 班次日期 */
+    private String rq;
+
+    /** 线路编码 */
+    private String lineCode;
+
+    /** 设备号 */
+    private String deciveId;
+
+    /** 上下行 */
+    private int upDown;
+
+    /** 起始站编码 */
+    private String sCode;
+
+    /** 终点站编码 */
+    private String eCode;
+
+    /** 开始时间戳 */
+    private long st;
+
+    /** 结束时间戳 */
+    private long et;
+
+    /** 入库时间 */
+    private Date createDate;
+
+    private int status = 0;
+
+    public SchSiginCompate(ScheduleRealInfo sch) {
+        this.id = sch.getId();
+        this.rq = sch.getScheduleDateStr();
+        this.lineCode = sch.getXlBm();
+        this.upDown = Integer.parseInt(sch.getXlDir());
+        this.deciveId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+        this.sCode = sch.getQdzCode();
+        this.eCode = sch.getZdzCode();
+        this.st = sch.getDfsjT();
+        this.et = sch.getZdsjT();
+
+        if(sch.getFcsjActualTime() != null)
+            this.st = sch.getFcsjActualTime();
+        if(sch.getZdsjActualTime() != null)
+            this.et = sch.getZdsjActualTime();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getDeciveId() {
+        return deciveId;
+    }
+
+    public void setDeciveId(String deciveId) {
+        this.deciveId = deciveId;
+    }
+
+    public int getUpDown() {
+        return upDown;
+    }
+
+    public void setUpDown(int upDown) {
+        this.upDown = upDown;
+    }
+
+    public String getsCode() {
+        return sCode;
+    }
+
+    public void setsCode(String sCode) {
+        this.sCode = sCode;
+    }
+
+    public String geteCode() {
+        return eCode;
+    }
+
+    public void seteCode(String eCode) {
+        this.eCode = eCode;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
@@ -214,6 +214,9 @@ public class ScheduleRealInfo {
 	@JsonIgnore
 	private int saveFailCount=0;
+	/** 是否需要补充GPS信号 （网关提交至运管处动态数据用） 1: 能发车， 2：能到达  3: 补发过*/
+	private int siginCompate;
+
 	public boolean isDfAuto() {
 		return dfAuto;
 	}
@@ -303,10 +306,10 @@ public class ScheduleRealInfo {
 		String old = this.getRemarks();
 		if(StringUtils.isBlank(old))
 			old = "";
-		
+
 		old += remark + ";";
 		this.setRemarks(old);
-		
+
 	}
 	public Long getId() {
@@ -622,12 +625,12 @@ public class ScheduleRealInfo {
 		this.dfsjT = dfsjT;
 		this.dfsj = fmtHHmm.print(this.dfsjT);
 	}
-	
+
 	public void setDfsjAll(String dfsj) {
 		this.dfsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + dfsj);
 		this.dfsj = dfsj;
 	}
-	
+
 	public void calcEndTime(){
 		//计划终点时间
 		if(this.getBcsj() != null){
@@ -665,33 +668,33 @@ public class ScheduleRealInfo {
 	public void setSflj(boolean sflj) {
 		this.sflj = sflj;
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjAll 
-	 * @Description: TODO(设置计划发车时间) 
+	 *
+	 * @Title: setFcsjAll
+	 * @Description: TODO(设置计划发车时间)
 	 * @throws
 	 */
 	public void setFcsjAll(String fcsj){
 		this.fcsjT = fmtyyyyMMddHHmm.parseMillis(this.realExecDate + fcsj);
 		this.fcsj = fcsj;
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjAll 
-	 * @Description: TODO(设置计划发车时间) 
+	 *
+	 * @Title: setFcsjAll
+	 * @Description: TODO(设置计划发车时间)
 	 * @throws
 	 */
 	public void setFcsjAll(Long fcsjT){
 		this.fcsjT = fcsjT;
 		this.fcsj = fmtHHmm.print(fcsjT);
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间 字符串) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 字符串)
 	 * @throws
 	 */
 	public void setFcsjActualAll(String fcsjActual){
@@ -699,11 +702,11 @@ public class ScheduleRealInfo {
 		this.fcsjActual = fcsjActual;
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际发车时间 时间戳) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际发车时间 时间戳)
 	 * @throws
 	 */
 	public void setFcsjActualAll(Long t){
@@ -713,25 +716,25 @@ public class ScheduleRealInfo {
 		//更新班次状态
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际终点时间) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
 	 * @throws
 	 */
 	public void setZdsjActualAll(Long t){
 		this.zdsjActualTime = t;
 		this.zdsjActual = fmtHHmm.print(t);
-		
+
 		//更新班次状态
 		calcStatus();
 	}
-	
+
 	/**
-	 * 
-	 * @Title: setFcsjActualAll 
-	 * @Description: TODO(设置实际终点时间) 
+	 *
+	 * @Title: setFcsjActualAll
+	 * @Description: TODO(设置实际终点时间)
 	 * @throws
 	 */
 	public void setZdsjActualAll(String zdsjActual){
@@ -740,7 +743,7 @@ public class ScheduleRealInfo {
 		calcStatus();
 	}
-	
+
 	public Long getSpId() {
 		return spId;
 	}
@@ -760,11 +763,11 @@ public class ScheduleRealInfo {
 	public void calcStatus() {
 		if(this.status == -1)
 			return;
-		
+
 		this.status = 0;
 		if(StringUtils.isNotBlank(this.fcsjActual)){
 			this.status = 1;
-			
+
 			//进出场班次并且没有计划里程的
 			if((this.bcType.equals("out") || this.bcType.equals("in"))
 					&& this.jhlc == null){
@@ -774,7 +777,7 @@ public class ScheduleRealInfo {
 		if(StringUtils.isNotBlank(this.zdsjActual))
 			this.status = 2;
 	}
-	
+
 	public void destroy(){
 		this.jhlc = 0.0;
 		if(this.isSflj())
@@ -782,11 +785,11 @@ public class ScheduleRealInfo {
 		this.status = -1;
 		this.clearFcsjActual();
 	}
-	
+
 	public boolean isDestroy(){
 		return this.status == -1;
 	}
-	
+
 /*	public boolean isNotDestroy(){
 		return this.status != -1;
 	}*/
@@ -806,18 +809,18 @@ public class ScheduleRealInfo {
 	public void setScheduleDateStr(String scheduleDateStr) {
 		this.scheduleDateStr = scheduleDateStr;
 	}
-	
+
 	public void clearFcsjActual(){
 		this.setFcsjActual(null);
 		this.setFcsjActualTime(null);
 		this.calcStatus();
 	}
-	
+
 	//清除实际终点时间
 	public void clearZdsjActual(){
 		this.setZdsjActual(null);
 		this.setZdsjActualTime(null);
-		
+
 		calcStatus();
 	}
@@ -922,4 +925,12 @@ public class ScheduleRealInfo {
 	public void setSaveFailCount(int saveFailCount) {
 		this.saveFailCount = saveFailCount;
 	}
+
+	public int getSiginCompate() {
+		return siginCompate;
+	}
+
+	public void setSiginCompate(int siginCompate) {
+		this.siginCompate = siginCompate;
+	}
 }
@@ -263,8 +263,8 @@
     }
     //日期选择器
-    $('[name=rq_eq]', f).val('2017-07-31');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-31', minDate: '2017-07-01'});
+    $('[name=rq_eq]', f).val('2017-08-03');
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-08-03', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框