XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化部分sql实现

Browse Source
This commit is contained in:
648540858
2023-05-15 15:29:39 +08:00
parent d849352441
commit 5d40080468
26 changed files with 191 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceBaceInfo.java → src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceBaseInfo.java
View File

@@ -1,9 +1,17 @@
package com.genersoft.iot.vmp.vmanager.bean;
public class ResourceBaceInfo {
public class ResourceBaseInfo {
private int total;
private int online;
public ResourceBaseInfo() {
}
public ResourceBaseInfo(int total, int online) {
this.total = total;
this.online = online;
}
public int getTotal() {
return total;
}

24
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ResourceInfo.java
View File

@@ -2,40 +2,40 @@ package com.genersoft.iot.vmp.vmanager.bean;
public class ResourceInfo {
private ResourceBaceInfo device;
private ResourceBaceInfo channel;
private ResourceBaceInfo push;
private ResourceBaceInfo proxy;
private ResourceBaseInfo device;
private ResourceBaseInfo channel;
private ResourceBaseInfo push;
private ResourceBaseInfo proxy;
public ResourceBaceInfo getDevice() {
public ResourceBaseInfo getDevice() {
return device;
}
public void setDevice(ResourceBaceInfo device) {
public void setDevice(ResourceBaseInfo device) {
this.device = device;
}
public ResourceBaceInfo getChannel() {
public ResourceBaseInfo getChannel() {
return channel;
}
public void setChannel(ResourceBaceInfo channel) {
public void setChannel(ResourceBaseInfo channel) {
this.channel = channel;
}
public ResourceBaceInfo getPush() {
public ResourceBaseInfo getPush() {
return push;
}
public void setPush(ResourceBaceInfo push) {
public void setPush(ResourceBaseInfo push) {
this.push = push;
}
public ResourceBaceInfo getProxy() {
public ResourceBaseInfo getProxy() {
return proxy;
}
public void setProxy(ResourceBaceInfo proxy) {
public void setProxy(ResourceBaseInfo proxy) {
this.proxy = proxy;
}
}

10
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
View File

@@ -15,7 +15,7 @@ import com.genersoft.iot.vmp.service.*;
import com.genersoft.iot.vmp.service.bean.MediaServerLoad;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import com.genersoft.iot.vmp.vmanager.bean.ResourceInfo;
import com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -251,13 +251,13 @@ public class ServerController {
@Operation(summary = "获取负载信息")
public ResourceInfo getResourceInfo() {
ResourceInfo result = new ResourceInfo();
ResourceBaceInfo deviceInfo = deviceService.getOverview();
ResourceBaseInfo deviceInfo = deviceService.getOverview();
result.setDevice(deviceInfo);
ResourceBaceInfo channelInfo = channelService.getOverview();
ResourceBaseInfo channelInfo = channelService.getOverview();
result.setChannel(channelInfo);
ResourceBaceInfo pushInfo = pushService.getOverview();
ResourceBaseInfo pushInfo = pushService.getOverview();
result.setPush(pushInfo);
ResourceBaceInfo proxyInfo = proxyService.getOverview();
ResourceBaseInfo proxyInfo = proxyService.getOverview();
result.setProxy(proxyInfo);
return result;