panlinlin
2021-01-08 0020402685c0997c0a73bc7ac90535e50e8f972a
完成向上级联->选择通道-001
4个文件已修改
47 ■■■■■ 已修改文件
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/ParentPlatformList.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/channelList.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -8,15 +8,15 @@
public class SipConfig {
    @Value("${sip.ip}")
    String sipIp;
    private String sipIp;
    @Value("${sip.port}")
    Integer sipPort;
    private Integer sipPort;
    @Value("${sip.domain}")
    String sipDomain;
    private String sipDomain;
    @Value("${sip.id}")
    String sipId;
    private String sipId;
    @Value("${sip.password}")
    String sipPassword;
    private String sipPassword;
    
    @Value("${sip.ptz.speed:50}")
    Integer speed;
@@ -25,47 +25,28 @@
        return sipIp;
    }
    public void setSipIp(String sipIp) {
        this.sipIp = sipIp;
    }
    public Integer getSipPort() {
        return sipPort;
    }
    public void setSipPort(Integer sipPort) {
        this.sipPort = sipPort;
    }
    public String getSipDomain() {
        return sipDomain;
    }
    public void setSipDomain(String sipDomain) {
        this.sipDomain = sipDomain;
    }
    public String getSipId() {
        return sipId;
    }
    public void setSipId(String sipId) {
        this.sipId = sipId;
    }
    public String getSipPassword() {
        return sipPassword;
    }
    public void setSipPassword(String sipPassword) {
        this.sipPassword = sipPassword;
    }
    public Integer getSpeed() {
        return speed;
    }
    public void setSpeed(Integer speed) {
        this.speed = speed;
    }
}
src/main/java/com/genersoft/iot/vmp/storager/dao/ParentPlatformMapper.java
@@ -45,7 +45,6 @@
    @Delete("DELETE FROM parent_platform WHERE deviceGBId=#{deviceGBId}")
    int delParentPlatform(ParentPlatform parentPlatform);
    @Select("SELECT * FROM parent_platform")
    List<ParentPlatform> getParentPlatformList();
web_src/src/components/ParentPlatformList.vue
@@ -39,9 +39,9 @@
            </template>
          </el-table-column>
          <el-table-column prop="deviceGBId" label="设备国标编号" width="240" align="center"></el-table-column>
          <el-table-column prop="transport" label="流传输模式" width="120" align="center"></el-table-column>
          <el-table-column prop="transport" label="信令传输模式" width="120" align="center"></el-table-column>
          <el-table-column prop="channelCount" label="通道数" align="center"></el-table-column>
          <el-table-column label="操作" width="300" align="center" fixed="right">
            <template slot-scope="scope">
              <el-button size="mini" icon="el-icon-edit" @click="editPlatform(scope.row)">编辑</el-button>
@@ -61,6 +61,7 @@
          :total="total">
        </el-pagination>
      <platformEdit ref="platformEdit" ></platformEdit>
      <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
      </el-main>
    </el-container>
  </div>
@@ -69,11 +70,13 @@
<script>
import platformEdit from './platformEdit.vue'
import uiHeader from './UiHeader.vue'
import chooseChannelDialog from './gb28181/chooseChannel.vue'
export default {
  name: 'app',
  components: {
    platformEdit,
    uiHeader
    uiHeader,
    chooseChannelDialog
  },
  data() {
    return {
@@ -86,11 +89,13 @@
    };
  },
  computed: {
    getcurrentDeviceChannels: function() {
    }
  },
  mounted() {
     this.$refs.chooseChannelDialog.openDialog()
    this.initData();
    this.updateLooper = setInterval(this.initData, 10000);
  },
@@ -133,7 +138,7 @@
            });
    },
    chooseChannel: function(platform) {
       this.$refs.chooseChannelDialog.openDialog()
    },
    initData: function() {
      this.getPlatformList();
web_src/src/components/channelList.vue
@@ -31,6 +31,8 @@
            <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
                <el-table-column prop="channelId" label="通道编号" width="210">
                </el-table-column>
                <el-table-column prop="channelId" label="设备编号" width="210">
                </el-table-column>
                <el-table-column prop="name" label="通道名称">
                </el-table-column>
                <el-table-column prop="subCount" label="子节点数">