update...

潘钊
1 parent 86d276b7
Showing 5 changed files with 27 additions and 2 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/temp_sch/add_two_way.html
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v3/left.html
@@ -256,6 +256,9 @@ public class GpsServiceImpl implements GpsService {
             ArrivalEntity arrival;
             while (rs.next()) {
                 serviceState = rs.getLong("SERVICE_STATE");
+                if(getGpsValid(serviceState) == 1)
+                    continue;
+
                 map = new HashMap<>();
                 lon = rs.getFloat("LON");
@@ -306,6 +309,10 @@ public class GpsServiceImpl implements GpsService {
         return list;
     }
+    public static byte getGpsValid(long serviceState) {
+        return (byte)(((serviceState & 0x80000000) == 0x80000000) ? 1 : 0);
+    }
+
     public Map<String, ArrivalEntity> findArrivalByTs(int weekOfYear, Long st, Long et, String devicesInSql) {
         Map<String, ArrivalEntity> map = new HashMap<>();
@@ -10,7 +10,7 @@
                     <li name="normal"><a>1、子任务</a></li>
                     <li name="in_out"><a>2、进出场</a></li>
                     <li name="range_turn"><a>3、区间调头</a></li>
-                    <li name="range_to_normal"><a>4、区间变全程</a></li>
+                    <!--<li name="range_to_normal"><a>4、区间变全程</a></li>-->
                 </ul>
             </div>
             <div class="uk-width-8-10">
@@ -18,7 +18,7 @@
                     <li class="tab_cont normalCont"></li>
                     <li class="tab_cont inOutCont"></li>
                     <li class="tab_cont rangeTurnCont"></li>
-                    <li class="tab_cont rangeToNormal"></li>
+                    <!--<li class="tab_cont rangeToNormal"></li>-->
                 </ul>
             </div>
         </div>
@@ -272,6 +272,17 @@
             $('.remarks-autocom', f1).on('selectitem.uk.autocomplete', function (e, data, acobject) {
                 $f('remarks', f2).val(data.value);
             });
+
+            //人车级联
+            $f('clZbh',f1).on('input change', function () {
+                $f('clZbh', f2).val($(this).val());
+            });
+            $f('jsy',f1).on('input change', function () {
+                $f('jsy', f2).val($(this).val());
+            });
+            $f('spy',f1).on('input change', function () {
+                $f('spy', f2).val($(this).val());
+            });
             //表单同步
             $(f1).on('ct_callback', synchroFormData).trigger('ct_callback');
             //修改1结束时间
@@ -372,6 +383,7 @@
                 //第一个表单起点 = 第二个终点
                 $f('zdzCode', f2).val($f('qdzCode', f1).val()).trigger('change');
             }
+
         };
@@ -4,6 +4,7 @@
         <div class="uk-modal-header">
             <h2>所有接入平台的设备</h2></div>
+        <div class="uk-alert uk-alert-danger">系统将不再接收和显示 “设备端自身标识为无效” 的GPS点位。如果设备连续发送无效的点位，即等同于离线。</div>
         <div class="uk-panel uk-panel-box uk-panel-box-primary">
             <form class="uk-form search-form">
                 <fieldset data-uk-margin>
@@ -138,6 +138,11 @@
             gb_ct_table.fixedHead($('.inout_table_wrap', leftWrap));
             //滚动条
             createScrollbar();
+
+            //show title
+            UIkit.notify("设备端自身标识为无效的GPS点位，将不会再进入回放通路", {
+                status: 'info'
+            });
         });
         /**