From 1b81080f6f7da35d2af7d194a5aa7be720d1eaa4 Mon Sep 17 00:00:00 2001
From: yangjunyi <yangjunyi@huali-tec.com>
Date: 星期二, 29 八月 2023 14:23:28 +0800
Subject: [PATCH] 修复通道目录同步异常问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
old mode 100644
new mode 100755
index ebf2933..96773fe
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -41,9 +40,9 @@
"ssrc_check," +
"as_message_channel," +
"geo_coord_sys," +
- "tree_type," +
- "online," +
+ "on_line," +
"media_server_id," +
+ "switch_primary_sub_stream," +
"(SELECT count(0) FROM wvp_device_channel WHERE device_id=wvp_device.device_id) as channel_count "+
" FROM wvp_device WHERE device_id = #{deviceId}")
Device getDeviceByDeviceId(String deviceId);
@@ -75,8 +74,7 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
+ "on_line"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -104,8 +102,7 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
- "#{online}" +
+ "#{onLine}" +
")")
int add(Device device);
@@ -121,7 +118,7 @@
"<if test=\"localIp != null\">, local_ip=#{localIp}</if>" +
"<if test=\"port != null\">, port=#{port}</if>" +
"<if test=\"hostAddress != null\">, host_address=#{hostAddress}</if>" +
- "<if test=\"online != null\">, online=#{online}</if>" +
+ "<if test=\"onLine != null\">, on_line=#{onLine}</if>" +
"<if test=\"registerTime != null\">, register_time=#{registerTime}</if>" +
"<if test=\"keepaliveTime != null\">, keepalive_time=#{keepaliveTime}</if>" +
"<if test=\"keepaliveIntervalTime != null\">, keepalive_interval_time=#{keepaliveIntervalTime}</if>" +
@@ -159,14 +156,16 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online,"+
+ "on_line,"+
"media_server_id,"+
- "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count FROM wvp_device de" +
- "<if test=\"online != null\"> where online=${online}</if>"+
+ "switch_primary_sub_stream switchPrimarySubStream,"+
+ "(SELECT count(0) FROM wvp_device_channel WHERE device_id=de.device_id) as channel_count " +
+ "FROM wvp_device de" +
+ "<if test=\"onLine != null\"> where on_line=${onLine}</if>"+
+ " order by create_time desc "+
" </script>"
)
- List<Device> getDevices(Boolean online);
+ List<Device> getDevices(Boolean onLine);
@Delete("DELETE FROM wvp_device WHERE device_id=#{deviceId}")
int del(String deviceId);
@@ -198,9 +197,8 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
- " FROM wvp_device WHERE online = true")
+ "on_line"+
+ " FROM wvp_device WHERE on_line = true")
List<Device> getOnlineDevices();
@Select("SELECT " +
"device_id,"+
@@ -229,8 +227,7 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online"+
+ "on_line"+
" FROM wvp_device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@@ -251,7 +248,7 @@
"<if test=\"ssrcCheck != null\">, ssrc_check=#{ssrcCheck}</if>" +
"<if test=\"asMessageChannel != null\">, as_message_channel=#{asMessageChannel}</if>" +
"<if test=\"geoCoordSys != null\">, geo_coord_sys=#{geoCoordSys}</if>" +
- "<if test=\"treeType != null\">, tree_type=#{treeType}</if>" +
+ "<if test=\"switchPrimarySubStream != null\">, switch_primary_sub_stream=#{switchPrimarySubStream}</if>" +
"<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
"WHERE device_id=#{deviceId}"+
" </script>"})
@@ -268,9 +265,9 @@
"ssrc_check,"+
"as_message_channel,"+
"geo_coord_sys,"+
- "tree_type,"+
- "online,"+
- "media_server_id"+
+ "on_line,"+
+ "media_server_id,"+
+ "switch_primary_sub_stream"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -282,14 +279,11 @@
"#{ssrcCheck}," +
"#{asMessageChannel}," +
"#{geoCoordSys}," +
- "#{treeType}," +
- "#{online}," +
- "#{mediaServerId}" +
+ "#{onLine}," +
+ "#{mediaServerId}," +
+ "#{switchPrimarySubStream}" +
")")
void addCustomDevice(Device device);
-
- @Select("select count(1) as total, sum(online) as online FROM wvp_device")
- ResourceBaceInfo getOverview();
@Select("select * FROM wvp_device")
List<Device> getAll();
--
Gitblit v1.8.0