From 01f491c02600e8fd6febdeb6e2db00df1ac21f7b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 21 Jan 2025 17:00:37 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9B=86=E7=BE=A4]=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=9A=E9=81=93=E6=97=B6=E7=9A=84=E9=80=9A?=
 =?UTF-8?q?=E9=81=93=E4=B8=8A=E4=B8=8B=E7=BA=BF=E6=B6=88=E6=81=AF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../genersoft/iot/vmp/gb28181/bean/DeviceChannel.java  | 10 ++++++++++
 .../iot/vmp/gb28181/dao/PlatformChannelMapper.java     |  5 ++++-
 .../gb28181/service/impl/DeviceChannelServiceImpl.java |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 924a8ca7..ab35ac51 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -244,5 +244,15 @@ public class DeviceChannel extends CommonGBChannel {
 		return deviceChannel;
 	}
 
+	public CommonGBChannel buildCommonGBChannelForStatus() {
+		CommonGBChannel commonGBChannel = new CommonGBChannel();
+		commonGBChannel.setGbId(id);
+		commonGBChannel.setGbDeviceId(deviceId);
+		commonGBChannel.setGbName(name);
+		commonGBChannel.setDataType(ChannelDataType.GB28181.value);
+		commonGBChannel.setDataDeviceId(getDataDeviceId());
+		return commonGBChannel;
+	}
+
 
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
index 9a565628..c69a32d5 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java
@@ -58,7 +58,10 @@ public interface PlatformChannelMapper {
             "where dc.channel_type = 0 and dc.channel_id = #{channelId} and pgc.platform_id=#{platformId}")
     List<Device> queryDeviceInfoByPlatformIdAndChannelId(@Param("platformId") String platformId, @Param("channelId") String channelId);
 
-    @Select("SELECT pgc.* from wvp_platform_channel pgc left join wvp_device_channel dc on dc.id = pgc.device_channel_id WHERE  dc.channel_type = 0 and dc.device_id=#{channelId}")
+    @Select(" SELECT wp.* from wvp_platform_channel pgc " +
+            " left join wvp_device_channel dc on dc.id = pgc.device_channel_id " +
+            " left join  wvp_platform wp on wp.id = pgc.platform_id" +
+            " WHERE  dc.channel_type = 0 and dc.device_id=#{channelId}")
     List<Platform> queryParentPlatformByChannelId(@Param("channelId") String channelId);
 
     @Select("<script>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
index 2d65deb7..aee207e5 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
@@ -534,7 +534,7 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
                     List<Platform> platformList = platformChannelMapper.queryParentPlatformByChannelId(deviceChannel.getDeviceId());
                     if (!CollectionUtils.isEmpty(platformList)){
                         platformList.forEach(platform->{
-                            eventPublisher.catalogEventPublish(platform, deviceChannel, deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
+                            eventPublisher.catalogEventPublish(platform, deviceChannel.buildCommonGBChannelForStatus(), deviceChannel.getStatus().equals("ON")? CatalogEvent.ON:CatalogEvent.OFF);
                         });
                     }
                 }