From ca891f367c5b23ea841695c50ddbb7f08ae23292 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 十月 2022 15:20:35 +0800
Subject: [PATCH] 首页改造完成,待添加系统信息
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 69 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
index 2884734..ed6f44d 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.VManageBootstrap;
+import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VersionPo;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting;
@@ -11,9 +12,13 @@
import com.genersoft.iot.vmp.media.zlm.ZlmHttpHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.IHookSubscribe;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
-import com.genersoft.iot.vmp.service.IMediaServerService;
+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.utils.SpringBeanFactory;
import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceInfo;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.v3.oas.annotations.Operation;
@@ -28,8 +33,7 @@
import javax.sip.ListeningPoint;
import javax.sip.ObjectInUseException;
import javax.sip.SipProvider;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
@SuppressWarnings("rawtypes")
@Tag(name = "鏈嶅姟鎺у埗")
@@ -53,12 +57,29 @@
@Autowired
private UserSetting userSetting;
+ @Autowired
+ private IDeviceService deviceService;
+
+ @Autowired
+ private IDeviceChannelService channelService;
+
+ @Autowired
+ private IStreamPushService pushService;
+
+
+ @Autowired
+ private IStreamProxyService proxyService;
+
+
@Value("${server.port}")
private int serverPort;
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@GetMapping(value = "/media_server/list")
@@ -202,4 +223,46 @@
public List<IHookSubscribe> getHooks() {
return zlmHttpHookSubscribe.getAll();
}
+
+ @GetMapping(value = "/system/info")
+ @ResponseBody
+ @Operation(summary = "鑾峰彇绯荤粺淇℃伅")
+ public SystemAllInfo getSystemInfo() {
+ SystemAllInfo systemAllInfo = redisCatchStorage.getSystemInfo();
+
+ return systemAllInfo;
+ }
+
+ @GetMapping(value = "/media_server/load")
+ @ResponseBody
+ @Operation(summary = "鑾峰彇璐熻浇淇℃伅")
+ public List<MediaServerLoad> getMediaLoad() {
+ List<MediaServerLoad> result = new ArrayList<>();
+ List<MediaServerItem> allOnline = mediaServerService.getAllOnline();
+ if (allOnline.size() == 0) {
+ return result;
+ }else {
+ for (MediaServerItem mediaServerItem : allOnline) {
+ result.add(mediaServerService.getLoad(mediaServerItem));
+ }
+ }
+ return result;
+ }
+
+ @GetMapping(value = "/resource/info")
+ @ResponseBody
+ @Operation(summary = "鑾峰彇璐熻浇淇℃伅")
+ public ResourceInfo getResourceInfo() {
+ ResourceInfo result = new ResourceInfo();
+ ResourceBaceInfo deviceInfo = deviceService.getOverview();
+ result.setDevice(deviceInfo);
+ ResourceBaceInfo channelInfo = channelService.getOverview();
+ result.setChannel(channelInfo);
+ ResourceBaceInfo pushInfo = pushService.getOverview();
+ result.setPush(pushInfo);
+ ResourceBaceInfo proxyInfo = proxyService.getOverview();
+ result.setProxy(proxyInfo);
+
+ return result;
+ }
}
--
Gitblit v1.8.0