Merge branch 'minhang' of

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents 0375fb4b 007e569f
Showing 5 changed files with 9 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/resources/logback.xml
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -33,10 +33,10 @@ public class SignalSchPlanMatcher {
         try{
             //会不会是分班没有完成
-            if(sch.getBcType().equals("in")){
+            if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
                 ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
-                if(fbFirst == null)
+                if(fbFirst == null || !fbFirst.getQdzCode().equals(outSigal.getStopNo()))
                     return;
                 long dt = fbFirst.getDfsjT();
@@ -36,6 +36,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
         qd.setMessage(msg);
         qd.setSession(session);
+
         log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload());
         linkedList.add(qd);
     }
@@ -70,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
                         sleepFlag = false;
                         session = qd.getSession();
                         if (session.isOpen()) {
-                            log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
+                            log.info("push start、"+session.getRemoteAddress().getHostString()+"[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
                             session.sendMessage(qd.getMessage());
                             log.info("push end..");
                         }
@@ -210,7 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                             Map<String, Object> p2 = new HashMap<>();
                             p2.put("xl.id_eq", lineid);
                             p2.put("lpName_eq", bcell_con.trim());
-                            p2.put("isCancel_eq", 0);
+                            p2.put("isCancel_eq", false);
                             List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
                             if (CollectionUtils.isEmpty(guideboardInfoList)) {
                                 throw new Exception(String.format("第%d行，第1列的路牌在%s中不存在", i + 1, linename));
@@ -248,6 +248,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
             }
         } catch (Exception exp) {
+            exp.printStackTrace();
             throw new ScheduleException(exp.getMessage());
         }
@@ -195,7 +195,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
 			</pattern>
 		</layout>
 	</appender>
@@ -215,7 +215,7 @@
 		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
+			<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
 			</pattern>
 		</layout>
 	</appender>
@@ -754,6 +754,7 @@
                     //中心点和缩放级别
                     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
                     map.enableScrollWheelZoom();
+                    //map.setMapStyle({style:'grayscale'});
                 };
                 var storage = window.localStorage;