修复默认新建设备未设置节点策略的BUG
parent
7d669f74ec
commit
36409eb34c
|
@ -59,6 +59,7 @@ public interface DeviceMapper {
|
||||||
"firmware, " +
|
"firmware, " +
|
||||||
"transport," +
|
"transport," +
|
||||||
"stream_mode," +
|
"stream_mode," +
|
||||||
|
"media_server_id," +
|
||||||
"ip," +
|
"ip," +
|
||||||
"sdp_ip," +
|
"sdp_ip," +
|
||||||
"local_ip," +
|
"local_ip," +
|
||||||
|
@ -88,6 +89,7 @@ public interface DeviceMapper {
|
||||||
"#{firmware}," +
|
"#{firmware}," +
|
||||||
"#{transport}," +
|
"#{transport}," +
|
||||||
"#{streamMode}," +
|
"#{streamMode}," +
|
||||||
|
"#{mediaServerId}," +
|
||||||
"#{ip}," +
|
"#{ip}," +
|
||||||
"#{sdpIp}," +
|
"#{sdpIp}," +
|
||||||
"#{localIp}," +
|
"#{localIp}," +
|
||||||
|
|
|
@ -168,15 +168,13 @@ public class DeviceServiceImpl implements IDeviceService {
|
||||||
}
|
}
|
||||||
|
|
||||||
}else {
|
}else {
|
||||||
if (deviceChannelMapper.queryChannelsByDeviceDbId(device.getId()).isEmpty()) {
|
|
||||||
log.info("[设备上线]: {},通道数为0,查询通道信息", device.getDeviceId());
|
|
||||||
sync(device);
|
|
||||||
}
|
|
||||||
|
|
||||||
deviceMapper.update(device);
|
deviceMapper.update(device);
|
||||||
redisCatchStorage.updateDevice(device);
|
redisCatchStorage.updateDevice(device);
|
||||||
}
|
}
|
||||||
|
if (deviceChannelMapper.queryChannelsByDeviceDbId(device.getId()).isEmpty()) {
|
||||||
|
log.info("[设备上线]: {},通道数为0,查询通道信息", device.getDeviceId());
|
||||||
|
sync(device);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 刷新过期任务
|
// 刷新过期任务
|
||||||
|
|
|
@ -172,6 +172,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
|
||||||
device.setStreamMode("UDP");
|
device.setStreamMode("UDP");
|
||||||
device.setCharset("GB2312");
|
device.setCharset("GB2312");
|
||||||
device.setGeoCoordSys("WGS84");
|
device.setGeoCoordSys("WGS84");
|
||||||
|
device.setMediaServerId("auto");
|
||||||
device.setDeviceId(deviceId);
|
device.setDeviceId(deviceId);
|
||||||
device.setOnLine(false);
|
device.setOnLine(false);
|
||||||
}else {
|
}else {
|
||||||
|
|
|
@ -25,7 +25,7 @@ create table wvp_device
|
||||||
charset character varying(50),
|
charset character varying(50),
|
||||||
ssrc_check bool default false,
|
ssrc_check bool default false,
|
||||||
geo_coord_sys character varying(50),
|
geo_coord_sys character varying(50),
|
||||||
media_server_id character varying(50),
|
media_server_id character varying(50) default 'auto',
|
||||||
custom_name character varying(255),
|
custom_name character varying(255),
|
||||||
sdp_ip character varying(50),
|
sdp_ip character varying(50),
|
||||||
local_ip character varying(50),
|
local_ip character varying(50),
|
||||||
|
|
Loading…
Reference in New Issue