Commit dc701f72ca088dbe23ea75fd3813352c23bd98d0
1 parent
c3182ff3
1
Showing
3 changed files
with
13 additions
and
12 deletions
src/main/java/com/bsth/data/zndd/AutomaticSch.java
| ... | ... | @@ -121,7 +121,7 @@ public class AutomaticSch { |
| 121 | 121 | Long t1 = t0 - (1000 * 60 * 2); |
| 122 | 122 | Long t2 = t0 + (1000 * 60 * 2); |
| 123 | 123 | //判断当前间隔是否出现过并且在当前时间段内 大于2分钟 小于1分钟的时间之内 |
| 124 | - //if ( lg.getTsTime() > t1 && lg.getTsTime() < t2 && SFMAP.get(lg.getId()) == null ) { | |
| 124 | + if (SFMAP.get(lg.getId()) == null) { | |
| 125 | 125 | if (k == 0) { |
| 126 | 126 | if (lg.getlGType() == 0) { |
| 127 | 127 | ts(ConvertDJK(lg, sch, "FCJG")); |
| ... | ... | @@ -137,7 +137,7 @@ public class AutomaticSch { |
| 137 | 137 | logger.info("行车大间隔--" + chartStr); |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | - // } | |
| 140 | + } | |
| 141 | 141 | //大于10000条的时候开始清理map |
| 142 | 142 | if (SFMAP.size() > 10000){ |
| 143 | 143 | for (Map.Entry<Long, Long> m : SFMAP.entrySet()){ |
| ... | ... | @@ -188,14 +188,15 @@ public class AutomaticSch { |
| 188 | 188 | //rfid 判断 |
| 189 | 189 | List<RfidInfo> list = RfidHttpLoader.load(); |
| 190 | 190 | for (RfidInfo ri : list) { |
| 191 | - //最新的rfid是出站状态 | |
| 192 | - if (ri.getNbbm().equals(sr.getClZbh())){ | |
| 193 | - sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp()); | |
| 194 | - } | |
| 195 | - if (ri.getNbbm().equals(sr.getClZbh()) && ri.getInoutStation().getInout() == 0) { | |
| 196 | - sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp()); | |
| 191 | + if (ri.getRecogTime() != null && ri.getRecogTime().getTime() > System.currentTimeMillis() - 300000) { | |
| 192 | + //最新的rfid是出站状态 | |
| 193 | + if (ri.getNbbm().equals(sr.getClZbh())){ | |
| 194 | + sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp()); | |
| 195 | + } | |
| 196 | + if (ri.getNbbm().equals(sr.getClZbh()) && ri.getInoutStation().getInout() == 0) { | |
| 197 | + sfsj = sdfHHmm.format(ri.getInoutStation().getTimestamp()); | |
| 198 | + } | |
| 197 | 199 | } |
| 198 | - | |
| 199 | 200 | } |
| 200 | 201 | sr.setFcsjActual(sfsj); |
| 201 | 202 | ts(addStationPeople(sr, "SFTZ_1", 0L)); | ... | ... |
src/main/resources/static/real_control_v2/js/stationcf/klyj.js
| ... | ... | @@ -32,7 +32,7 @@ var gb_klyj = (function () { |
| 32 | 32 | $wrap.on('click', '.ljbc', function () { |
| 33 | 33 | var that = $(this); |
| 34 | 34 | var data = dataMap.get(that.data('uuid')); |
| 35 | - let ljtype = $('#ljtype').val(); | |
| 35 | + var ljtype = $('#ljtype').val(); | |
| 36 | 36 | data.ljtype = ljtype; |
| 37 | 37 | open_modal("/real_control_v2/zndd/type/dkl.html", { |
| 38 | 38 | data: data |
| ... | ... | @@ -47,7 +47,7 @@ var gb_klyj = (function () { |
| 47 | 47 | }); |
| 48 | 48 | |
| 49 | 49 | $wrap.on('change', '#ljtype', function () { |
| 50 | - let fn = $('#ljtype').val(); | |
| 50 | + var fn = $('#ljtype').val(); | |
| 51 | 51 | if (fn == "lin1"){ |
| 52 | 52 | $(".lin1").css({ display: ''}); |
| 53 | 53 | $(".lin2").css({display: 'none'}); | ... | ... |
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
| ... | ... | @@ -372,7 +372,7 @@ var gb_dataZndd = (function (){ |
| 372 | 372 | } else if (type == "KLYJ"){ |
| 373 | 373 | if (data.excuteStatus == 0){ |
| 374 | 374 | if(!$('#schedule-addsch-modal').hasClass('uk-open')){ |
| 375 | - let ljtype = $('#ljtype').val(); | |
| 375 | + var ljtype = $('#ljtype').val(); | |
| 376 | 376 | data.ljtype = ljtype; |
| 377 | 377 | open_modal("/real_control_v2/zndd/type/dkl.html", { |
| 378 | 378 | data: data | ... | ... |