规范数据库，添加必要约束，优化通道批量导入功能

648540858

2022-02-24 a42dda2bd3cc1cf8c20cc61e7ad9211eadecbaf3

 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java

@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.media.zlm;

import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.media.zlm.dto.IMediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import org.springframework.stereotype.Component;

@@ -9,7 +8,7 @@
import java.util.concurrent.ConcurrentHashMap;

/**
 * @Description:针对 ZLMediaServer的hook事件订阅
 * @description:针对 ZLMediaServer的hook事件订阅
 * @author: pan
 * @date:   2020年12月2日 21:17:32
 */
@@ -28,11 +27,12 @@
        on_stream_changed,
        on_stream_none_reader,
        on_stream_not_found,
        on_server_started
        on_server_started,
        on_server_keepalive
    }

    public interface Event{
        void response(IMediaServerItem mediaServerItem, JSONObject response);
        void response(MediaServerItem mediaServerItem, JSONObject response);
    }

    private Map<HookType, Map<JSONObject, ZLMHttpHookSubscribe.Event>> allSubscribes = new ConcurrentHashMap<>();
@@ -58,6 +58,9 @@
                if (result == null) {
                    result = key.getString(s).equals(hookResponse.getString(s));
                }else {
                    if (key.getString(s) == null) {
                        continue;
                    }
                    result = result && key.getString(s).equals(hookResponse.getString(s));
                }

@@ -83,9 +86,9 @@
                if (result == null) {
                    result = key.getString(s).equals(hookResponse.getString(s));
                }else {
                    if (key.getString(s) == null) continue;
                    result = result && key.getString(s).equals(hookResponse.getString(s));
                }

            }
            if (null != result && result){
                iterator.remove();