From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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
index ebf2933..8162df9 100644
--- 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;
@@ -42,8 +41,9 @@
"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);
@@ -76,7 +76,7 @@
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
- "online"+
+ "on_line"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -105,7 +105,7 @@
"#{asMessageChannel}," +
"#{geoCoordSys}," +
"#{treeType}," +
- "#{online}" +
+ "#{onLine}" +
")")
int add(Device device);
@@ -121,7 +121,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>" +
@@ -160,13 +160,16 @@
"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);
@@ -199,8 +202,8 @@
"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,"+
@@ -230,7 +233,7 @@
"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);
@@ -252,6 +255,7 @@
"<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>"})
@@ -269,8 +273,9 @@
"as_message_channel,"+
"geo_coord_sys,"+
"tree_type,"+
- "online,"+
- "media_server_id"+
+ "on_line,"+
+ "media_server_id,"+
+ "switch_primary_sub_stream"+
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -283,13 +288,11 @@
"#{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