guzijian / wvp-GB28181-pro · Commits

Commit 1cc111a57304b2e5d4a8e46adbf8aae0014bd879

Authored by 648540858
Committed by GitHub
2 parents 3aabbd69 ef6693aa

Merge pull request #685 from AlphaWu/Zafu-Dev-1127 

弃用废弃方法toJavaObject，改用to方法，消除编译警告。
Inline Side-by-side
Showing 1 changed file with 7 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
  View file @1cc111a
... ... @@ -117,7 +117,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
117 117 Message msg = taskQueue.poll();
118 118 try {
119 119 JSONObject msgJSON = JSON.parseObject(msg.getBody(), JSONObject.class);
120   - WvpRedisMsg wvpRedisMsg = JSON.toJavaObject(msgJSON, WvpRedisMsg.class);
  120 + WvpRedisMsg wvpRedisMsg = JSON.to(WvpRedisMsg.class, msgJSON);
121 121 if (!userSetting.getServerId().equals(wvpRedisMsg.getToId())) {
122 122 continue;
123 123 }
... ... @@ -126,11 +126,11 @@ public class RedisGbPlayMsgListener implements MessageListener {
126 126  
127 127 switch (wvpRedisMsg.getCmd()){
128 128 case WvpRedisMsgCmd.GET_SEND_ITEM:
129   - RequestSendItemMsg content = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), RequestSendItemMsg.class);
  129 + RequestSendItemMsg content = JSON.to(RequestSendItemMsg.class, wvpRedisMsg.getContent());
130 130 requestSendItemMsgHand(content, wvpRedisMsg.getFromId(), wvpRedisMsg.getSerial());
131 131 break;
132 132 case WvpRedisMsgCmd.REQUEST_PUSH_STREAM:
133   - RequestPushStreamMsg param = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), RequestPushStreamMsg.class);;
  133 + RequestPushStreamMsg param = JSON.to(RequestPushStreamMsg.class, wvpRedisMsg.getContent());
134 134 requestPushStreamMsgHand(param, wvpRedisMsg.getFromId(), wvpRedisMsg.getSerial());
135 135 break;
136 136 default:
... ... @@ -142,12 +142,12 @@ public class RedisGbPlayMsgListener implements MessageListener {
142 142 switch (wvpRedisMsg.getCmd()){
143 143 case WvpRedisMsgCmd.GET_SEND_ITEM:
144 144  
145   - WVPResult content = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), WVPResult.class);
  145 + WVPResult content = JSON.to(WVPResult.class, wvpRedisMsg.getContent());
146 146  
147 147 String key = wvpRedisMsg.getSerial();
148 148 switch (content.getCode()) {
149 149 case 0:
150   - ResponseSendItemMsg responseSendItemMsg =JSON.toJavaObject((JSONObject)content.getData(), ResponseSendItemMsg.class);
  150 + ResponseSendItemMsg responseSendItemMsg =JSON.to(ResponseSendItemMsg.class, content.getData());
151 151 PlayMsgCallback playMsgCallback = callbacks.get(key);
152 152 if (playMsgCallback != null) {
153 153 callbacksForError.remove(key);
... ... @@ -172,7 +172,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
172 172 }
173 173 break;
174 174 case WvpRedisMsgCmd.REQUEST_PUSH_STREAM:
175   - WVPResult wvpResult = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), WVPResult.class);
  175 + WVPResult wvpResult = JSON.to(WVPResult.class, wvpRedisMsg.getContent());
176 176 String serial = wvpRedisMsg.getSerial();
177 177 switch (wvpResult.getCode()) {
178 178 case 0:
... ... @@ -199,6 +199,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
199 199 default:
200 200 break;
201 201 }
  202 +
202 203 }
203 204 }catch (Exception e) {
204 205 logger.warn("[RedisGbPlayMsg] 发现未处理的异常, {}",e.getMessage());
... ...