From 9ae520a58a805df5a0e8447d327e8459c5e6d845 Mon Sep 17 00:00:00 2001
From: xiaoQQya <xiaoQQya@126.com>
Date: 星期二, 19 十二月 2023 15:22:09 +0800
Subject: [PATCH] feat(channel): 新增通道支持自定义名称、位置及云台类型
---
web_src/src/components/channelList.vue | 343 ++++++++++++++++++++++++++++++++++--------------
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 55 ++++++-
2 files changed, 286 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 1ff0d29..055a95c 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -6,7 +6,6 @@
import com.genersoft.iot.vmp.vmanager.gb28181.platform.bean.ChannelReduce;
import com.genersoft.iot.vmp.web.gb28181.dto.DeviceChannelExtend;
import org.apache.ibatis.annotations.*;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -31,7 +30,7 @@
@Update(value = {" <script>" +
"UPDATE wvp_device_channel " +
"SET update_time=#{updateTime}" +
- "<if test='name != null'>, name=#{name}</if>" +
+ ", custom_name=#{name}" +
"<if test='manufacture != null'>, manufacture=#{manufacture}</if>" +
"<if test='model != null'>, model=#{model}</if>" +
"<if test='owner != null'>, owner=#{owner}</if>" +
@@ -49,12 +48,12 @@
"<if test='ipAddress != null'>, ip_address=#{ipAddress}</if>" +
"<if test='port != null'>, port=#{port}</if>" +
"<if test='password != null'>, password=#{password}</if>" +
- "<if test='PTZType != null'>, ptz_type=#{PTZType}</if>" +
+ "<if test='PTZType != null'>, custom_ptz_type=#{PTZType}</if>" +
"<if test='status != null'>, status=#{status}</if>" +
"<if test='streamId != null'>, stream_id=#{streamId}</if>" +
"<if test='hasAudio != null'>, has_audio=#{hasAudio}</if>" +
- "<if test='longitude != null'>, longitude=#{longitude}</if>" +
- "<if test='latitude != null'>, latitude=#{latitude}</if>" +
+ ", custom_longitude=#{longitude}" +
+ ", custom_latitude=#{latitude}" +
"<if test='longitudeGcj02 != null'>, longitude_gcj02=#{longitudeGcj02}</if>" +
"<if test='latitudeGcj02 != null'>, latitude_gcj02=#{latitudeGcj02}</if>" +
"<if test='longitudeWgs84 != null'>, longitude_wgs84=#{longitudeWgs84}</if>" +
@@ -67,7 +66,43 @@
@Select(value = {" <script>" +
"SELECT " +
- "dc.* " +
+ "dc.id, " +
+ "dc.channel_id, " +
+ "COALESCE(dc.custom_name, dc.name) AS name, " +
+ "dc.manufacture, " +
+ "dc.model, " +
+ "dc.owner, " +
+ "dc.civil_code, " +
+ "dc.block, " +
+ "dc.address, " +
+ "dc.parent_id, " +
+ "dc.safety_way, " +
+ "dc.register_way, " +
+ "dc.cert_num, " +
+ "dc.certifiable, " +
+ "dc.err_code, " +
+ "dc.end_time, " +
+ "dc.secrecy, " +
+ "dc.ip_address, " +
+ "dc.port, " +
+ "dc.password, " +
+ "COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, " +
+ "dc.status, " +
+ "COALESCE(dc.custom_longitude, dc.longitude) AS longitude, " +
+ "COALESCE(dc.custom_latitude, dc.latitude) AS latitude, " +
+ "dc.stream_id, " +
+ "dc.device_id, " +
+ "dc.parental, " +
+ "dc.has_audio, " +
+ "dc.create_time, " +
+ "dc.update_time, " +
+ "dc.sub_count, " +
+ "dc.longitude_gcj02, " +
+ "dc.latitude_gcj02, " +
+ "dc.longitude_wgs84, " +
+ "dc.latitude_wgs84, " +
+ "dc.business_group_id, " +
+ "dc.gps_time " +
"from " +
"wvp_device_channel dc " +
"WHERE " +
@@ -154,7 +189,7 @@
" dc.id,\n" +
" dc.channel_id,\n" +
" dc.device_id,\n" +
- " dc.name,\n" +
+ " COALESCE(dc.custom_name, dc.name) AS name,\n" +
" de.manufacturer,\n" +
" de.host_address,\n" +
" dc.sub_count,\n" +
@@ -392,10 +427,10 @@
@Select("select * from wvp_device_channel where device_id=#{deviceId} and SUBSTRING(channel_id, 11, 3)=#{typeCode}")
List<DeviceChannel> getBusinessGroups(@Param("deviceId") String deviceId, @Param("typeCode") String typeCode);
- @Select("select dc.id, dc.channel_id, dc.device_id, dc.name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
+ @Select("select dc.id, dc.channel_id, dc.device_id, COALESCE(dc.custom_name, dc.name) AS name, dc.manufacture,dc.model,dc.owner, pc.civil_code,dc.block, " +
" dc.address, '0' as parental,'0' as channel_type, pc.id as parent_id, dc.safety_way, dc.register_way,dc.cert_num, dc.certifiable, " +
- " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, dc.ptz_type, dc.password, dc.status, " +
- " dc.longitude_wgs84 as longitude, dc.latitude_wgs84 as latitude, pc.business_group_id " +
+ " dc.err_code,dc.end_time, dc.secrecy, dc.ip_address, dc.port, COALESCE(dc.custom_ptz_type, dc.ptz_type) AS ptz_type, dc.password, dc.status, " +
+ " COALESCE(dc.custom_longitude, dc.longitude) AS longitude, COALESCE(dc.custom_latitude, dc.latitude) AS latitude, pc.business_group_id " +
" from wvp_device_channel dc" +
" LEFT JOIN wvp_platform_gb_channel pgc on dc.id = pgc.device_channel_id" +
" LEFT JOIN wvp_platform_catalog pc on pgc.catalog_id = pc.id and pgc.platform_id = pc.platform_id" +
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 612416b..5547913 100755
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -33,98 +33,156 @@
<el-option label="娴佺晠" :value="true"></el-option>
</el-select>
</div>
- <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
- <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
- <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
+ <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
+ <el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
+ <el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
+ </div>
</div>
- </div>
- <devicePlayer ref="devicePlayer" ></devicePlayer>
- <el-container v-loading="isLoging" style="height: 82vh;">
- <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" >
- <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree>
- </el-aside>
- <el-main style="padding: 5px;">
- <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%" header-row-class-name="table-header">
- <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
- </el-table-column>
- <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
- </el-table-column>
- <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
- </el-table-column>
- <el-table-column label="蹇収" min-width="120">
- <template v-slot:default="scope">
- <el-image
- :src="getSnap(scope.row)"
- :preview-src-list="getBigSnap(scope.row)"
- @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
- :fit="'contain'"
- style="width: 60px">
- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
+ <devicePlayer ref="devicePlayer"></devicePlayer>
+ <el-container v-loading="isLoging" style="height: 82vh;">
+ <el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree">
+ <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent"></DeviceTree>
+ </el-aside>
+ <el-main style="padding: 5px;">
+ <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%"
+ header-row-class-name="table-header">
+ <el-table-column prop="channelId" label="閫氶亾缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="deviceId" label="璁惧缂栧彿" min-width="200">
+ </el-table-column>
+ <el-table-column prop="name" label="閫氶亾鍚嶇О" min-width="200">
+ <template v-slot:default="scope">
+ <el-input
+ v-show="scope.row.edit"
+ v-model="scope.row.name"
+ placeholder="閫氶亾鍚嶇О"
+ :maxlength="255"
+ show-word-limit
+ clearable
+ />
+ <span v-show="!scope.row.edit">{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="蹇収" min-width="120">
+ <template v-slot:default="scope">
+ <el-image
+ :src="getSnap(scope.row)"
+ :preview-src-list="getBigSnap(scope.row)"
+ @error="getSnapErrorEvent(scope.row.deviceId, scope.row.channelId)"
+ :fit="'contain'"
+ style="width: 60px">
+ <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div>
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120">
+ </el-table-column>
+ <el-table-column prop="manufacture" label="鍘傚" min-width="120">
+ </el-table-column>
+ <el-table-column label="浣嶇疆淇℃伅" min-width="200">
+ <template v-slot:default="scope">
+ <el-input
+ v-show="scope.row.edit"
+ v-model="scope.row.location"
+ placeholder="渚嬶細117.234,36.378"
+ :maxlength="30"
+ show-word-limit
+ clearable
+ />
+ <span v-show="!scope.row.edit">{{ scope.row.location }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="PTZType" label="浜戝彴绫诲瀷" min-width="120">
+ <template v-slot:default="scope">
+ <el-select v-show="scope.row.edit" v-model="scope.row.PTZType"
+ placeholder="浜戝彴绫诲瀷" filterable>
+ <el-option
+ v-for="(value, key) in ptzTypes"
+ :key="key"
+ :label="value"
+ :value="key"
+ />
+ </el-select>
+ <div v-show="!scope.row.edit">{{ scope.row.PTZTypeText }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="寮�鍚煶棰�" min-width="120">
+ <template slot-scope="scope">
+ <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鐘舵��" min-width="120">
+ <template slot-scope="scope">
+ <div slot="reference" class="name-wrapper">
+ <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
</div>
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="subCount" label="瀛愯妭鐐规暟" min-width="120">
- </el-table-column>
- <el-table-column prop="manufacture" label="鍘傚" min-width="120">
- </el-table-column>
- <el-table-column label="浣嶇疆淇℃伅" min-width="200">
- <template slot-scope="scope">
- <span v-if="scope.row.longitude*scope.row.latitude > 0">{{ scope.row.longitude }},<br>{{ scope.row.latitude }}</span>
- <span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
- </template>
- </el-table-column>
- <el-table-column prop="PTZTypeText" label="浜戝彴绫诲瀷" min-width="120"/>
- <el-table-column label="寮�鍚煶棰�" min-width="120">
- <template slot-scope="scope">
- <el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column label="鐘舵��" min-width="120">
- <template slot-scope="scope">
- <div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
- </div>
- </template>
- </el-table-column>
+ </template>
+ </el-table-column>
- <el-table-column label="鎿嶄綔" min-width="280" fixed="right">
- <template slot-scope="scope">
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play" type="text" @click="sendDevicePush(scope.row)">鎾斁</el-button>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-switch-button" type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
- @click="stopDevicePush(scope.row)">鍋滄
- </el-button>
- <el-divider direction="vertical"></el-divider>
- <el-button size="medium" icon="el-icon-s-open" type="text" v-if="scope.row.subCount > 0 || scope.row.parental === 1"
- @click="changeSubchannel(scope.row)">鏌ョ湅
- </el-button>
- <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
- </el-button>
- <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
- type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
- </el-button>
- </template>
- </el-table-column>
- </el-table>
- <el-pagination
- style="float: right"
- @size-change="handleSizeChange"
- @current-change="currentChange"
- :current-page="currentPage"
- :page-size="count"
- :page-sizes="[15, 25, 35, 50]"
- layout="total, sizes, prev, pager, next"
- :total="total">
- </el-pagination>
- </el-main>
- </el-container>
+ <el-table-column label="鎿嶄綔" min-width="340" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-play"
+ type="text" @click="sendDevicePush(scope.row)">鎾斁
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
+ icon="el-icon-switch-button"
+ type="text" style="color: #f56c6c" v-if="!!scope.row.streamId"
+ @click="stopDevicePush(scope.row)">鍋滄
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button
+ v-if="scope.row.edit"
+ size="medium"
+ type="text"
+ icon="el-icon-edit-outline"
+ @click="handleSave(scope.row)"
+ >
+ 淇濆瓨
+ </el-button>
+ <el-button
+ v-else
+ size="medium"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleEdit(scope.row)"
+ >
+ 缂栬緫
+ </el-button>
+ <el-divider direction="vertical"></el-divider>
+ <el-button size="medium" icon="el-icon-s-open" type="text"
+ v-if="scope.row.subCount > 0 || scope.row.parental === 1"
+ @click="changeSubchannel(scope.row)">鏌ョ湅
+ </el-button>
+ <el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0"
+ icon="el-icon-video-camera"
+ type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
+ type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <el-pagination
+ style="float: right"
+ @size-change="handleSizeChange"
+ @current-change="currentChange"
+ :current-page="currentPage"
+ :page-size="count"
+ :page-sizes="[15, 25, 35, 50]"
+ layout="total, sizes, prev, pager, next"
+ :total="total">
+ </el-pagination>
+ </el-main>
+ </el-container>
- <!--璁惧鍒楄〃-->
+ <!--璁惧鍒楄〃-->
</div>
</template>
@@ -163,16 +221,23 @@
beforeUrl: "/deviceList",
isLoging: false,
showTree: false,
- loadSnap: {}
+ loadSnap: {},
+ ptzTypes: {
+ 0: "鏈煡",
+ 1: "鐞冩満",
+ 2: "鍗婄悆",
+ 3: "鍥哄畾鏋満",
+ 4: "閬ユ帶鏋満"
+ }
};
},
mounted() {
if (this.deviceId) {
- this.deviceService.getDevice(this.deviceId, (result)=>{
- this.device = result;
+ this.deviceService.getDevice(this.deviceId, (result) => {
+ this.device = result;
- }, (error)=>{
+ }, (error) => {
console.log("鑾峰彇璁惧淇℃伅澶辫触")
console.error(error)
})
@@ -227,6 +292,14 @@
if (res.data.code === 0) {
that.total = res.data.data.total;
that.deviceChannelList = res.data.data.list;
+ that.deviceChannelList.forEach(e => {
+ e.PTZType = e.PTZType + "";
+ that.$set(e, "edit", false);
+ that.$set(e, "location", "");
+ if (e.longitude && e.latitude) {
+ that.$set(e, "location", e.longitude + "," + e.latitude);
+ }
+ });
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
@@ -248,7 +321,7 @@
this.$axios({
method: 'get',
url: '/api/play/start/' + deviceId + '/' + channelId,
- params:{
+ params: {
isSubStream: this.isSubStream
}
}).then(function (res) {
@@ -271,7 +344,7 @@
that.initData();
}, 1000)
- }else{
+ } else {
that.$message.error(res.data.msg);
}
}).catch(function (e) {
@@ -297,7 +370,7 @@
this.$axios({
method: 'get',
url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId,
- params:{
+ params: {
isSubStream: this.isSubStream
}
}).then(function (res) {
@@ -326,7 +399,7 @@
return;
}
setTimeout(() => {
- let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + deviceId + '/' + channelId
+ let url = (process.env.NODE_ENV === 'development' ? "debug" : "") + '/api/device/query/snap/' + deviceId + '/' + channelId
this.loadSnap[deviceId + channelId]++
document.getElementById(deviceId + channelId).setAttribute("src", url + '?' + new Date().getTime())
}, 1000)
@@ -363,10 +436,18 @@
online: this.online,
channelType: this.channelType
}
- }).then( (res) =>{
+ }).then((res) => {
if (res.data.code === 0) {
this.total = res.data.data.total;
this.deviceChannelList = res.data.data.list;
+ this.deviceChannelList.forEach(e => {
+ e.PTZType = e.PTZType + "";
+ this.$set(e, "edit", false);
+ this.$set(e, "location", "");
+ if (e.longitude && e.latitude) {
+ this.$set(e, "location", e.longitude + "," + e.latitude);
+ }
+ });
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
this.$nextTick(() => {
this.$refs.channelListTable.doLayout();
@@ -376,7 +457,7 @@
}).catch(function (error) {
console.log(error);
});
- }else {
+ } else {
this.$axios({
method: 'get',
url: `/api/device/query/tree/channel/${this.deviceId}`,
@@ -385,7 +466,7 @@
page: this.currentPage,
count: this.count,
}
- }).then((res)=> {
+ }).then((res) => {
if (res.data.code === 0) {
this.total = res.data.total;
this.deviceChannelList = res.data.list;
@@ -417,14 +498,14 @@
refresh: function () {
this.initData();
},
- switchTree: function (){
+ switchTree: function () {
this.showTree = true;
this.deviceChannelList = [];
this.parentChannelId = 0;
this.currentPage = 1;
},
- switchList: function (){
+ switchList: function () {
this.showTree = false;
this.deviceChannelList = [];
this.parentChannelId = 0;
@@ -435,12 +516,70 @@
console.log(device)
if (!!!data.channelId) {
this.parentChannelId = device.deviceId;
- }else {
+ } else {
this.parentChannelId = data.channelId;
}
this.initData();
- }
+ },
+ // 淇濆瓨
+ handleSave(row) {
+ if (row.location) {
+ const segements = row.location.split(",");
+ if (segements.length !== 2) {
+ this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
+ return;
+ } else {
+ row.longitude = parseFloat(segements[0]);
+ row.latitude = parseFloat(segements[1]);
+ if (!(row.longitude && row.latitude)) {
+ this.$message.warning("浣嶇疆淇℃伅鏍煎紡鏈夎锛屼緥锛�117.234,36.378");
+ return;
+ }
+ }
+ } else {
+ delete row.longitude;
+ delete row.latitude;
+ }
+ Object.keys(row).forEach(key => {
+ const value = row[key];
+ if (value === null || value === undefined || (typeof value === "string" && value.trim() === "")) {
+ delete row[key];
+ }
+ });
+ this.$axios({
+ method: 'post',
+ url: `/api/device/query/channel/update/${this.deviceId}`,
+ params: row
+ }).then(response => {
+ if (response.data.code === 0) {
+ this.$message.success("淇敼鎴愬姛锛�");
+ this.initData();
+ } else {
+ this.$message.error("淇敼澶辫触锛�");
+ }
+ }).catch(_ => {
+ this.$message.error("淇敼澶辫触锛�");
+ })
+ },
+ // 鏄惁姝ｅ湪缂栬緫
+ isEdit() {
+ let editing = false;
+ this.deviceChannelList.forEach(e => {
+ if (e.edit) {
+ editing = true;
+ }
+ });
+ return editing;
+ },
+ // 缂栬緫
+ handleEdit(row) {
+ if (this.isEdit()) {
+ this.$message.warning('璇蜂繚瀛樺綋鍓嶇紪杈戦」锛�');
+ } else {
+ row.edit = true;
+ }
+ }
}
};
</script>
--
Gitblit v1.8.0