潘钊 / bsth_control · Commits

Commit 3fe3cf977e257f1d282e397b855e3782dc91a083

Authored by 廖磊
2 parents 0375fb4b 007e569f
build: skipped

Merge branch 'minhang' of 

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
Inline Side-by-side
Showing 5 changed files with 9 additions and 6 deletions
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
  View file @3fe3cf9
... ... @@ -33,10 +33,10 @@ public class SignalSchPlanMatcher {
33 33  
34 34 try{
35 35 //会不会是分班没有完成
36   - if(sch.getBcType().equals("in")){
  36 + if(sch.getBcType().equals("in") && t - sch.getDfsjT() > 1000 * 60 * 20){
37 37 ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
38 38  
39   - if(fbFirst == null)
  39 + if(fbFirst == null || !fbFirst.getQdzCode().equals(outSigal.getStopNo()))
40 40 return;
41 41  
42 42 long dt = fbFirst.getDfsjT();
... ...
src/main/java/com/bsth/data/msg_queue/WebSocketPushQueue.java
  View file @3fe3cf9
... ... @@ -36,6 +36,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
36 36 qd.setMessage(msg);
37 37 qd.setSession(session);
38 38  
  39 +
39 40 log.info("put、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + msg.getPayload());
40 41 linkedList.add(qd);
41 42 }
... ... @@ -70,7 +71,7 @@ public class WebSocketPushQueue implements CommandLineRunner {
70 71 sleepFlag = false;
71 72 session = qd.getSession();
72 73 if (session.isOpen()) {
73   - log.info("push start、[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
  74 + log.info("push start、"+session.getRemoteAddress().getHostString()+"[" + session.getAttributes().get(Constants.SESSION_USERNAME) + "] 、" + qd.getMessage().getPayload());
74 75 session.sendMessage(qd.getMessage());
75 76 log.info("push end..");
76 77 }
... ...
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
  View file @3fe3cf9
... ... @@ -210,7 +210,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl<TTInfoDetail, Long> im
210 210 Map<String, Object> p2 = new HashMap<>();
211 211 p2.put("xl.id_eq", lineid);
212 212 p2.put("lpName_eq", bcell_con.trim());
213   - p2.put("isCancel_eq", 0);
  213 + p2.put("isCancel_eq", false);
214 214 List<GuideboardInfo> guideboardInfoList = (List<GuideboardInfo>) guideboardInfoService.list(p2);
215 215 if (CollectionUtils.isEmpty(guideboardInfoList)) {
216 216 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
248 248  
249 249 }
250 250 } catch (Exception exp) {
  251 + exp.printStackTrace();
251 252 throw new ScheduleException(exp.getMessage());
252 253 }
253 254  
... ...
src/main/resources/logback.xml
  View file @3fe3cf9
... ... @@ -195,7 +195,7 @@
195 195 </rollingPolicy>
196 196  
197 197 <layout class="ch.qos.logback.classic.PatternLayout">
198   - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
  198 + <pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
199 199 </pattern>
200 200 </layout>
201 201 </appender>
... ... @@ -215,7 +215,7 @@
215 215 </rollingPolicy>
216 216  
217 217 <layout class="ch.qos.logback.classic.PatternLayout">
218   - <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%file:%line] %-5level -%msg%n
  218 + <pattern>%d{MM-dd HH:mm:ss.SSS} %-5level -%msg%n
219 219 </pattern>
220 220 </layout>
221 221 </appender>
... ...
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
  View file @3fe3cf9
... ... @@ -754,6 +754,7 @@
754 754 //中心点和缩放级别
755 755 map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
756 756 map.enableScrollWheelZoom();
  757 + //map.setMapStyle({style:'grayscale'});
757 758 };
758 759  
759 760 var storage = window.localStorage;
... ...