From 86266acb15bc2096cfbd796977c76569ee5c9abd Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Mon, 20 Oct 2025 22:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/dao/CommonGBChannelMapper.java    |   2 +-
 .../service/impl/GbChannelServiceImpl.java    |  11 +-
 .../impl/PlatformChannelServiceImpl.java      |   6 +-
 web/public/static/images/gis/sprite.png       | Bin 0 -> 4186 bytes
 web/src/views/common/MapComponent.vue         | 216 +++---------------
 5 files changed, 42 insertions(+), 193 deletions(-)
 create mode 100644 web/public/static/images/gis/sprite.png

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
index 2e1984681..45436d83d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -20,7 +20,7 @@ public interface CommonGBChannelMapper {
 
 
     @SelectProvider(type = ChannelProvider.class, method = "queryByDeviceId")
-    CommonGBChannel queryByDeviceId(@Param("gbDeviceId") String gbDeviceId);
+    List<CommonGBChannel> queryByDeviceId(@Param("gbDeviceId") String gbDeviceId);
 
     @Insert(" <script>" +
             "INSERT INTO wvp_device_channel (" +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
index f1416c937..472370144 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
@@ -53,7 +53,12 @@ public class GbChannelServiceImpl implements IGbChannelService {
 
     @Override
     public CommonGBChannel queryByDeviceId(String gbDeviceId) {
-        return commonGBChannelMapper.queryByDeviceId(gbDeviceId);
+        List<CommonGBChannel> commonGBChannels = commonGBChannelMapper.queryByDeviceId(gbDeviceId);
+        if (commonGBChannels.isEmpty()) {
+            return null;
+        }else {
+            return commonGBChannels.get(0);
+        }
     }
 
     @Override
@@ -129,6 +134,10 @@ public class GbChannelServiceImpl implements IGbChannelService {
             log.warn("[更新通道] 未找到数据库ID，更新失败， {}({})", commonGBChannel.getGbName(), commonGBChannel.getGbDeviceId());
             return 0;
         }
+        // 确定编号是否重复
+        if (commonGBChannelMapper.queryByDeviceId(commonGBChannel.getGbDeviceId()).size() > 1) {
+            throw new ControllerException(ErrorCode.ERROR100.getCode(), "国标编号重复，请修改编号后保存");
+        }
         commonGBChannel.setUpdateTime(DateUtil.getNow());
         int result = commonGBChannelMapper.update(commonGBChannel);
         if (result > 0) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
index 1cfdcb833..f0669c8b0 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
@@ -604,9 +604,11 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
 
     @Override
     public List<Platform> queryByPlatformBySharChannelId(String channelDeviceId) {
-        CommonGBChannel commonGBChannel = commonGBChannelMapper.queryByDeviceId(channelDeviceId);
+        List<CommonGBChannel> commonGBChannels = commonGBChannelMapper.queryByDeviceId(channelDeviceId);
         ArrayList<Integer> ids = new ArrayList<>();
-        ids.add(commonGBChannel.getGbId());
+        for (CommonGBChannel commonGBChannel : commonGBChannels) {
+            ids.add(commonGBChannel.getGbId());
+        }
         return platformChannelMapper.queryPlatFormListByChannelList(ids);
     }
 }
diff --git a/web/public/static/images/gis/sprite.png b/web/public/static/images/gis/sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..5737ef6ad90a8a433fcf9c562bb79ce6ed11f793
GIT binary patch
literal 4186
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

literal 0
HcmV?d00001

diff --git a/web/src/views/common/MapComponent.vue b/web/src/views/common/MapComponent.vue
index 52d47f3a9..2713b7201 100755
--- a/web/src/views/common/MapComponent.vue
+++ b/web/src/views/common/MapComponent.vue
@@ -295,14 +295,18 @@ export default {
           const feature = new Feature(new Point(fromLonLat(data[i].position)))
           feature.setId(data[i].id)
           feature.customData = data[i].data
-          const style = new Style()
-          style.setImage(new Icon({
-            anchor: data[i].image.anchor,
-            crossOrigin: 'Anonymous',
-            src: data[i].image.src,
-            opacity: 1
-          }))
-          feature.setStyle(style)
+          feature.setProperties({
+            status: 'offline',
+            iconSrc: 'static/images/gis/camera1-offline.png'
+          })
+          // const style = new Style()
+          // style.setImage(new Icon({
+          //   anchor: data[i].image.anchor,
+          //   crossOrigin: 'Anonymous',
+          //   src: data[i].image.src,
+          //   opacity: 1
+          // }))
+          // feature.setStyle(style)
           features.push(feature)
         }
         const source = new VectorSource()
@@ -313,14 +317,21 @@ export default {
           minZoom: minZoom,
           style: {
             // 必须提供 style 配置，可以是对象或函数
-            'circle-radius': 3,
-            'circle-fill-color': 'red',
-            'circle-stroke-color': 'white',
-            'circle-stroke-width': 0.5
-            // 'icon-src': 'static/images/gis/camera1.png',
-            // 'icon-offset': [0, 12],
-            // 'icon-width': 40,
-            // 'icon-height': 40
+            // 'circle-radius': 10,
+            // 'circle-fill-color': 'red',
+            // 'circle-stroke-color': 'white',
+            // 'circle-stroke-width': 0.5
+            'icon-src': 'static/images/gis/camera1.png',
+            // 'icon-src': [
+            //   'case',
+            //   ['==', ['get', 'status'], 'online'], 'static/images/gis/camera1.png',
+            //   ['==', ['get', 'status'], 'offline'], 'static/images/gis/camera1-offline.png',
+            //   ['==', ['get', 'status'], 'checked'], 'static/images/gis/camera1-red.png',
+            //   'static/images/gis/camera1.png'
+            // ],
+            // 'icon-src': ['get', 'iconSrc'],
+            'icon-width': 40,
+            'icon-height': 40
           }
         })
         if (clickEvent && typeof clickEvent === 'function') {
@@ -472,179 +483,6 @@ export default {
       layer.getSource().addFeature(feature)
     },
 
-    // 新增：支持多种图标类型的点图层创建方法
-    createMultiIconPointLayer(data, clickEvent, option) {
-      if (data.length > 0) {
-        const features = []
-        let maxZoom = (option && option.maxZoom) ? option.maxZoom : olMap.getView().getMaxZoom()
-        let minZoom = (option && option.minZoom) ? option.minZoom : olMap.getView().getMinZoom()
-        let declutter = option && option.declutter
-
-        for (let i = 0; i < data.length; i++) {
-          const feature = new Feature(new Point(fromLonLat(data[i].position)))
-          feature.setId(data[i].id)
-          feature.customData = data[i].data
-          
-          // 根据数据类型或状态选择不同的图标
-          const iconConfig = this.getIconConfig(data[i])
-          
-          const style = new Style()
-          style.setImage(new Icon({
-            anchor: iconConfig.anchor,
-            crossOrigin: 'Anonymous',
-            src: iconConfig.src,
-            opacity: iconConfig.opacity || 1,
-            scale: iconConfig.scale || 1
-          }))
-          feature.setStyle(style)
-          features.push(feature)
-        }
-        
-        const source = new VectorSource()
-        source.addFeatures(features)
-        const vectorLayer = new VectorLayer({
-          source: source,
-          renderMode: 'image',
-          declutter: declutter,
-          maxZoom: maxZoom,
-          minZoom: minZoom
-        })
-        
-        if (clickEvent && typeof clickEvent === 'function') {
-          vectorLayer.on('click', (event) => {
-            if (event.features.length > 0) {
-              const items = []
-              for (let i = 0; i < event.features.length; i++) {
-                items.push(event.features[i].customData)
-              }
-              clickEvent(items)
-            }
-          })
-        }
-
-        return vectorLayer
-      }
-    },
-
-    // 新增：根据数据属性获取图标配置
-    getIconConfig(data) {
-      const baseConfig = {
-        anchor: [0.5, 1],
-        opacity: 1,
-        scale: 1
-      }
-
-      // 根据设备类型选择图标
-      if (data.dataType) {
-        switch (data.dataType) {
-          case 1: // 国标设备
-            return {
-              ...baseConfig,
-              src: data.gbStatus === 'ON' ? 'static/images/gis/camera1.png' : 'static/images/gis/camera1-offline.png'
-            }
-          case 2: // 推流设备
-            return {
-              ...baseConfig,
-              src: data.gbStatus === 'ON' ? 'static/images/gis/camera2.png' : 'static/images/gis/camera2-offline.png'
-            }
-          case 3: // 拉流代理
-            return {
-              ...baseConfig,
-              src: data.gbStatus === 'ON' ? 'static/images/gis/camera3.png' : 'static/images/gis/camera3-offline.png'
-            }
-          case 200: // 部标设备
-            return {
-              ...baseConfig,
-              src: data.gbStatus === 'ON' ? 'static/images/gis/camera1-red.png' : 'static/images/gis/camera1-offline.png'
-            }
-          default:
-            return {
-              ...baseConfig,
-              src: 'static/images/gis/camera.png'
-            }
-        }
-      }
-
-      // 根据状态选择图标
-      if (data.gbStatus) {
-        return {
-          ...baseConfig,
-          src: data.gbStatus === 'ON' ? 'static/images/gis/camera1.png' : 'static/images/gis/camera1-offline.png'
-        }
-      }
-
-      // 默认图标
-      return {
-        ...baseConfig,
-        src: 'static/images/gis/camera.png'
-      }
-    },
-
-    // 新增：批量更新图标类型
-    updateIconType(layer, iconType) {
-      const source = layer.getSource()
-      const features = source.getFeatures()
-      
-      features.forEach(feature => {
-        const data = feature.customData
-        if (data) {
-          // 临时修改数据类型来获取新图标
-          const originalType = data.dataType
-          data.dataType = iconType
-          
-          const iconConfig = this.getIconConfig(data)
-          const style = new Style()
-          style.setImage(new Icon({
-            anchor: iconConfig.anchor,
-            crossOrigin: 'Anonymous',
-            src: iconConfig.src,
-            opacity: iconConfig.opacity || 1,
-            scale: iconConfig.scale || 1
-          }))
-          feature.setStyle(style)
-          
-          // 恢复原始类型
-          data.dataType = originalType
-        }
-      })
-      
-      olMap.render()
-    },
-
-    // 新增：根据条件动态切换图标
-    switchIconsByCondition(layer, condition, iconMap) {
-      const source = layer.getSource()
-      const features = source.getFeatures()
-      
-      features.forEach(feature => {
-        const data = feature.customData
-        if (data && condition(data)) {
-          const iconKey = this.getIconKey(data)
-          const iconConfig = iconMap[iconKey] || iconMap.default
-          
-          const style = new Style()
-          style.setImage(new Icon({
-            anchor: iconConfig.anchor,
-            crossOrigin: 'Anonymous',
-            src: iconConfig.src,
-            opacity: iconConfig.opacity || 1,
-            scale: iconConfig.scale || 1
-          }))
-          feature.setStyle(style)
-        }
-      })
-      
-      olMap.render()
-    },
-
-    // 新增：获取图标键值
-    getIconKey(data) {
-      if (data.dataType && data.gbStatus) {
-        return `${data.dataType}_${data.gbStatus}`
-      }
-      return data.gbStatus || 'default'
-    },
-
     addLineLayer(positions) {
       if (positions.length > 0) {
         const points = []