Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mrjackwang

2022-08-02 f93a0d599e1619b46eb0bfcb7ceff74e10e4a3a1

Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

 src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformCatalogMapper.java

@@ -47,7 +47,7 @@
    PlatformCatalog selectDefaultByPlatFormId(String platformId);


    @Select("SELECT pc.* FROM  platform_catalog pc WHERE  pc.id = #{id}")
    @Select("SELECT pc.* FROM  platform_catalog pc WHERE pc.id = #{id}")
    PlatformCatalog selectParentCatalog(String id);

    @Select("SELECT pc.id as channelId, pc.name, pc.civilCode, pc.businessGroupId,'1' as parental, pc.parentId  " +

 src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java

@@ -708,7 +708,7 @@
                platformCatalog.setParentId(platform.getDeviceGBId());
            }else {
                // 获取顶层的
                PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platformCatalog.getPlatformId());
                PlatformCatalog topCatalog = getTopCatalog(platformCatalog.getParentId(), platform.getDeviceGBId());
                platformCatalog.setBusinessGroupId(topCatalog.getId());
            }
        }

 web_src/src/components/common/jessibuca.vue

@@ -5,8 +5,8 @@
        <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
        <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
        <i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
        <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="jessibuca.mute()"></i>
        <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i>
        <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
        <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
      </div>
      <div class="buttons-box-right">
        <span class="jessibuca-btn">{{ kBps }} kb/s</span>
@@ -243,6 +243,16 @@
      this.err = "";
      this.performance = "";
    },
    mute: function () {
      if (jessibucaPlayer[this._uid]) {
        jessibucaPlayer[this._uid].mute();
      }
    },
    cancelMute: function () {
      if (jessibucaPlayer[this._uid]) {
        jessibucaPlayer[this._uid].cancelMute();
      }
    },
    destroy: function () {
      if (jessibucaPlayer[this._uid]) {
        jessibucaPlayer[this._uid].destroy();

 web_src/src/components/control.vue

@@ -324,7 +324,7 @@
     */
    getThreadsLoad: function () {
      let that = this;
      if (that.mediaServerChoose != null) {
      if (!!that.mediaServerChoose) {
        this.$axios({
          method: 'get',
          url: '/zlm/' + that.mediaServerChoose + '/index/api/getThreadsLoad'
@@ -375,7 +375,7 @@
    },
    getLoadCount: function () {
      let that = this;
      if (that.mediaServerChoose != null) {
      if (!!that.mediaServerChoose) {
        that.mediaServer.getMediaServer(that.mediaServerChoose, (data) => {
          if (data.code == 0) {
            that.loadCount = data.data.count
@@ -473,42 +473,46 @@
    },

    getAllSession: function () {
      let that = this;
      that.allSessionData = [];
      this.$axios({
        method: 'get',
        url: '/zlm/' + that.mediaServerChoose + '/index/api/getAllSession'
      }).then(function (res) {
        res.data.data.forEach(item => {
          let data = {
            peer_ip: item.peer_ip,
            local_ip: item.local_ip,
            typeid: item.typeid,
            id: item.id
          };
          that.allSessionData.push(data);
      this.allSessionData = [];
      if (!!this.mediaServerChoose) {
        this.$axios({
          method: 'get',
          url: '/zlm/' + this.mediaServerChoose + '/index/api/getAllSession'
        }).then((res)=> {
          res.data.data.forEach(item => {
            let data = {
              peer_ip: item.peer_ip,
              local_ip: item.local_ip,
              typeid: item.typeid,
              id: item.id
            };
            this.allSessionData.push(data);
          });
        });
      });
      }

    },
    getServerConfig: function () {
      let that = this;
      this.$axios({
        method: 'get',
        url: '/zlm/' + that.mediaServerChoose + '/index/api/getServerConfig'
      }).then(function (res) {
        let info = res.data.data[0];
        let serverInfo = {}
        for (let i = 0; i < Object.keys(info).length; i++) {
          let key = Object.keys(info)[i];
          let group = key.substring(0, key.indexOf("."))
          let itemKey = key.substring(key.indexOf(".") + 1)
          if (!serverInfo[group]) serverInfo[group] = {}
          serverInfo[group][itemKey] = info[key]
        }
      if (!!this.mediaServerChoose) {
        this.$axios({
          method: 'get',
          url: '/zlm/' + that.mediaServerChoose + '/index/api/getServerConfig'
        }).then((res)=> {
          let info = res.data.data[0];
          let serverInfo = {}
          for (let i = 0; i < Object.keys(info).length; i++) {
            let key = Object.keys(info)[i];
            let group = key.substring(0, key.indexOf("."))
            let itemKey = key.substring(key.indexOf(".") + 1)
            if (!serverInfo[group]) serverInfo[group] = {}
            serverInfo[group][itemKey] = info[key]
          }

        that.serverConfig = serverInfo;
        that.visible = true;
      });
          this.serverConfig = serverInfo;
          this.visible = true;
        });
      }

    },
    getWVPServerConfig: function () {
      let that = this;
@@ -531,6 +535,14 @@
    },
    reStartServer: function () {
      let that = this;
      if (!!!this.mediaServerChoose) {
        this.$message({
          type: 'info',
          message: '未选择节点'
        });
        return;
      }

      this.$confirm('此操作将重启媒体服务器, 是否继续?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
@@ -571,17 +583,19 @@
      console.log(JSON.stringify(tabledata[index]));
    },
    deleteSession: function (id) {
      let that = this;
      this.$axios({
        method: 'get',
        url: '/zlm/' + that.mediaServerChoose + '/index/api/kick_session?id=' + id
      }).then(function (res) {
        that.getAllSession();
        that.$message({
          type: 'success',
          message: '删除成功!'
      if (!!this.mediaServerChoose) {
        this.$axios({
          method: 'get',
          url: '/zlm/' + this.mediaServerChoose + '/index/api/kick_session?id=' + id
        }).then((res)=>{
          this.getAllSession();
          this.$message({
            type: 'success',
            message: '删除成功!'
          });
        });
      });
      }

    },
    getNameFromKey: function (key) {
      let nameData = {

 web_src/src/components/dialog/devicePlayer.vue

@@ -374,7 +374,7 @@
                    url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtmp&app='+ this.app +'&stream='+ this.streamId
                }).then(function (res) {
                    that.tracksLoading = false;
                    if (res.data.code == 0 && res.data.online) {
                    if (res.data.code == 0 && res.data.tracks) {
                        that.tracks = res.data.tracks;
                    }else{
                        that.tracksNotLoaded = true;