Pre Merge pull request !34 from WangXuewen/master

src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java

@@ -474,7 +474,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
     public void removePushListItem(String app, String stream, String mediaServerId) {
         String key = VideoManagerConstants.PUSH_STREAM_LIST + app + "_" + stream;
         MediaInfo param = (MediaInfo)redisTemplate.opsForValue().get(key);
-        if (param != null) {
+        if (param != null && userSetting.getServerId().equals(param.getServerId())) {
             redisTemplate.delete(key);
         }
     }

web/src/views/common/MapComponent.vue

@@ -97,8 +97,6 @@ export default {
             url: this.mapTileList[this.mapTileIndex].tilesUrl
           })
         })
-        console.log(4444)
-        console.log(this.mapTileList[this.mapTileIndex].tilesUrl)
       } else {
         tileLayer = new Tile({
           preload: 4,
@@ -150,11 +148,12 @@ export default {
       })
     },
     addVectorTileLayer(tileUrl, clickEvent, errorEvent){
+      tileUrl += `?geoCoordSys=${this.mapTileList[this.mapTileIndex].coordinateSystem}&accessToken=${this.$store.getters.token}`
       let source = new VectorTileSource({
         format: new MVT(),
+        tileSize: 256,
         url: tileUrl
       })
-
       let layer = new VectorTileLayer({
         source: source,
         style: function(feature) {
@@ -625,6 +624,7 @@ export default {
       this.mapTileIndex = index
       window.coordinateSystem = this.mapTileList[this.mapTileIndex].coordinateSystem
       tileLayer.getSource().setUrl(this.mapTileList[index].tilesUrl)
+      tileLayer.getSource().refresh()
       if (mapTileConfig.coordinateSystem !== this.mapTileList[this.mapTileIndex].coordinateSystem) {
         // 发送通知
         this.$emit('coordinateSystemChange', this.mapTileList[this.mapTileIndex].coordinateSystem)

web/src/views/map/index.vue

@@ -293,6 +293,7 @@ export default {
         return
       }
       this.$refs.mapComponent.changeMapTile(index)
+      this.changeLayerType(this.layerType)
     },
     clientEvent(data){
       this.closeInfoBox()
@@ -310,15 +311,17 @@ export default {
         this.$refs.mapComponent.removeLayer(channelTileLayer)
         return
       }
+      if (channelTileLayer) {
+        this.$refs.mapComponent.removeLayer(channelTileLayer)
+      }
 
-      let geoCoordSys = this.$refs.mapComponent.getCoordSys()
       const baseUrl = window.baseUrl ? window.baseUrl : ''
       let baseApi = ((process.env.NODE_ENV === 'development') ? process.env.VUE_APP_BASE_API : baseUrl)
       let tileUrl = null
       if (index === 1) {
-        tileUrl = baseApi + `/api/common/channel/map/tile/{z}/{x}/{y}?geoCoordSys=${geoCoordSys}&accessToken=${this.$store.getters.token}`
+        tileUrl = baseApi + '/api/common/channel/map/tile/{z}/{x}/{y}'
       }else if (index === 2) {
-        tileUrl = baseApi + `/api/common/channel/map/thin/tile/{z}/{x}/{y}?geoCoordSys=${geoCoordSys}&accessToken=${this.$store.getters.token}`
+        tileUrl = baseApi + '/api/common/channel/map/thin/tile/{z}/{x}/{y}'
       }
       channelTileLayer = this.$refs.mapComponent.addVectorTileLayer(tileUrl, this.clientEvent)
     },