Merge branch 'minhang' into qingpu

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

Merge branch 'minhang' into qingpu
# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java # src/main/java/com/bsth/data/gpsdata/GpsRealData.java
潘钊
2 parents be81722e be363bc7
Showing 15 changed files with 67 additions and 30 deletions
src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
src/main/java/com/bsth/data/directive/FirstScheduleCheckThread.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/resources/application-dev.properties
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task/add_sub_task_other.html
src/main/resources/static/real_control_v2/fragments/line_schedule/sch_table.html
src/main/resources/static/real_control_v2/fragments/north/tabs.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/data/data_basic.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/js/websocket/sch_websocket.js
@@ -51,7 +51,7 @@ public class ArrivalData_GPS implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("ArrivalData_GPS,30,10");
-		//Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(dataLoaderThread, 30, 10, TimeUnit.SECONDS);
 	}
 	@Component
@@ -43,9 +43,7 @@ public class FirstScheduleCheckThread extends Thread{
 			List<ScheduleRealInfo> schList;
 			ScheduleRealInfo first;
 			for(String car : cars){
-				if(car.equals("SXC-CD1004")){
-					System.out.println("debugger...");
-				}
+
 				schList = dayOfSchedule.findByNbbm(car);
 				if(null == schList || schList.size() == 0)
@@ -73,7 +73,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 7, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 6, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
@@ -189,6 +189,7 @@ public class GpsRealData implements CommandLineRunner{
 					String nbbm;
 					//附加车辆内部编码
+					Integer updown;
 					for(GpsEntity gps : list){
 						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
 						if(StringUtils.isBlank(nbbm))
@@ -197,6 +198,12 @@ public class GpsRealData implements CommandLineRunner{
 							gps.setNbbm(nbbm);
 						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
+						if(gps.getUpDown() == -1){
+							//如果走向未知，尝试根据站点纠正走向
+							updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
+							if(updown != null)
+								gps.setUpDown(updown);
+						}
 						gpsRealData.add(gps);
 					}
 				} else
@@ -118,13 +118,13 @@ public class DayOfSchedule implements CommandLineRunner {
 	@Override
 	public void run(String... arg0) throws Exception {
 		//翻班线程
-		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 120, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 20, 240, TimeUnit.SECONDS);
 		//入库
 		Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
 		//首班出场指令补发器
-		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 60, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 10, 120, TimeUnit.SECONDS);
 		//班次误点扫描
-		Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
+		//Application.mainServices.scheduleWithFixedDelay(scheduleLateThread, 60, 60, TimeUnit.SECONDS);
 	}
 	public Map<String, String> getCurrSchDate() {
@@ -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/mh_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
@@ -118,7 +118,7 @@
     <script>
         (function() {
             var modal = '#schedule-addsch-modal',
-                sch, stationRoutes, parks;
+                sch, stationRoutes, parks, information;
             $(modal).on('init', function(e, data) {
                 sch = data.sch;
                 var formHtml = template('schedule-addsch-form-temp', sch);
@@ -146,6 +146,8 @@
                 $.get('/basic/parks', function(rs){
                   parks=rs;
                 });
+                //线路标准
+                information=gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -194,12 +196,12 @@
                   var qdz=$('[name=qdzCode]', f),zdz=$('[name=zdzCode]', f);
                   switch (bcType_e.val()) {
                     case 'out':
-                      qdz.html(park_opts);
+                      qdz.html(park_opts).val(information.carPark);
                       zdz.html(opts);
                       break;
                     case 'in':
                       qdz.html(opts);
-                      zdz.html(park_opts);
+                      zdz.html(park_opts).val(information.carPark);
                       break;
                     default:
                       qdz.html(opts);
@@ -124,7 +124,7 @@
     <script>
         (function() {
             var modal = '#add-sub-task-other-modal',
-                sch, stationRoutes, parks;
+                sch, stationRoutes, parks, information;
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             $(modal).on('init', function(e, data) {
                 sch = data.sch;
@@ -153,6 +153,8 @@
                 $.get('/basic/parks', function(rs){
                   parks=rs;
                 });
+                //线路标准
+                information=gb_data_basic.getLineInformation(sch.xlBm);
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -185,12 +187,12 @@
                   var qdz=$('[name=startStation]', f),zdz=$('[name=endStation]', f);
                   switch ($(this).val()) {
                     case '3'://出场
-                      qdz.html(park_opts);
+                      qdz.html(park_opts).val(information.carPark);
                       zdz.html(opts);
                       break;
                     case '2'://进场
                       qdz.html(opts);
-                      zdz.html(park_opts);
+                      zdz.html(park_opts).val(information.carPark);
                       break;
                     default:
                       qdz.html(opts);
 <div>
   <script id="line-schedule-table-temp" type="text/html">
   <div class="schedule-wrap {{if dir==0}}up{{else}}down{{/if}}">
-      <h3 class="header-title">上行/江月路地铁站</h3>
+      <h3 class="header-title">
+        {{if dir==0}}
+          上行/{{line.startStationName}}
+        {{else}}
+          下行/{{line.endStationName}}
+        {{/if}}
+      </h3>
       <div class="schedule-body">
           <div class="ct_table_wrap">
               <div class="ct_table line-schedule-table">
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li class=""><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line"><a>{{line.name}}（0, 22）</a></li>
+        <li class="tab-line"><a>{{line.name}}（0, 0）</a></li>
         {{/each}}
     </ul>
   </script>
@@ -3,7 +3,7 @@
     <div class="uk-margin" id="north_toolbar_panel">
         <nav class="uk-navbar">
             <a class="uk-navbar-brand" >
-                <span><i class="uk-icon-user"></i> admin3，在线</span><i class="uk-icon-ellipsis-v"></i>
+                <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span>，在线</span><i class="uk-icon-ellipsis-v"></i>
             </a>
             <ul class="uk-navbar-nav">
               {{each list as obj i}}
@@ -2,10 +2,11 @@
 var gb_data_basic = (function() {
-    var stationRoutes,lineCode2NameAll;
-    var ep = EventProxy.create("stationRoutes", "lineCode2Name", function(routes, code2Name) {
+    var stationRoutes,lineCode2NameAll,lineInformations;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", function(routes, code2Name, informations) {
         stationRoutes = routes;
         lineCode2NameAll = code2Name;
+        lineInformations = informations;
         gb_main_ep.emitLater('data-basic');
     });
@@ -30,6 +31,16 @@ var gb_data_basic = (function() {
         ep.emit('stationRoutes', gb_common.groupBy(list, 'lineCode'));
     });
+    //线路标准信息
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function(rs){
+        var informations={};
+          $.each(rs, function(){
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+          });
+          ep.emit('lineInformations', informations);
+    });
+
     //line code to name
     $.get('/basic/lineCode2Name', function(rs){
       ep.emit('lineCode2Name', rs);
@@ -52,6 +63,9 @@ var gb_data_basic = (function() {
       return null;
     }
+    var getLineInformation=function(lineCode){
+      return lineInformations[lineCode];
+    }
     //文件载入完毕
     res_load_ep.emitLater('load_data_basic');
@@ -59,6 +73,7 @@ var gb_data_basic = (function() {
         activeLines: activeLines,
         line_idx: line_idx,
         codeToLine: codeToLine,
+        getLineInformation: getLineInformation,
         stationRoutes: function(lineCode){return stationRoutes[lineCode]},
         findLineByCodes: findLineByCodes,
         lineCode2NameAll: function(){return lineCode2NameAll},
@@ -47,6 +47,7 @@ var gb_schedule_table = (function() {
                 for (var upDown in dirData) {
                     htmlStr = temps['line-schedule-table-temp']({
                         dir: upDown,
+                        line: gb_data_basic.codeToLine[lineCode],
                         list: dirData[upDown]
                     });
@@ -22,7 +22,7 @@ var gb_main_ep = new EventProxy(),
             gb_home_line_panel.init(g_emit('gps-time-refresh'));
         });
-        //start fixed time refresh
+        //start fixed time refresh gps
         eq.once('gps-time-refresh', function() {
             gb_data_gps.fixedTimeRefresh();
             g_emit('line-schedule-layout')();
@@ -3,6 +3,7 @@
 var gb_northToolbar = (function() {
   var modal_opts={center: true,bgclose: false};
+  var currentUser;
   $.get('/real_control_v2/fragments/north/toolbar.html', function(temp){
     ep.emit("template", temp);
@@ -12,14 +13,19 @@ var gb_northToolbar = (function() {
     ep.emit("data", data);
   });
-  var ep = EventProxy.create("template", "data", function (temp, data) {
+  //当前用户信息
+  $.get('/user/currentUser', function(user){
+    ep.emit("user", user);
+  });
+
+  var ep = EventProxy.create("template", "data", "user" , function (temp, data, user) {
+    currentUser=user;
     var t = $('#north-toolbar-temp', temp).html()
-        ,htmlStr = template.render(t)({list: data});
+        ,htmlStr = template.render(t)({list: data, user: currentUser});
     $('.north .north-toolbar').html(htmlStr);
     //exit
     $('.north .north-toolbar .exit-system').on('click', function(){
-      alert(11);
       //关闭websocket 连接
       gb_sch_websocket.sock.close();
       window.location.href='/pages/control/lineallot/allot.html';
@@ -35,11 +35,11 @@ var gb_sch_websocket = (function() {
     //80协议上报
     var report80 = function(msg) {
-        console.log('report80...', msg);
-        msg.dateStr = moment(msg.timestamp).format('HH:mm');
-        msg.text = gb_common.reqCode80[msg.data.requestCode];
-
-        findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
+//        console.log('report80...', msg);
+//        msg.dateStr = moment(msg.timestamp).format('HH:mm');
+//        msg.text = gb_common.reqCode80[msg.data.requestCode];
+//
+//        findMailBox(msg.data.lineId).prepend(temps['sys-note-80-temp'](msg));
     }
     var waitRemoves = [];