diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java index 7728f981e..e7bdffa32 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java @@ -101,10 +101,8 @@ public interface IRedisCatchStorage { /** * 判断设备状态 - * @param deviceId 设备ID - * @return */ - public boolean deviceIsOnline(String deviceId); + boolean deviceIsOnline(String deviceId); /** * 存储推流的鉴权信息 diff --git a/web/package.json b/web/package.json index 3ac213819..b13697130 100644 --- a/web/package.json +++ b/web/package.json @@ -27,7 +27,7 @@ "moment-duration-format": "^2.3.2", "normalize.css": "7.0.0", "nprogress": "0.2.0", - "ol": "^6.14.1", + "ol": "^10.6.1", "path-to-regexp": "2.4.0", "screenfull": "5.1.0", "strip-ansi": "^7.1.0", diff --git a/web/src/views/common/MapComponent.vue b/web/src/views/common/MapComponent.vue index 73fe7ca39..55dcac67a 100755 --- a/web/src/views/common/MapComponent.vue +++ b/web/src/views/common/MapComponent.vue @@ -5,13 +5,13 @@