[录制计划] 修复关联通道

src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java

@@ -20,6 +20,7 @@ public class CatalogData {
     private Device device;
     private String errorMsg;
     private Set<String> redisKeysForChannel = new HashSet<>();
+    private Set<String> errorChannel = new HashSet<>();
     private Set<String> redisKeysForRegion = new HashSet<>();
     private Set<String> redisKeysForGroup = new HashSet<>();
 

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

@@ -93,8 +93,10 @@ public interface DeviceChannelMapper {
     @SelectProvider(type = DeviceChannelProvider.class, method = "queryChannelsByDeviceDbId")
     List<DeviceChannel> queryChannelsByDeviceDbId(@Param("deviceDbId") int deviceDbId);
 
-    @Select("select id from wvp_device_channel where device_db_id in  " +
-            " <foreach item='item' index='index' collection='deviceDbIds' open='(' separator=',' close=')'> #{item} </foreach> </if>")
+    @Select(value = {" <script> " +
+            "select id from wvp_device_channel where device_db_id in  " +
+            " <foreach item='item' index='index' collection='deviceDbIds' open='(' separator=',' close=')'> #{item} </foreach>" +
+            " </script>"})
     List<Integer> queryChaneIdListByDeviceDbIds(List<Integer> deviceDbIds);
 
     @Delete("DELETE FROM wvp_device_channel WHERE device_db_id=#{deviceId}")

src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataManager.java

@@ -283,7 +283,7 @@ public class CatalogDataManager implements CommandLineRunner {
         if (catalogData == null) {
             return 0;
         }
-        return catalogData.getRedisKeysForChannel().size();
+        return catalogData.getRedisKeysForChannel().size() + catalogData.getErrorChannel().size();
     }
 
     public int sumNum(String deviceId, int sn) {