update...

潘钊
1 parent 489a76c8
Showing 4 changed files with 36 additions and 7 deletions
src/main/java/com/bsth/controller/gps/GpsController.java
src/main/java/com/bsth/service/gps/GpsService.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/sch_manage/sch_imitate.html
@@ -91,11 +91,12 @@ public class GpsController {
     /**
      * gps补全
+     * type 0 : 实时GPS 1：走补传
      * @return
      */
     @RequestMapping(value = "/gpsCompletion", method = RequestMethod.POST)
-    public Map<String, Object> gpsCompletion(@RequestParam long schId) {
-        return gpsService.gpsCompletion(schId);
+    public Map<String, Object> gpsCompletion(@RequestParam long schId, @RequestParam int type) {
+        return gpsService.gpsCompletion(schId, type);
     }
     /**
@@ -21,7 +21,7 @@ public interface GpsService {
     Map<String,Object> findRoadSpeed(String lineCode);
-    Map<String,Object> gpsCompletion(long schId);
+    Map<String,Object> gpsCompletion(long schId, int type);
 	Map<String,Object> history_v2(String nbbm, long st, long et);
@@ -445,7 +445,7 @@ public class GpsServiceImpl implements GpsService {
      * @return
      */
     @Override
-    public Map<String, Object> gpsCompletion(long schId) {
+    public Map<String, Object> gpsCompletion(long schId, int type) {
         Map<String, Object> rs = new HashMap<>();
         try {
@@ -482,9 +482,15 @@ public class GpsServiceImpl implements GpsService {
             long diff = ((sch.getDfsjT() - Long.parseLong(fs.get("ts").toString())) - 1000 * 70);
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(sch.getClZbh());
+            int serviceState;
             for (Map<String, Object> map : list) {
                 map.put("device_id", deviceId);
                 map.put("ts", Long.parseLong(map.get("ts").toString()) + diff);
+                if(type==1){
+                    //走补传协议
+                    serviceState = Integer.parseInt(map.get("service_state").toString());
+                    map.put("service_state", serviceState |= 0x00100000);
+                }
             }
             String sqlBefore = "insert into bsth_c_template(", sqlValues = " values(";
@@ -379,15 +379,33 @@
             }
             alt_confirm('确定班次信息？ ' + sch.xlName + '、起点 ' + sch.qdzName + ' , 终点 ' + sch.zdzName + ' 、待发 ' + sch.dfsj, function () {
                 $('.shade-loading').show();
-                gb_common.$post('/gps/gpsCompletion', {schId: schId}, function (rs) {
+                gb_common.$post('/gps/gpsCompletion', {schId: schId, type: 0}, function (rs) {
                     $('.shade-loading').hide();
                     $('.search-form').trigger('submit');
                 });
             }, '我确定是这个班次');
         };
+        var gps_imitate_after = function (schId) {
+            var sch = schArray[schId];
+            if(sch.reissue){
+                UIkit.notify("<i class='uk-icon-times'></i> 你不能对一个班次重复操作！", {
+                    status: 'danger'
+                });
+                return;
+            }
+            alt_confirm('确定补传班次信息？ ' + sch.xlName + '、起点 ' + sch.qdzName + ' , 终点 ' + sch.zdzName + ' 、待发 ' + sch.dfsj, function () {
+                $('.shade-loading').show();
+                gb_common.$post('/gps/gpsCompletion', {schId: schId, type: 1}, function (rs) {
+                    $('.shade-loading').hide();
+                    $('.search-form').trigger('submit');
+                });
+            }, '我确定补传这个班次');
+        }
+
         var callbackHandler = {
-            gps_imitate: gps_imitate
+            gps_imitate: gps_imitate,
+            gps_imitate_after: gps_imitate_after
         }
         $.contextMenu({
@@ -399,7 +417,11 @@
             },
             items: {
                 'gps_imitate': {
-                    name: '模拟轨迹'
+                    name: '模拟轨迹（事前）'
+
+                },
+                'gps_imitate_after':{
+                    name: '模拟轨迹（事后补传）'
                 }
             }
         });