新增船舶撒点接口，增加预警信息；优化模拟驾驶；

src/apis/ship.js

@@ -7,6 +7,15 @@ export function GetHpjShip() {
     })
 }
 
+export function GetHpjShipWithWarn(data) {
+    return request({
+        url: 'http://10.83.68.109:8092/digitalTwin2/dataShare/GetBoatAISByExtentCalculateGwWarningInfo',
+        method: "post",
+        data: data
+    })
+}
+
+
 export function GetBoatAISHistoryByMMSI(data) {
     return request({
         url: '/dataShare/GetBoatAISHistoryByMMSI',

src/utils/map/ArcgisUtil.js

@@ -32,7 +32,7 @@ export function initBridge(){
                 break;
             case "MapExtentChanged":
                 console.log(arg)
-                mapExtent = arg.data.result
+                mapExtent = arg.data.extent
                 mapScale = arg.data.scale
                 if(showBoat){
                     onLocationBoat()

src/utils/map/Boat.js

@@ -5,9 +5,9 @@ import { fullExtent, clearMap, calculation, changeMap, setCamera,
     layerControl, layerQuery, addGraphic, draw, getDrawResult,
     addBoats, setBoatHistory, playBoatHistory, clearBoatHistory,
     openBoatDriving,closeBoatDriving,setAreaBoatHistory, playMultiBoatHistory,
-    getMapScale
+    getMapScale,getMapExtent
 } from '@/utils/map/ArcgisUtil'
-import {GetHpjShip,GetBoatAISHistoryByMMSI,GetShipHistoryByArea} from "@/apis/ship";
+import {GetHpjShip,GetBoatAISHistoryByMMSI,GetShipHistoryByArea,GetHpjShipWithWarn} from "@/apis/ship";
 import {setCenter} from '@/utils/map/Common'
 import {nextTick} from "vue";
 import bus from "@/utils/bus";
@@ -74,7 +74,7 @@ export function setBoat(isShow){
         if (boatInterval != null) {
             clearInterval(boatInterval)
         }
-        boatInterval = setInterval(onLocationBoat, 10000)
+        boatInterval = setInterval(onLocationBoat, 5000)
     }else{
         if (showBoat){
             showBoat = false
@@ -88,7 +88,17 @@ export function setBoat(isShow){
 
 // 加载船舶
 export function onLocationBoat(){
-    GetHpjShip().then(res=>{
+    let extent = getMapExtent()
+    GetHpjShipWithWarn({
+        maxMapx:extent.xmax + 100,
+        minMapx:extent.xmin - 100,
+        maxMapy:extent.ymax + 100,
+        minMapy:extent.ymin - 100,
+        hour: 0.5
+    }).then(res=>{
+        if(!showBoat){
+            return
+        }
         let data = res.Result.data
         let boats = {
             "scale": getMapScale(),
@@ -106,7 +116,8 @@ export function onLocationBoat(){
                 "shipBreadth": data[i].SHIPBREADTH,
                 "shipLength": data[i].SHIPLENGTH,
                 "mapx": data[i].MAPX,
-                "mapy": data[i].MAPY
+                "mapy": data[i].MAPY,
+                "warnStatus": Object.keys(data[i].MAP).length == 0 ? 0: 1
             }
             boats.data.push(boat)
         }
@@ -244,6 +255,7 @@ export function boatDriving(data,isShow){
         closeBoatDriving()
         // clearMap({is_draw: false, is_search:true, layers: ['boatLayer','boatPathLayer','boatGraphicLayer']})
         // setCenter()
+        locationBoat(data.mmsi,true)
     }
 }