线调页面布局，调整包结构

潘钊
1 parent 5c7dc54f
Showing 18 changed files with 497 additions and 35 deletions
src/main/java/com/bsth/StartCommand.java
src/main/java/com/bsth/common/GetSchedulePlanThread.java
src/main/java/com/bsth/controller/realcontrol/DirectiveController.java
src/main/java/com/bsth/repository/schedule/SchedulePlanInfoRepository.java
src/main/java/com/bsth/util/DateUtils.java
src/main/java/com/bsth/vehicle/UpstreamEntrance.java
src/main/java/com/bsth/vehicle/directive/Consts.java
src/main/java/com/bsth/vehicle/directive/entity/Directive.java
src/main/java/com/bsth/vehicle/directive/entity/DirectiveData.java
src/main/java/com/bsth/vehicle/directive/entity/DispatchInstruct.java
src/main/java/com/bsth/gpsdata/thread/GpsBufferRefreshThread.java → src/main/java/com/bsth/vehicle/gpsdata/GpsRefreshThread.java
src/main/java/com/bsth/gpsdata/buffer/GpsRealDataBuffer.java → src/main/java/com/bsth/vehicle/gpsdata/buffer/GpsRealDataBuffer.java
src/main/java/com/bsth/gpsdata/controller/GpsDataController.java → src/main/java/com/bsth/vehicle/gpsdata/controller/GpsDataController.java
src/main/java/com/bsth/gpsdata/entity/GpsRealData.java → src/main/java/com/bsth/vehicle/gpsdata/entity/GpsRealData.java
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -11,8 +11,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
  
-import com.bsth.gpsdata.thread.GpsBufferRefreshThread;
+import com.bsth.common.GetSchedulePlanThread;
 import com.bsth.security.SecurityMetadataSourceService;
+import com.bsth.util.DateUtils;
+import com.bsth.vehicle.gpsdata.GpsRefreshThread;
  
 /**
  * 随应用启动运行
@@ -27,10 +29,13 @@ public class StartCommand implements CommandLineRunner{
 	@Autowired
 	SecurityMetadataSourceService invocationSecurityMetadataSourceService;
  
-	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+	public static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2);
  
 	@Autowired
-	GpsBufferRefreshThread gpsRefreshThread;
+	GpsRefreshThread gpsRefreshThread;
+	
+	@Autowired
+	GetSchedulePlanThread getSchedulePlanThread;
  
 	@Override
 	public void run(String... arg0){
@@ -43,7 +48,14 @@ public class StartCommand implements CommandLineRunner{
 			 * GPS实时数据更新线程，每次执行完成4秒后开始下一次
 			 * 如果抛出异常，后续执行将被取消
 			 */
-			scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
+			//scheduler.scheduleWithFixedDelay(gpsRefreshThread, 0, 4, TimeUnit.SECONDS);
+			
+			/**
+			 * 定时0点从计划排班表抓取当天实际排班
+			 */
+			//scheduler.scheduleAtFixedRate(getSchedulePlanThread
+			//		, 0//DateUtils.getTimesnight() - System.currentTimeMillis() / 1000
+			//		, 60 * 60 * 24, TimeUnit.SECONDS);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+package com.bsth.common;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.schedule.SchedulePlanInfoRepository;
+
+/**
+ * 
+ * @ClassName: GetSchedulePlanThread 
+ * @Description: TODO(从计划排班表抓取当天实际排班) 
+ * @author PanZhao
+ * @date 2016年6月6日 下午7:42:43 
+ *
+ */
+@Component
+public class GetSchedulePlanThread  extends Thread{
+
+	@Autowired
+	SchedulePlanInfoRepository schedulePlanInfoRepository;
+	
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+	
+	@Override
+	public void run() {
+		List<SchedulePlanInfo> list = schedulePlanInfoRepository.findByDate(/*sdf.format(new Date())*/"2016-06-01");
+		
+		
+		
+	}
+}
+package com.bsth.controller.realcontrol;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ * @ClassName: DirectiveController 
+ * @Description: TODO(调度指令) 
+ * @author PanZhao
+ * @date 2016年6月7日 上午9:52:11 
+ *
+ */
+@RestController
+@RequestMapping("/realcontrol/directive")
+public class DirectiveController {
+	
+}
-package com.bsth.repository.schedule;
-
-import com.bsth.entity.schedule.SchedulePlanInfo;
-import com.bsth.repository.BaseRepository;
-import org.springframework.stereotype.Repository;
-
-/**
- * Created by xu on 16/6/6.
- */
-@Repository
-public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
-}
+package com.bsth.repository.schedule;
+
+import com.bsth.entity.schedule.SchedulePlanInfo;
+import com.bsth.repository.BaseRepository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by xu on 16/6/6.
+ */
+@Repository
+public interface SchedulePlanInfoRepository extends BaseRepository<SchedulePlanInfo, Long> {
+	
+	@Query(value = "select * from bsth_c_s_sp_info where DATE_FORMAT(schedule_date, '%Y-%m-%d')=?1", nativeQuery = true)
+	List<SchedulePlanInfo> findByDate(String dateformat);
+}
+package com.bsth.util;
+
+import java.util.Calendar;
+
+public class DateUtils {
+
+	// 获得当天0点时间
+	public static int getTimesmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 0);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得当天24点时间
+	public static int getTimesnight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MINUTE, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得本周一0点时间
+	public static int getTimesWeekmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得本周日24点时间
+	public static int getTimesWeeknight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+		return (int) ((cal.getTime().getTime() + (7 * 24 * 60 * 60 * 1000)) / 1000);
+	}
+
+	// 获得本月第一天0点时间
+	public static int getTimesMonthmorning() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMinimum(Calendar.DAY_OF_MONTH));
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+
+	// 获得本月最后一天24点时间
+	public static int getTimesMonthnight() {
+		Calendar cal = Calendar.getInstance();
+		cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONDAY), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+		cal.set(Calendar.DAY_OF_MONTH, cal.getActualMaximum(Calendar.DAY_OF_MONTH));
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		return (int) (cal.getTimeInMillis() / 1000);
+	}
+}
+package com.bsth.vehicle;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 
+ * @ClassName: UpstreamEntrance 
+ * @Description: TODO(车载网关上行入口) 
+ * @author PanZhao
+ * @date 2016年6月7日 下午3:00:01 
+ *
+ */
+@RestController
+@RequestMapping("/control/upstream")
+public class UpstreamEntrance {
+
+}
+package com.bsth.vehicle.directive;
+
+public class Consts {
+	/**
+	 * 调度指令 -多营运状态 [0][0]上行营运 [0][1]上行非营运 [1][0]下行营运 [1][1]下行非营运
+	 */
+	public static final int[][] SERVICE_STATE = { { 0, 0x02000000 }, { 0x10000000, 0x12000000 } };
+}
+package com.bsth.vehicle.directive.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName: Directive 
+ * @Description: TODO(调度指令) 
+ * @author PanZhao
+ * @date 2016年6月7日 上午10:21:59 
+ *
+ */
+@Entity
+@Table(name = "bsth_v_directive")
+public class Directive {
+
+	@Id
+    @GeneratedValue
+	private Integer id;
+	
+	//一级协议
+	private short operCode;
+	
+	//数据
+	private DirectiveData data;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public short getOperCode() {
+		return operCode;
+	}
+
+	public void setOperCode(short operCode) {
+		this.operCode = operCode;
+	}
+
+	public DirectiveData getData() {
+		return data;
+	}
+
+	public void setData(DirectiveData data) {
+		this.data = data;
+	}
+}
+package com.bsth.vehicle.directive.entity;
+
+import javax.persistence.Embeddable;
+
+@Embeddable
+public class DirectiveData {
+	// 公司代码
+	private short companyCode;
+
+	// 设备号
+	private String deviceId;
+
+	// 时间戳
+	private Long timestamp;
+
+	// 保留 默认0
+	private short instructType = 0;
+
+	/*
+	 * 调度指令 调度指令。 0X00表示信息短语 0X01表示取消上次指令+调度指令(闹钟有效) 0x02表示为调度指令(闹钟有效)
+	 * 0x03表示运营状态指令(闹钟无效) 0x04表示其他指令
+	 */
+	private DispatchInstruct dispatchInstruct;
+
+	// 唯一标识
+	private Long msgId;
+
+	// 闹钟
+	private Long alarmTime;
+
+	// 多个运营状态字节
+	private Long serviceState;
+
+	// 消息文本
+	private String txtContent;
+
+	public short getCompanyCode() {
+		return companyCode;
+	}
+
+	public void setCompanyCode(short companyCode) {
+		this.companyCode = companyCode;
+	}
+
+	public String getDeviceId() {
+		return deviceId;
+	}
+
+	public void setDeviceId(String deviceId) {
+		this.deviceId = deviceId;
+	}
+
+	public Long getTimestamp() {
+		return timestamp;
+	}
+
+	public void setTimestamp(Long timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public short getInstructType() {
+		return instructType;
+	}
+
+	public void setInstructType(short instructType) {
+		this.instructType = instructType;
+	}
+
+	public DispatchInstruct getDispatchInstruct() {
+		return dispatchInstruct;
+	}
+
+	public void setDispatchInstruct(DispatchInstruct dispatchInstruct) {
+		this.dispatchInstruct = dispatchInstruct;
+	}
+
+	public Long getMsgId() {
+		return msgId;
+	}
+
+	public void setMsgId(Long msgId) {
+		this.msgId = msgId;
+	}
+
+	public Long getAlarmTime() {
+		return alarmTime;
+	}
+
+	public void setAlarmTime(Long alarmTime) {
+		this.alarmTime = alarmTime;
+	}
+
+	public Long getServiceState() {
+		return serviceState;
+	}
+
+	public void setServiceState(Long serviceState) {
+		this.serviceState = serviceState;
+	}
+
+	public String getTxtContent() {
+		return txtContent;
+	}
+
+	public void setTxtContent(String txtContent) {
+		this.txtContent = txtContent;
+	}
+}
+package com.bsth.vehicle.directive.entity;
+
+/**
+ * 
+ * @ClassName: DispatchInstruct
+ * @Description: TODO(调度指令)
+ * @author PanZhao
+ * @date 2016年6月7日 下午2:15:10
+ *
+ */
+public enum DispatchInstruct {
+	// 信息短语
+	PHRASE((byte) 0x00),
+	// 取消上次指令+调度指令(闹钟有效)
+	CANCEL_AND_CLOCK_ON((byte) 0x01),
+	// 调度指令(闹钟有效)
+	DISPATCH_CLOCK_ON((byte) 0x02),
+	// 运营状态指令(闹钟无效)
+	OPERATE_CLOCK_OFF((byte) 0x03),
+	// 其他
+	OTHER((byte) 0x04);
+
+	private final byte value;
+
+	DispatchInstruct(byte value) {
+		this.value = value;
+	}
+
+	public byte getValue() {
+		return value;
+	}
+}
-package com.bsth.gpsdata.thread;
+package com.bsth.vehicle.gpsdata;
  
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -19,9 +19,9 @@ import org.springframework.stereotype.Component;
  
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
-import com.bsth.gpsdata.entity.GpsRealData;
 import com.bsth.util.Tools;
+import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
+import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.collect.ImmutableMap;
  
 /**
@@ -33,15 +33,15 @@ import com.google.common.collect.ImmutableMap;
  *
  */
 @Component
-public class GpsBufferRefreshThread extends Thread{
+public class GpsRefreshThread extends Thread{
  
-	private static Logger logger = LoggerFactory.getLogger(GpsBufferRefreshThread.class);
+	private static Logger logger = LoggerFactory.getLogger(GpsRefreshThread.class);
  
 	//接口地址
 	private static String url;
  
  
-	public GpsBufferRefreshThread() {
+	public GpsRefreshThread() {
 		Tools t = new Tools("application.properties");
 		url = t.getValue("http.gps.real.url");
 	}
-package com.bsth.gpsdata.buffer;
+package com.bsth.vehicle.gpsdata.buffer;
  
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -14,9 +14,9 @@ import org.springframework.stereotype.Component;
  
 import com.bsth.entity.Cars;
 import com.bsth.entity.Station;
-import com.bsth.gpsdata.entity.GpsRealData;
 import com.bsth.repository.CarsRepository;
 import com.bsth.repository.StationRepository;
+import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ListMultimap;
-package com.bsth.gpsdata.controller;
+package com.bsth.vehicle.gpsdata.controller;
  
 import java.util.List;
  
@@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import com.bsth.gpsdata.buffer.GpsRealDataBuffer;
-import com.bsth.gpsdata.entity.GpsRealData;
+import com.bsth.vehicle.gpsdata.buffer.GpsRealDataBuffer;
+import com.bsth.vehicle.gpsdata.entity.GpsRealData;
 import com.google.common.base.Splitter;
  
 @RestController
-package com.bsth.gpsdata.entity;
+package com.bsth.vehicle.gpsdata.entity;
  
 /**
  * 
@@ -804,6 +804,7 @@ height: 400px;
     background-color: #E4D3D3;
     text-align: center;
     font-family: arial;
+    color: #433833;
 }
  
 .tab_line .panel-wrap ._panel ._body .pb-table tr td:nth-child(2)
@@ -841,10 +842,19 @@ height: 400px;
 .pb-table tr{
 	cursor: default;
 }
+.pb-table tr td{
+	transition: all .3s ease;
+}
+
 .pb-table tr.active-menu td{
-	border-left: 0;
+    border-left: 0;
     border-right: 0;
-    background: #A8B4E4;
+    background: #666;
+    color: white
+}
+
+.pb-table tr.active-menu td a{
+	color: #93AAEF !important;
 }
  
 /* .pb-table tr:hover td{
@@ -939,6 +949,11 @@ height: 400px;
     line-height: 35px;
     background: #7EBBAF;
     color: white;
+    cursor: pointer;
+}
+
+._panel_footer:hover{
+	background: #71A79C;
 }
  
 .log-item{
@@ -1128,6 +1143,28 @@ height: 400px;
     pointer-events: auto;
 }
  
+._panel_footer .popover{
+	color: black;
+	max-width: 500px;
+}
+
+.tg-question-table tr td{
+	border-bottom: 1px solid #F7F7F7;
+	font-family: 微软雅黑;
+}
+
+.tg-question-table tr td:nth-child(1){
+    text-align: right;
+    width: 80px;
+    padding-right: 10px;
+    height: 24px;
+}
+
+.tg-question-table tr td:nth-child(2){
+	font-size: 12px;
+	color: gray;
+}
+
 /* .menu-item:hover > .menu {
     -webkit-transition-delay: 100ms;
     transition-delay: 300ms;
@@ -533,8 +533,9 @@
 								</div>
 								</div>
 							</div>
-							<div class="_panel_footer">
+							<div class="_panel_footer" id="tgTools">
 								托管状态，计算机自动处理
+								 &nbsp;<i id="tgQuestion" class="fa fa-question-circle" style="cursor: pointer;"></i>
 							</div>
 						</div>
 					</div>
@@ -674,6 +675,7 @@ $(function() {
  	getTemp('temps/home_tp.html');
  	getTemp('temps/home_table_tp.html');
  	getTemp('temps/tooltip_tp.html');
+ 	getTemp('temps/alone_tp.html');
  
 	function getTemp(url){
 		$.get(url, function(template){
@@ -12,12 +12,34 @@ var _alone = (function(){
 				height: '100%'
 			})
  
+			/*$('#tgTools').tooltip({
+				title: '取消托管，切换为人工处理'
+			});*/
+			
+			$('#tgTools').on('click', function(){
+				layer.confirm('取消托管，切换为人工处理？', {
+					btn : [ '确定', '取消' ],
+					icon : 3,
+				}, function(){
+					
+				});
+			});
+			
+			//托管Question
+			$('#tgQuestion').popover({
+				content: template('tg_question_info_temp', {}),
+				html: true,
+				placement: 'left',
+				trigger: 'hover'
+			});
+			
+			//表格右键呼出菜单
 			$('.pb-table tr').on('contextmenu', function(e){
 				e.preventDefault();
 				$('.pb-table tr.active-menu').removeClass('active-menu');
  
 				var tr = $(this);
-	            showMenu(e.pageX, e.pageY);
+	            showMenu(e.pageX, e.pageY + 3);
  
 	            tr.addClass('active-menu');
 	            $(document).one('click', function(){
@@ -30,10 +52,11 @@ var _alone = (function(){
  
  
     function showMenu(x, y) {
-		var menu = $('#rightMenu');
-        docWidth = $(document).width(), docHeight = $(document).height(),
+		var menu = $('#rightMenu'),
+        	docWidth = $(document).width(), docHeight = $(document).height(),
             menuHeight = menu.height(),
-            menuWidth = menu.width();
+            menuWidth = menu.width(),
+            offset = 12;
         /* 边界 */
         if (y > (docHeight - menuHeight)) {
             y = docHeight - menuHeight - offset;
+<!-- 单线路调度模板 -->
+
+<!-- 托管状态描述 -->
+<script id="tg_question_info_temp" type="text/html">
+<table class="tg-question-table">
+	<tr>
+		<td>恢复运营</td>
+		<td class="font-blue-steel">同意（切换营运状态）</td>
+	</tr>
+	<tr>
+		<td>申请调档</td>
+		<td class="font-blue-steel">同意</td>
+	</tr>
+	<tr>
+		<td>出场请求</td>
+		<td class="font-blue-steel">同意</td>
+	</tr>
+	<tr>
+		<td>进场请求</td>
+		<td class="font-blue-steel">同意（切换非营运状态）</td>
+	</tr>
+	<tr>
+		<td>加油请求</td>
+		<td class="font-blue-steel">同意</td>
+	</tr>
+	<tr>
+		<td>车辆故障</td>
+		<td>不处理</td>
+	</tr>
+	<tr>
+		<td>路阻报告</td>
+		<td>不处理</td>
+	</tr>
+	<tr>
+		<td>事故报告</td>
+		<td>不处理</td>
+	</tr>
+	<tr>
+		<td>扣证纠纷 </td>
+		<td>不处理</td>
+	</tr>
+	<tr>
+		<td>报警</td>
+		<td>不处理</td>
+	</tr>
+</table>
+</script>
 \ No newline at end of file