Commit 3ab4ce0a838d44a29c3d24cef9aa6a429480f6a0
1 parent
9ae520a5
perf: 分屏监控设备列表优先使用自定义通道名称
Showing
1 changed file
with
38 additions
and
1 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
| @@ -492,7 +492,44 @@ public interface DeviceChannelMapper { | @@ -492,7 +492,44 @@ public interface DeviceChannelMapper { | ||
| 492 | void clearPlay(String deviceId); | 492 | void clearPlay(String deviceId); |
| 493 | // 设备主子码流逻辑END | 493 | // 设备主子码流逻辑END |
| 494 | @Select(value = {" <script>" + | 494 | @Select(value = {" <script>" + |
| 495 | - "select * " + | 495 | + "SELECT id,\n" + |
| 496 | + " channel_id,\n" + | ||
| 497 | + " COALESCE(custom_name, name) AS name,\n" + | ||
| 498 | + " custom_name,\n" + | ||
| 499 | + " manufacture,\n" + | ||
| 500 | + " model,\n" + | ||
| 501 | + " owner,\n" + | ||
| 502 | + " civil_code,\n" + | ||
| 503 | + " block,\n" + | ||
| 504 | + " address,\n" + | ||
| 505 | + " parent_id,\n" + | ||
| 506 | + " safety_way,\n" + | ||
| 507 | + " register_way,\n" + | ||
| 508 | + " cert_num,\n" + | ||
| 509 | + " certifiable,\n" + | ||
| 510 | + " err_code,\n" + | ||
| 511 | + " end_time,\n" + | ||
| 512 | + " secrecy,\n" + | ||
| 513 | + " ip_address,\n" + | ||
| 514 | + " port,\n" + | ||
| 515 | + " password,\n" + | ||
| 516 | + " COALESCE(custom_ptz_type, ptz_type) AS ptz_type,\n" + | ||
| 517 | + " status,\n" + | ||
| 518 | + " COALESCE(custom_longitude, longitude) AS longitude,\n" + | ||
| 519 | + " COALESCE(custom_latitude, latitude) AS latitude,\n" + | ||
| 520 | + " stream_id,\n" + | ||
| 521 | + " device_id,\n" + | ||
| 522 | + " parental,\n" + | ||
| 523 | + " has_audio,\n" + | ||
| 524 | + " create_time,\n" + | ||
| 525 | + " update_time,\n" + | ||
| 526 | + " sub_count,\n" + | ||
| 527 | + " longitude_gcj02,\n" + | ||
| 528 | + " latitude_gcj02,\n" + | ||
| 529 | + " longitude_wgs84,\n" + | ||
| 530 | + " latitude_wgs84,\n" + | ||
| 531 | + " business_group_id,\n" + | ||
| 532 | + " gps_time\n" + | ||
| 496 | "from wvp_device_channel " + | 533 | "from wvp_device_channel " + |
| 497 | "where device_id=#{deviceId}" + | 534 | "where device_id=#{deviceId}" + |
| 498 | " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" + | 535 | " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" + |