From 3d68b56bb5ecbc3d34b2901c671dc7f1f0f82f74 Mon Sep 17 00:00:00 2001
From: pedoc <pedoc@qq.com>
Date: 星期一, 29 一月 2024 18:05:17 +0800
Subject: [PATCH] 修复未配置sipdomain时出现异常
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 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..0759708 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
@@ -107,7 +107,11 @@
"wvp_device_channel dc " +
"WHERE " +
"dc.device_id = #{deviceId} " +
-" <if test='query != null'> AND (dc.channel_id LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%') OR dc.name LIKE concat('%',#{query},'%'))</if> " +
+ " <if test='query != null'> AND (" +
+ "dc.channel_id LIKE concat('%',#{query},'%') " +
+ "OR dc.name LIKE concat('%',#{query},'%') " +
+ "OR dc.custom_name LIKE concat('%',#{query},'%')" +
+ ")</if> " +
" <if test='parentChannelId != null'> AND (dc.parent_id=#{parentChannelId} OR dc.civil_code = #{parentChannelId}) </if> " +
" <if test='online == true' > AND dc.status= true</if>" +
" <if test='online == false' > AND dc.status= false</if>" +
@@ -492,7 +496,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