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

去除多余引用，修正个别错误

Browse Source
This commit is contained in:
lawrencehj
2021-04-13 10:13:36 +08:00
parent d27164bf20
commit 8b4f7095e2
30 changed files with 12 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
View File

@@ -2,9 +2,6 @@ package com.genersoft.iot.vmp.media.zlm;
import com.genersoft.iot.vmp.conf.MediaServerConfig;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
// import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
// import org.slf4j.Logger;
// import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

2
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
View File

@@ -97,7 +97,7 @@ public class ZLMHttpHookSubscribe {
* @return
*/
public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
ZLMHttpHookSubscribe.Event event= null;
// ZLMHttpHookSubscribe.Event event= null;
Map<JSONObject, Event> eventMap = allSubscribes.get(type);
if (eventMap == null) {
return null;

3
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
View File

@@ -1,12 +1,9 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.service.IStreamPushService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

2
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
View File

@@ -1,7 +1,5 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.alibaba.fastjson.JSONObject;
import java.util.List;
public class MediaItem {

2
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
View File

@@ -87,7 +87,7 @@ public class StreamPushItem extends GbStream implements Comparable<StreamPushIte
@Override
public int compareTo(@NotNull StreamPushItem streamPushItem) {
return new Long(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
}
public static class MediaSchema {