优化zlm接入

648540858

2021-12-02 a797cd1c4bf7ccc18098033ab5572377e84094fd

优化zlm接入

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

@@ -52,7 +52,9 @@
                (MediaServerItem mediaServerItem, JSONObject response)->{
            ZLMServerConfig zlmServerConfig = JSONObject.toJavaObject(response, ZLMServerConfig.class);
            if (zlmServerConfig !=null ) {
                startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
                if (startGetMedia != null) {
                    startGetMedia.remove(zlmServerConfig.getGeneralMediaServerId());
                }
                mediaServerService.handLeZLMServerConfig(zlmServerConfig);
            }
        });

 src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java

@@ -29,6 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;

@@ -203,6 +204,15 @@
            }
            result.add(mediaServerItem);
        }
        result.sort((serverItem1, serverItem2)->{
            int sortResult = 0;
            try {
                sortResult = format.parse(serverItem1.getCreateTime()).compareTo(format.parse(serverItem2.getCreateTime()));
            } catch (ParseException e) {
                e.printStackTrace();
            }
            return  sortResult;
        });
        return result;
    }

@@ -271,7 +281,9 @@
                    result.setMsg("保存失败，媒体服务ID [ " + zlmServerConfig.getGeneralMediaServerId() + " ] 已存在，请修改媒体服务器配置");
                    return result;
                }
                mediaServerItem.setId(zlmServerConfig.getGeneralMediaServerId());
                zlmServerConfig.setIp(mediaServerItem.getIp());
                mediaServerMapper.add(mediaServerItem);
                handLeZLMServerConfig(zlmServerConfig);
                result.setCode(0);
                result.setMsg("success");
@@ -311,8 +323,13 @@
        }
        if (StringUtils.isEmpty(serverItem.getId())) {
            serverItem.setId(zlmServerConfig.getGeneralMediaServerId());
        }
        if (redisUtil.get(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId()) == null) {
            SsrcConfig ssrcConfig = new SsrcConfig(serverItem.getId(), null, sipConfig.getDomain());
            serverItem.setSsrcConfig(ssrcConfig);
            redisUtil.set(VideoManagerConstants.MEDIA_SERVER_PREFIX + serverItem.getId(), serverItem);
        }

        serverItem.setStatus(true);
        mediaServerMapper.update(serverItem);
        resetOnlineServerItem(serverItem);

 web_src/src/components/dialog/platformEdit.vue

@@ -97,7 +97,28 @@
  name: "platformEdit",
  props: {},
  computed: {},
  created() {},
  created() {
    this.platform = {
      id: null,
      enable: true,
      ptz: true,
      rtcp: false,
      name: null,
      serverGBId: null,
      serverGBDomain: null,
      serverIP: null,
      serverPort: null,
      deviceGBId: null,
      deviceIp: null,
      devicePort: null,
      username: null,
      password: null,
      expires: 300,
      keepTimeout: 60,
      transport: "UDP",
      characterSet: "GB2312",
    }
  },
  data() {
    var deviceGBIdRules = async (rule, value, callback) => {
      console.log(value);