From 8874c90db2c238fa4c55df491675fe7fec9d93b2 Mon Sep 17 00:00:00 2001
From: fine <54142345+criver31@users.noreply.github.com>
Date: 星期二, 09 一月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 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 055a95c..608bc27 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
@@ -492,7 +492,44 @@
void clearPlay(String deviceId);
// 璁惧涓诲瓙鐮佹祦閫昏緫END
@Select(value = {" <script>" +
- "select * " +
+ "SELECT id,\n" +
+ " channel_id,\n" +
+ " COALESCE(custom_name, name) AS name,\n" +
+ " custom_name,\n" +
+ " manufacture,\n" +
+ " model,\n" +
+ " owner,\n" +
+ " civil_code,\n" +
+ " block,\n" +
+ " address,\n" +
+ " parent_id,\n" +
+ " safety_way,\n" +
+ " register_way,\n" +
+ " cert_num,\n" +
+ " certifiable,\n" +
+ " err_code,\n" +
+ " end_time,\n" +
+ " secrecy,\n" +
+ " ip_address,\n" +
+ " port,\n" +
+ " password,\n" +
+ " COALESCE(custom_ptz_type, ptz_type) AS ptz_type,\n" +
+ " status,\n" +
+ " COALESCE(custom_longitude, longitude) AS longitude,\n" +
+ " COALESCE(custom_latitude, latitude) AS latitude,\n" +
+ " stream_id,\n" +
+ " device_id,\n" +
+ " parental,\n" +
+ " has_audio,\n" +
+ " create_time,\n" +
+ " update_time,\n" +
+ " sub_count,\n" +
+ " longitude_gcj02,\n" +
+ " latitude_gcj02,\n" +
+ " longitude_wgs84,\n" +
+ " latitude_wgs84,\n" +
+ " business_group_id,\n" +
+ " gps_time\n" +
"from wvp_device_channel " +
"where device_id=#{deviceId}" +
" <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
--
Gitblit v1.8.0