青浦老版本地图因新版本数据不兼容的修正

王通
1 parent 7edb7de8
Showing 12 changed files with 21 additions and 22 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/gpsdata_v2/load/GatewayHttpLoader.java
src/main/java/com/bsth/data/gpsdata_v2/load/SocketClientLoader.java
src/main/resources/application-prod.properties
src/main/resources/application.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/mapmonitor/alone/wrap.html
src/main/resources/static/real_control_v2/main.html
src/main/resources/traffic-jdbc.properties
@@ -127,7 +127,7 @@ public class XDApplication implements CommandLineRunner {
         log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
-        gpsDataLoader.setFlag(-1);
+        GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 60, 4, TimeUnit.SECONDS);
         //实际排班更新线程
@@ -161,6 +161,7 @@ public class XDApplication implements CommandLineRunner {
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+        GpsDataLoaderThread.setFlag(-1);
         sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
@@ -76,7 +76,7 @@ public class GatewayHttpLoader implements ApplicationContextAware{
             list = JSON.parseArray(JSON.parseObject(sb.toString()).getString("data"), GpsEntity.class);
             //过滤掉无效的点位
-            list = GpsDataUtils.clearInvalid(list);
+            //list = GpsDataUtils.clearInvalid(list);
             List<GpsEntity> ups = new ArrayList<>();
             String nbbm;
@@ -13,7 +13,6 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -24,7 +23,6 @@ import java.util.List;
  * 从专用的socket client 加载数据
  * Created by panzhao on 2017/11/15.
  */
-@Component
 public class SocketClientLoader {
     static Logger logger = LoggerFactory.getLogger(SocketClientLoader.class);
@@ -2,15 +2,15 @@ server.port=9088
 management.port= 9001
 management.address= 127.0.0.1
-spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
+spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password= root2jsp@JSP
+spring.datasource.password= root@JSP2jsp
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -23,9 +23,7 @@ spring.datasource.test-on-return=true
 spring.datasource.test-while-idle=true
 spring.datasource.validation-query=select 1
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
 ## gateway real data
-http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/
+http.gps.real.url= http://192.168.40.82:8080/transport_server/rtgps/
 ## gateway send directive
-http.send.directive = http://10.10.150.21:8080/transport_server/message/
 \ No newline at end of file
+http.send.directive = http://192.168.40.82:8080/transport_server/message/
 \ No newline at end of file
 spring.profiles: dev,prod
-spring.profiles.active: dev
+spring.profiles.active: prod
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -4,6 +4,6 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.200.226:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
+ms.mysql.password= 123456
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				浦东公交调度系统 </a>
+				青浦公交调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">浦东公交调度系统</h3>
+        <h3 class="logo-text">青浦公交调度系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -18,7 +18,7 @@
     <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">浦东公交线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">青浦公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
 			<span class="top_username"></span> <span class="operation_mode_text animated" ></span> 
@@ -46,8 +46,10 @@
 		});
 		function getGpsSuccess(gpsList){
-			if(!gpsList || gpsList.length == 0)
+			if(!gpsList || !gpsList.gpsList || gpsList.gpsList.length == 0)
 				return;
+			
+			gpsList = gpsList.gpsList;
 			for(var i = 0, gps; gps=gpsList[i++];){
 				allGps[gps.deviceId] = gps;
@@ -55,7 +55,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 浦东公交线路调度
+                    <!--<i class="uk-icon-life-ring"></i>--> 青浦公交线路调度
                 </h2>
             </div>
         </div>
@@ -4,7 +4,7 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.21:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp@JSP
+ms.mysql.password= 123456