临时提交

src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java

@@ -646,6 +646,9 @@ public interface CommonGBChannelMapper {
     @SelectProvider(type = ChannelProvider.class, method = "queryListForSyMobile")
     List<CameraChannel> queryListForSyMobile(@Param("business") String business);
 
+    @SelectProvider(type = ChannelProvider.class, method = "queryCameraChannelById")
+    CameraChannel queryCameraChannelById(@Param("gbId") Integer id);
+
     @Update("<script> " +
             "<foreach collection='channels' index='index' item='item' separator=';'> " +
             "UPDATE wvp_device_channel SET map_level=#{item.mapLevel} " +
@@ -653,4 +656,7 @@ public interface CommonGBChannelMapper {
             "</foreach> " +
             "</script>")
     void saveLevel(List<ChannelForThin> channels);
+
+    @SelectProvider(type = ChannelProvider.class, method = "queryCameraChannelByIds")
+    List<CameraChannel> queryCameraChannelByIds(List<Integer> ids);
 }

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java

@@ -162,6 +162,8 @@ public class ChannelProvider {
                     "    wdc.record_plan_id,\n" +
                     "    wdc.enable_broadcast,\n" +
                     "    wd.device_id as deviceCode,\n" +
+                    "    wcg.alias as groupAlias,\n" +
+                    "    wcg2.alias as topGroupGAlias,\n" +
                     "    coalesce(wdc.gb_device_id,  wdc.device_id) as gb_device_id,\n" +
                     "    coalesce(wdc.gb_name,  wdc.name) as gb_name,\n" +
                     "    coalesce(wdc.gb_manufacturer,  wdc.manufacturer) as gb_manufacturer,\n" +
@@ -197,7 +199,9 @@ public class ChannelProvider {
                     "    coalesce(wdc.gb_svc_space_support_mod,  wdc.svc_space_support_mod) as gb_svc_space_support_mod,\n" +
                     "    coalesce(wdc.gb_svc_time_support_mode,  wdc.svc_time_support_mode) as gb_svc_time_support_mode\n" +
                     " from wvp_device_channel wdc\n" +
-                    " left join wvp_device wd on wdc.data_type = 1 AND wd.id = wdc.data_device_id"
+                    " left join wvp_device wd on wdc.data_type = 1 AND wd.id = wdc.data_device_id" +
+                    " left join wvp_common_group wcg on wcg.device_id = coalesce(wdc.gb_parent_id,  wdc.parent_id)" +
+                    " left join wvp_common_group wcg2 on wcg2.device_id = wcg.business_group"
             ;
 
     public String queryByDeviceId(Map<String, Object> params ){
@@ -212,6 +216,10 @@ public class ChannelProvider {
         return BASE_SQL + " where channel_type = 0 and data_type = #{dataType} and data_device_id = #{dataDeviceId}";
     }
 
+    public String queryCameraChannelById(Map<String, Object> params ){
+        return BASE_SQL + " where id = #{gbId}";
+    }
+
     public String queryListByCivilCode(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append(BASE_SQL);
@@ -824,6 +832,23 @@ public class ChannelProvider {
         sqlBuild.append(" )");
         return sqlBuild.toString() ;
     }
+    public String queryCameraChannelByIds(Map<String, Object> params ){
+        StringBuilder sqlBuild = new StringBuilder();
+        sqlBuild.append(BASE_SQL_FOR_CAMERA_DEVICE);
+        sqlBuild.append(" where wdc.id in ( ");
+
+        List<Integer> ids = (List<Integer>)params.get("ids");
+        boolean first = true;
+        for (Integer id : ids) {
+            if (!first) {
+                sqlBuild.append(",");
+            }
+            sqlBuild.append(id);
+            first = false;
+        }
+        sqlBuild.append(" )");
+        return sqlBuild.toString() ;
+    }
 
     public String queryListForSyMobile(Map<String, Object> params ){
         return BASE_SQL_FOR_CAMERA_DEVICE +

src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java

@@ -130,7 +130,7 @@ public class PlayServiceImpl implements IPlayService {
      * 流到来的处理
      */
     @Async("taskExecutor")
-    @org.springframework.context.event.EventListener
+    @EventListener
     public void onApplicationEvent(MediaArrivalEvent event) {
         if ("broadcast".equals(event.getApp()) || "talk".equals(event.getApp())) {
             if (event.getStream().indexOf("_") > 0) {