首页改造完成,待添加系统信息

This commit is contained in:
648540858
2022-10-24 15:20:35 +08:00
parent 3ffe205082
commit ca891f367c
38 changed files with 882 additions and 168 deletions

View File

@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.service;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import java.util.List;
@@ -32,4 +33,9 @@ public interface IDeviceChannelService {
*/
int updateChannels(String deviceId, List<DeviceChannel> channels);
/**
* 获取统计信息
* @return
*/
ResourceBaceInfo getOverview();
}

View File

@@ -4,6 +4,7 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import java.util.List;
@@ -155,4 +156,11 @@ public interface IDeviceService {
* @return
*/
boolean delete(String deviceId);
/**
* 获取统计信息
* @return
*/
ResourceBaceInfo getOverview();
}

View File

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.service.bean.SSRCInfo;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import java.util.List;
import java.util.Map;
/**
* 媒体服务节点
@@ -87,4 +89,10 @@ public interface IMediaServerService {
void updateMediaServerKeepalive(String mediaServerId, JSONObject data);
boolean checkRtpServer(MediaServerItem mediaServerItem, String rtp, String stream);
/**
* 获取负载信息
* @return
*/
MediaServerLoad getLoad(MediaServerItem mediaServerItem);
}

View File

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.github.pagehelper.PageInfo;
public interface IStreamProxyService {
@@ -102,4 +103,11 @@ public interface IStreamProxyService {
* 更新代理流
*/
boolean updateStreamProxy(StreamProxyItem streamProxyItem);
/**
* 获取统计信息
* @return
*/
ResourceBaceInfo getOverview();
}

View File

@@ -6,6 +6,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import com.github.pagehelper.PageInfo;
@@ -106,4 +107,10 @@ public interface IStreamPushService {
* @return
*/
List<String> getAllAppAndStream();
/**
* 获取统计信息
* @return
*/
ResourceBaceInfo getOverview();
}

View File

@@ -0,0 +1,50 @@
package com.genersoft.iot.vmp.service.bean;
public class MediaServerLoad {
private String id;
private int push;
private int proxy;
private int gbReceive;
private int gbSend;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public int getPush() {
return push;
}
public void setPush(int push) {
this.push = push;
}
public int getProxy() {
return proxy;
}
public void setProxy(int proxy) {
this.proxy = proxy;
}
public int getGbReceive() {
return gbReceive;
}
public void setGbReceive(int gbReceive) {
this.gbReceive = gbReceive;
}
public int getGbSend() {
return gbSend;
}
public void setGbSend(int gbSend) {
this.gbSend = gbSend;
}
}

View File

@@ -9,6 +9,7 @@ import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -162,4 +163,9 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
}
return addChannels.size() + updateChannels.size();
}
@Override
public ResourceBaceInfo getOverview() {
return channelMapper.getOverview();
}
}

View File

@@ -19,6 +19,7 @@ import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -620,4 +621,9 @@ public class DeviceServiceImpl implements IDeviceService {
}
return result;
}
@Override
public ResourceBaceInfo getOverview() {
return deviceMapper.getOverview();
}
}

View File

@@ -10,6 +10,8 @@ import java.util.Set;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -90,6 +92,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
@Autowired
private DynamicTask dynamicTask;
@Autowired
private IRedisCatchStorage redisCatchStorage;
/**
* 初始化
*/
@@ -691,4 +696,15 @@ public class MediaServerServiceImpl implements IMediaServerService {
}
return false;
}
@Override
public MediaServerLoad getLoad(MediaServerItem mediaServerItem) {
MediaServerLoad result = new MediaServerLoad();
result.setId(mediaServerItem.getId());
result.setPush(redisCatchStorage.getPushStreamCount(mediaServerItem.getId()));
result.setProxy(redisCatchStorage.getProxyStreamCount(mediaServerItem.getId()));
result.setGbReceive(redisCatchStorage.getGbReceiveCount(mediaServerItem.getId()));
result.setGbSend(redisCatchStorage.getGbSendCount(mediaServerItem.getId()));
return result;
}
}

View File

@@ -26,6 +26,7 @@ import com.genersoft.iot.vmp.storager.dao.StreamProxyMapper;
import com.genersoft.iot.vmp.service.IStreamProxyService;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -454,4 +455,9 @@ public class StreamProxyServiceImpl implements IStreamProxyService {
}
}
@Override
public ResourceBaceInfo getOverview() {
return streamProxyMapper.getOverview();
}
}

View File

@@ -18,6 +18,7 @@ import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.*;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -507,6 +508,12 @@ public class StreamPushServiceImpl implements IStreamPushService {
@Override
public List<String> getAllAppAndStream() {
return streamPushMapper.getAllAppAndStream();
}
@Override
public ResourceBaceInfo getOverview() {
return streamPushMapper.getOverview(userSetting.isUsePushingAsStatus());
}
}