Merge branch 'minhang' into qingpu

# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
潘钊
2 parents 316f67ab 27c0d50e
Showing 16 changed files with 159 additions and 43 deletions
src/main/java/com/bsth/ServiceStateTest.java
src/main/java/com/bsth/WebAppConfiguration.java
src/main/java/com/bsth/data/match/Arrival2Schedule.java
src/main/java/com/bsth/data/match/ExpectArrivalEnd.java
src/main/java/com/bsth/oplog/db/DBHelper.java
src/main/java/com/bsth/oplog/http/HttpOpLogInterceptor.java
src/main/java/com/bsth/repository/SectionRepository.java
src/main/java/com/bsth/repository/StationRepository.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/impl/SectionServiceImpl.java
src/main/java/com/bsth/service/impl/StationServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -3,8 +3,8 @@ package com.bsth;
 public class ServiceStateTest {
 	public static void main(String[] args) {
-		System.out.println("运营状态：" + getService(268435456));
-		System.out.println("上下行：" + getUpOrDown(268435456));
+		System.out.println("运营状态：" + getService(603979776));
+		System.out.println("上下行：" + getUpOrDown(603979776));
 	}
 	/**
@@ -25,8 +25,8 @@ import com.bsth.websocket.handler.RealControlSocketHandler;
 @ComponentScan
 public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebSocketConfigurer{
-	@Autowired
-	HttpOpLogInterceptor httpOpLogInterceptor;
+//	@Autowired
+//	HttpOpLogInterceptor httpOpLogInterceptor;
 	/**
 	 * @Title: httpPutFormContentFilter 
@@ -63,11 +63,11 @@ public class WebAppConfiguration extends WebMvcConfigurerAdapter implements WebS
 	 * 
 	 * @Title: addInterceptors 
 	 * @Description: TODO(HTTP结构化访问日志记录 ) 
-	*/
+	
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(httpOpLogInterceptor);
-	}
+	}*/
 	@Override
 	public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
@@ -3,7 +3,9 @@ package com.bsth.data.match;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.slf4j.Logger;
@@ -42,6 +44,8 @@ public class Arrival2Schedule implements ApplicationContextAware {
 	private static Logger logger = LoggerFactory.getLogger(Arrival2Schedule.class);
+	private static Map<String, ExpectArrivalEnd> expectMap = new HashMap<>();
+	
 	/**
 	 * 
 	 * @Title: start 
@@ -209,14 +213,29 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		 * @Description: TODO(车辆发出) 
 		 */
 		public void carOut(MatchResult mr){
+			ScheduleRealInfo sch = mr.sch;
+			
+			if(expectMap.containsKey(nbbm)){
+				ExpectArrivalEnd ead = expectMap.get(nbbm);
+				if(mr.ts < ead.getEndTime())
+					return;
+				else
+					expectMap.remove(nbbm);
+			}
 			//设置发车时间
-			mr.sch.setFcsjActualAll(mr.ts);
+			sch.setFcsjActualAll(mr.ts);
 			//通知客户端
-			sendUtils.sendFcsj(mr.sch);
+			sendUtils.sendFcsj(sch);
 			//持久化
-			dayOfSchedule.save(mr.sch);
+			dayOfSchedule.save(sch);
 			//车辆当前执行班次
-			dayOfSchedule.addExecPlan(mr.sch);
+			dayOfSchedule.addExecPlan(sch);
+			//期望车辆到达的终点
+			ExpectArrivalEnd ead = new ExpectArrivalEnd();
+			ead.setNbbm(sch.getClZbh());
+			ead.setEndStation(sch.getZdzCode());
+			ead.setEndTime(sch.getZdsjT());
+			expectMap.put(ead.getNbbm(), ead);
 		}
 		/**
@@ -225,12 +244,23 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		 * @Description: TODO(车辆进入终点站) 
 		 */
 		public void carInStop(MatchResult mr){
-			mr.sch.setZdsjActualAll(mr.ts);
+			ScheduleRealInfo sch = mr.sch;
+			String nbbm=sch.getClZbh();
+			if(expectMap.containsKey(nbbm)){
+				ExpectArrivalEnd ead = expectMap.get(nbbm);
+				if(mr.ts < ead.getEndTime() 
+						&& !mr.sch.getZdzCode().equals(ead.getEndStation())){
+					return;
+				}
+				else
+					expectMap.remove(nbbm);
+			}
+			sch.setZdsjActualAll(mr.ts);
-			int doneSum = dayOfSchedule.doneSum(mr.sch.getClZbh());
-			ScheduleRealInfo next = dayOfSchedule.next(mr.sch);
+			int doneSum = dayOfSchedule.doneSum(nbbm);
+			ScheduleRealInfo next = dayOfSchedule.next(sch);
 			if(null != next){
-				next.setQdzArrDateSJ(mr.sch.getZdsjActual());
+				next.setQdzArrDateSJ(sch.getZdsjActual());
 				//下发调度指令
 				directiveService.send60Dispatch(next, doneSum, "到站@系统");
@@ -239,18 +269,18 @@ public class Arrival2Schedule implements ApplicationContextAware {
 					next.setFcsjActualAll(mr.ts);
 				//套跑  -下发线路切换指令
-				if(!next.getXlBm().equals(mr.sch.getXlBm()))
-					directiveService.lineChange(next.getClZbh(), next.getXlBm(), "套跑@系统");
+				if(!next.getXlBm().equals(sch.getXlBm()))
+					directiveService.lineChange(nbbm, next.getXlBm(), "套跑@系统");
 			}
 			else//下发文本指令（已结束运营）
-				directiveService.send60Phrase(nbbm, "到达终点 " + mr.sch.getZdzName() + "，已完成当日所有排班。", "系统");
+				directiveService.send60Phrase(nbbm, "到达终点 " + sch.getZdzName() + "，已完成当日所有排班。", "系统");
 			//通知客户端
-			sendUtils.sendZdsj(mr.sch, next, doneSum);
+			sendUtils.sendZdsj(sch, next, doneSum);
 			//持久化
-			dayOfSchedule.save(mr.sch);
-			logger.info(mr.sch.getClZbh() + "移除正在执行班次，" + mr.sch.getFcsj());
+			dayOfSchedule.save(sch);
+			logger.info(sch.getClZbh() + "移除正在执行班次，" + sch.getFcsj());
 			//移除车辆正在执行班次索引
-			dayOfSchedule.removeExecPlan(mr.sch.getClZbh());
+			dayOfSchedule.removeExecPlan(nbbm);
 		}
 		/**
@@ -334,4 +364,14 @@ public class Arrival2Schedule implements ApplicationContextAware {
 		dayOfSchedule = arg0.getBean(DayOfSchedule.class);
 		directiveService = arg0.getBean(DirectiveService.class);
 	}
+	
+	/**
+	 * 
+	 * @Title: removeExpect 
+	 * @Description: TODO(清除预期站点) 
+	 * @param @param nbbm   
+	 */
+	public void removeExpect(String nbbm){
+		expectMap.remove(nbbm);
+	}
 }
+package com.bsth.data.match;
+
+/**
+ * 
+ * @ClassName: ExpectArrivalEnd 
+ * @Description: TODO(期望车辆在某个时间段到达某个终点........) 
+ * @author PanZhao 
+ * @date 2016年11月2日 下午8:04:43 
+ *
+ */
+public class ExpectArrivalEnd {
+	
+	private String nbbm;
+	
+	private String endStation;
+	
+	private Long endTime;
+
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getEndStation() {
+		return endStation;
+	}
+
+	public void setEndStation(String endStation) {
+		this.endStation = endStation;
+	}
+
+	public Long getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Long endTime) {
+		this.endTime = endTime;
+	}
+}
@@ -37,7 +37,7 @@ public class DBHelper implements CommandLineRunner{
 		@Override
 		public void run() {
-			//persistence.batchSave(buffer);
+			persistence.batchSave(buffer);
 		}
 	}
@@ -19,7 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
  * @date 2016年10月20日 上午12:03:11
  *
  */
-@Component
+//@Component
 public class HttpOpLogInterceptor implements HandlerInterceptor {
 	private final PathMatcher pathMatcher = new AntPathMatcher();
@@ -58,7 +58,7 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 			"VALUES (?1 , ?2 , ?3 , ?4 , ?5 , "+
-					"?6 , GEOMFROMTEXT(?7) , GEOMFROMTEXT(?8) , ?9 , ?10 ,"+
+					"?6 , ST_GeomFromText(?7) , ST_GeomFromText(?8) , ?9 , ?10 ,"+
 					"?11 , ?12 , ?13 , ?14 , ?15 ,"+
@@ -83,8 +83,8 @@ public interface SectionRepository extends BaseRepository&lt;Section, Integer&gt; {
 	@Transactional
     @Modifying
 	@Query(value="UPDATE bsth_c_section SET " +
-				"gsection_vector = GEOMFROMTEXT(?2) , " +
-				"bsection_vector = GEOMFROMTEXT(?3)," +
+				"gsection_vector = ST_GeomFromText(?2) , " +
+				"bsection_vector = ST_GeomFromText(?3)," +
 				"section_code = ?4," +
 				"section_name = ?5," +
 				"croses_road = ?6," +
@@ -61,7 +61,7 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     			 "create_by,update_by,id) " +
     			 " VALUES(" +
     			 "?1 , ?2 , ?3 , ?4 , ?5," +
-    			 "?6 , ?7 , ?8 , ?9 , GeomFromText(?10),GeomFromText(?11)," +
+    			 "?6 , ?7 , ?8 , ?9 , ST_GeomFromText(?10),ST_GeomFromText(?11)," +
     			 "?12 ,?13, ?14, ?15, ?16," +
     			 "?17,?18,?19)", nativeQuery=true)
 	public void stationSave(String stationCode,String stationName,String roadCoding,String dbType,String bJwpoints,
@@ -93,8 +93,8 @@ public interface StationRepository extends BaseRepository&lt;Station, Integer&gt; {
     		"g_laty =  ?7  , " +
     		"x =  ?8  , " +
     		"y = ?9  , " +
-    		"b_polygon_grid = GeomFromText(?10)  , " +
-    		"g_polygon_grid = GeomFromText(?11)  , " +
+    		"b_polygon_grid = ST_GeomFromText(?10)  , " +
+    		"g_polygon_grid = ST_GeomFromText(?11)  , " +
     		"destroy = ?12  , " +
     		"radius = ?13  , " +
     		"shapes_type = ?14  , " +
@@ -274,8 +274,10 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
 					return null;
 				}
 			}
-			upDown = gpsData.getUpDown();
-			state = gpsData.getState();
+			else{
+				upDown = gpsData.getUpDown();
+				state = gpsData.getState();
+			}
 		} else {
 			upDown = Integer.parseInt(sch.getXlDir());
 			state = 0;
@@ -181,10 +181,14 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
 			// WGS坐标点集合
-			String gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+			String gsectionVector = null;
+			if(!sectionsWJPpoints.equals(""))
+				gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
 			// 原坐标点集合
-			String bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
+			String bsectionVectorS = null;
+			if(!sectionsBpoints.equals(""))
+				 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
@@ -1029,6 +1029,16 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
+			
 			// 保存站点
 			repository.stationSave(stationCod, stationName, roadCoding, dbType, bJwpoints, 
@@ -1219,9 +1229,16 @@ public class StationServiceImpl extends BaseServiceImpl&lt;Station, Integer&gt; implem
 			}
-			bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+			if(bPloygonGrid.equals(""))
+				bPloygonGrid = null;
+			else
+				bPloygonGrid = "POLYGON(("  + bPloygonGrid +"))";
+				
+			if(gPloygonGrid.equals(""))
+				gPloygonGrid = null;
+			else
+				gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
-			gPloygonGrid = "POLYGON(("  + gPloygonGrid +"))";
 			// 是否撤销
 			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
+import com.bsth.data.match.Arrival2Schedule;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -27,6 +28,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 	@Autowired
 	DayOfSchedule dayOfSchedule;
+	@Autowired
+	Arrival2Schedule arrival2Schedule;
+	
 	@Transactional
 	@Override
 	public Map<String, Object> save(ChildTaskPlan t) {
@@ -44,6 +48,9 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
 		dayOfSchedule.save(sch);
 		rs.put("t", sch);
+		
+		if(sch.getZdsjActual() == null)
+			arrival2Schedule.removeExpect(sch.getClZbh());
 		return rs;
 	}
@@ -8,9 +8,9 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://192.168.168.201:3306/qp_control
+spring.datasource.url= jdbc:mysql://127.0.0.1:3306/qp_control
 spring.datasource.username= root
-spring.datasource.password= 123456
+spring.datasource.password= panzhao
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -26,7 +26,7 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
-http.gps.real.url= http://192.168.168.192:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.168.201:9090/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.192:8080/transport_server/message/
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= 123456
+ms.mysql.password= panzhao
@@ -511,11 +511,14 @@ dl.relevance-active.intimity dd.tl-zzzx span.fcsj-diff {
     color: #5e5a5a
 }
-dl.relevance-active dd span.fcsj-diff,
 dl.relevance-active.intimity dd span.fcsj-diff {
     color: #d7d6d6;
 }
+dl.relevance-active dd span.fcsj-diff{
+    color: #aba6a6;
+}
+
 /*dl.relevance-active a {
     color: #dff0ff;
 }*/
@@ -275,7 +275,7 @@ var gb_schedule_table = (function() {
     //计算应发未发数量
     var calc_yfwf_num = function(lineCode){
-      console.log('calc_yfwf_num...', lineCode);
+
       var schArr=line2Schedule[lineCode]
         ,yfwf_num=0
         ,t = new Date().valueOf();
@@ -288,6 +288,7 @@ var gb_schedule_table = (function() {
   					yfwf_num ++;
       });
+      console.log('calc_yfwf_num...', lineCode, yfwf_num);
       $('#badge_yfwf_num_'+lineCode).text(yfwf_num);
     }