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): 新增通道支持自定义名称、位置及云台类型
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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" +
--
Gitblit v1.8.0