From ab909feedf43a44780a6198cbd4772e9d7713fdf Mon Sep 17 00:00:00 2001
From: WuPeng <wp@zafu.edu.cn>
Date: 星期六, 05 十一月 2022 20:49:56 +0800
Subject: [PATCH] 升级Fastjson到Fastjson2
---
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 68 insertions(+), 5 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 ef2d748..a6713a4 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
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.vmanager.server;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.VManageBootstrap;
import com.genersoft.iot.vmp.common.SystemAllInfo;
import com.genersoft.iot.vmp.common.VersionPo;
@@ -12,10 +12,14 @@
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 com.genersoft.iot.vmp.vmanager.bean.SystemConfigInfo;
import gov.nist.javax.sip.SipStackImpl;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,8 +34,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 = "鏈嶅姟鎺у埗")
@@ -54,6 +57,20 @@
@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;
@@ -168,6 +185,18 @@
});
};
+ @Operation(summary = "鑾峰彇绯荤粺淇℃伅淇℃伅")
+ @GetMapping(value = "/system/configInfo")
+ @ResponseBody
+ public SystemConfigInfo getConfigInfo() {
+ SystemConfigInfo systemConfigInfo = new SystemConfigInfo();
+ systemConfigInfo.setVersion(versionInfo.getVersion());
+ systemConfigInfo.setSip(sipConfig);
+ systemConfigInfo.setAddOn(userSetting);
+ systemConfigInfo.setServerPort(serverPort);
+ return systemConfigInfo;
+ }
+
@Operation(summary = "鑾峰彇鐗堟湰淇℃伅")
@GetMapping(value = "/version")
@ResponseBody
@@ -213,6 +242,40 @@
@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