guzijian / wvp-GB28181-pro · Commits

Commit 29f7a6b6eba350f2c49b744f110d1aa033f77d02

Authored by 648540858
1 parent c25a99d6

修复多wvp模式推流时信息存储错误

Inline Side-by-side
Showing 7 changed files with 27 additions and 18 deletions
src/main/java/com/genersoft/iot/vmp/service/bean/WvpRedisMsg.java
  View file @29f7a6b
... ... @@ -29,12 +29,12 @@ public class WvpRedisMsg {
29 29 * 消息的ID
30 30 */
31 31 private String serial;
32   - private Object content;
  32 + private String content;
33 33  
34 34 private final static String requestTag = "req";
35 35 private final static String responseTag = "res";
36 36  
37   - public static WvpRedisMsg getRequestInstance(String fromId, String toId, String cmd, String serial, Object content) {
  37 + public static WvpRedisMsg getRequestInstance(String fromId, String toId, String cmd, String serial, String content) {
38 38 WvpRedisMsg wvpRedisMsg = new WvpRedisMsg();
39 39 wvpRedisMsg.setType(requestTag);
40 40 wvpRedisMsg.setFromId(fromId);
... ... @@ -51,7 +51,7 @@ public class WvpRedisMsg {
51 51 return wvpRedisMsg;
52 52 }
53 53  
54   - public static WvpRedisMsg getResponseInstance(String fromId, String toId, String cmd, String serial, Object content) {
  54 + public static WvpRedisMsg getResponseInstance(String fromId, String toId, String cmd, String serial, String content) {
55 55 WvpRedisMsg wvpRedisMsg = new WvpRedisMsg();
56 56 wvpRedisMsg.setType(responseTag);
57 57 wvpRedisMsg.setFromId(fromId);
... ... @@ -106,11 +106,11 @@ public class WvpRedisMsg {
106 106 this.cmd = cmd;
107 107 }
108 108  
109   - public Object getContent() {
  109 + public String getContent() {
110 110 return content;
111 111 }
112 112  
113   - public void setContent(Object content) {
  113 + public void setContent(String content) {
114 114 this.content = content;
115 115 }
116 116 }
... ...
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
  View file @29f7a6b
... ... @@ -113,8 +113,8 @@ public class RedisGbPlayMsgListener implements MessageListener {
113 113 while (!taskQueue.isEmpty()) {
114 114 Message msg = taskQueue.poll();
115 115 try {
116   - JSONObject msgJSON = JSON.parseObject(msg.getBody(), JSONObject.class);
117   - WvpRedisMsg wvpRedisMsg = JSON.to(WvpRedisMsg.class, msgJSON);
  116 + WvpRedisMsg wvpRedisMsg = JSON.parseObject(msg.getBody(), WvpRedisMsg.class);
  117 + logger.info("[收到REDIS通知] 消息： {}", JSON.toJSONString(wvpRedisMsg));
118 118 if (!userSetting.getServerId().equals(wvpRedisMsg.getToId())) {
119 119 continue;
120 120 }
... ... @@ -123,7 +123,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
123 123  
124 124 switch (wvpRedisMsg.getCmd()){
125 125 case WvpRedisMsgCmd.GET_SEND_ITEM:
126   - RequestSendItemMsg content = JSON.to(RequestSendItemMsg.class, wvpRedisMsg.getContent());
  126 + RequestSendItemMsg content = JSON.parseObject(wvpRedisMsg.getContent(), RequestSendItemMsg.class);
127 127 requestSendItemMsgHand(content, wvpRedisMsg.getFromId(), wvpRedisMsg.getSerial());
128 128 break;
129 129 case WvpRedisMsgCmd.REQUEST_PUSH_STREAM:
... ... @@ -242,7 +242,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
242 242 result.setData(content);
243 243  
244 244 WvpRedisMsg response = WvpRedisMsg.getResponseInstance(userSetting.getServerId(), toId,
245   - WvpRedisMsgCmd.REQUEST_PUSH_STREAM, serial, result);
  245 + WvpRedisMsgCmd.REQUEST_PUSH_STREAM, serial, JSON.toJSONString(result));
246 246 JSONObject jsonObject = (JSONObject)JSON.toJSON(response);
247 247 redisTemplate.convertAndSend(WVP_PUSH_STREAM_KEY, jsonObject);
248 248 }
... ... @@ -260,7 +260,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
260 260 result.setMsg("流媒体不存在");
261 261  
262 262 WvpRedisMsg response = WvpRedisMsg.getResponseInstance(userSetting.getServerId(), toId,
263   - WvpRedisMsgCmd.GET_SEND_ITEM, serial, result);
  263 + WvpRedisMsgCmd.GET_SEND_ITEM, serial, JSON.toJSONString(result));
264 264  
265 265 JSONObject jsonObject = (JSONObject)JSON.toJSON(response);
266 266 redisTemplate.convertAndSend(WVP_PUSH_STREAM_KEY, jsonObject);
... ... @@ -283,7 +283,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
283 283 WVPResult<SendRtpItem> result = new WVPResult<>();
284 284 result.setCode(ERROR_CODE_TIMEOUT);
285 285 WvpRedisMsg response = WvpRedisMsg.getResponseInstance(
286   - userSetting.getServerId(), toId, WvpRedisMsgCmd.GET_SEND_ITEM, serial, result
  286 + userSetting.getServerId(), toId, WvpRedisMsgCmd.GET_SEND_ITEM, serial, JSON.toJSONString(result)
287 287 );
288 288 JSONObject jsonObject = (JSONObject)JSON.toJSON(response);
289 289 redisTemplate.convertAndSend(WVP_PUSH_STREAM_KEY, jsonObject);
... ... @@ -324,7 +324,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
324 324 result.setData(responseSendItemMsg);
325 325  
326 326 WvpRedisMsg response = WvpRedisMsg.getResponseInstance(
327   - userSetting.getServerId(), toId, WvpRedisMsgCmd.GET_SEND_ITEM, serial, result
  327 + userSetting.getServerId(), toId, WvpRedisMsgCmd.GET_SEND_ITEM, serial, JSON.toJSONString(result)
328 328 );
329 329 JSONObject jsonObject = (JSONObject)JSON.toJSON(response);
330 330 redisTemplate.convertAndSend(WVP_PUSH_STREAM_KEY, jsonObject);
... ... @@ -350,7 +350,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
350 350 requestSendItemMsg.setServerId(serverId);
351 351 String key = UUID.randomUUID().toString();
352 352 WvpRedisMsg redisMsg = WvpRedisMsg.getRequestInstance(userSetting.getServerId(), serverId, WvpRedisMsgCmd.GET_SEND_ITEM,
353   - key, requestSendItemMsg);
  353 + key, JSON.toJSONString(requestSendItemMsg));
354 354  
355 355 JSONObject jsonObject = (JSONObject)JSON.toJSON(redisMsg);
356 356 logger.info("[请求推流SendItem] {}: {}", serverId, jsonObject);
... ... @@ -375,7 +375,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
375 375 public void sendMsgForStartSendRtpStream(String serverId, RequestPushStreamMsg param, PlayMsgCallbackForStartSendRtpStream callback) {
376 376 String key = UUID.randomUUID().toString();
377 377 WvpRedisMsg redisMsg = WvpRedisMsg.getRequestInstance(userSetting.getServerId(), serverId,
378   - WvpRedisMsgCmd.REQUEST_PUSH_STREAM, key, param);
  378 + WvpRedisMsgCmd.REQUEST_PUSH_STREAM, key, JSON.toJSONString(param));
379 379  
380 380 JSONObject jsonObject = (JSONObject)JSON.toJSON(redisMsg);
381 381 logger.info("[REDIS 请求其他平台推流] {}: {}", serverId, jsonObject);
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @29f7a6b
... ... @@ -13,9 +13,9 @@ import java.util.List;
13 13 public interface StreamPushMapper {
14 14  
15 15 @Insert("INSERT INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " +
16   - "push_time, alive_second, media_server_id, update_time, create_time, push_ing, self) VALUES" +
  16 + "push_time, alive_second, media_server_id, server_id, update_time, create_time, push_ing, self) VALUES" +
17 17 "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " +
18   - "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{updateTime} , #{createTime}, " +
  18 + "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{serverId} , #{updateTime} , #{createTime}, " +
19 19 "#{pushIng}, #{self} )")
20 20 int add(StreamPushItem streamPushItem);
21 21  
... ... @@ -24,6 +24,7 @@ public interface StreamPushMapper {
24 24 "UPDATE wvp_stream_push " +
25 25 "SET update_time=#{updateTime}" +
26 26 "<if test=\"mediaServerId != null\">, media_server_id=#{mediaServerId}</if>" +
  27 + "<if test=\"serverId != null\">, server_id=#{serverId}</if>" +
27 28 "<if test=\"totalReaderCount != null\">, total_reader_count=#{totalReaderCount}</if>" +
28 29 "<if test=\"originType != null\">, origin_type=#{originType}</if>" +
29 30 "<if test=\"originTypeStr != null\">, origin_type_str=#{originTypeStr}</if>" +
... ... @@ -89,10 +90,10 @@ public interface StreamPushMapper {
89 90  
90 91 @Insert("<script>" +
91 92 "Insert INTO wvp_stream_push (app, stream, total_reader_count, origin_type, origin_type_str, " +
92   - "create_time, alive_second, media_server_id, status, push_ing) " +
  93 + "create_time, alive_second, media_server_id, server_id, status, push_ing) " +
93 94 "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
94 95 "( #{item.app}, #{item.stream}, #{item.totalReaderCount}, #{item.originType}, " +
95   - "#{item.originTypeStr},#{item.createTime}, #{item.aliveSecond}, #{item.mediaServerId}, #{item.status} ," +
  96 + "#{item.originTypeStr},#{item.createTime}, #{item.aliveSecond}, #{item.mediaServerId},#{item.serverId}, #{item.status} ," +
96 97 " #{item.pushIng} )" +
97 98 " </foreach>" +
98 99 "</script>")
... ...
数据库/初始化-mysql-2.6.9.sql
  View file @29f7a6b
... ... @@ -261,6 +261,7 @@ create table wvp_stream_push (
261 261 create_time character varying(50),
262 262 alive_second integer,
263 263 media_server_id character varying(50),
  264 + server_id character varying(50),
264 265 push_time character varying(50),
265 266 status bool default false,
266 267 update_time character varying(50),
... ...
数据库/初始化-postgresql-kingbase-2.6.9.sql
  View file @29f7a6b
... ... @@ -261,6 +261,7 @@ create table wvp_stream_push (
261 261 create_time character varying(50),
262 262 alive_second integer,
263 263 media_server_id character varying(50),
  264 + server_id character varying(50),
264 265 push_time character varying(50),
265 266 status bool default false,
266 267 update_time character varying(50),
... ...
数据库/更新-mysql-2.6.9.sql
  View file @29f7a6b
... ... @@ -497,4 +497,7 @@ alter table wvp_media_server
497 497 alter table wvp_media_server
498 498 add record_day integer default 7;
499 499  
  500 +alter table wvp_stream_push
  501 + add server_id character varying(50);
  502 +
500 503  
... ...
数据库/更新-postgresql-kingbase-2.6.9.sql
  View file @29f7a6b
... ... @@ -498,5 +498,8 @@ alter table wvp_media_server
498 498 alter table wvp_media_server
499 499 add record_day integer default 7;
500 500  
  501 +alter table wvp_stream_push
  502 + add server_id character varying(50);
  503 +
501 504  
502 505  
... ...