guzijian / wvp-GB28181-pro · Commits

Commit d60452560e37305e62f8cdd6cc08c6b3d3430a10

Authored by WuPeng
1 parent f89491ad

弃用废弃方法toJavaObject，改用to方法，消除编译警告。

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
  View file @d604525
... ... @@ -119,7 +119,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
119 119 while (!taskQueue.isEmpty()) {
120 120 Message msg = taskQueue.poll();
121 121 JSONObject msgJSON = JSON.parseObject(msg.getBody(), JSONObject.class);
122   - WvpRedisMsg wvpRedisMsg = JSON.toJavaObject(msgJSON, WvpRedisMsg.class);
  122 + WvpRedisMsg wvpRedisMsg = JSON.to(WvpRedisMsg.class, msgJSON);
123 123 if (!userSetting.getServerId().equals(wvpRedisMsg.getToId())) {
124 124 continue;
125 125 }
... ... @@ -128,11 +128,11 @@ public class RedisGbPlayMsgListener implements MessageListener {
128 128  
129 129 switch (wvpRedisMsg.getCmd()){
130 130 case WvpRedisMsgCmd.GET_SEND_ITEM:
131   - RequestSendItemMsg content = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), RequestSendItemMsg.class);
  131 + RequestSendItemMsg content = JSON.to(RequestSendItemMsg.class, wvpRedisMsg.getContent());
132 132 requestSendItemMsgHand(content, wvpRedisMsg.getFromId(), wvpRedisMsg.getSerial());
133 133 break;
134 134 case WvpRedisMsgCmd.REQUEST_PUSH_STREAM:
135   - RequestPushStreamMsg param = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), RequestPushStreamMsg.class);;
  135 + RequestPushStreamMsg param = JSON.to(RequestPushStreamMsg.class, wvpRedisMsg.getContent());;
136 136 requestPushStreamMsgHand(param, wvpRedisMsg.getFromId(), wvpRedisMsg.getSerial());
137 137 break;
138 138 default:
... ... @@ -144,12 +144,12 @@ public class RedisGbPlayMsgListener implements MessageListener {
144 144 switch (wvpRedisMsg.getCmd()){
145 145 case WvpRedisMsgCmd.GET_SEND_ITEM:
146 146  
147   - WVPResult content = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), WVPResult.class);
  147 + WVPResult content = JSON.to(WVPResult.class, wvpRedisMsg.getContent());
148 148  
149 149 String key = wvpRedisMsg.getSerial();
150 150 switch (content.getCode()) {
151 151 case 0:
152   - ResponseSendItemMsg responseSendItemMsg =JSON.toJavaObject((JSONObject)content.getData(), ResponseSendItemMsg.class);
  152 + ResponseSendItemMsg responseSendItemMsg =JSON.to(ResponseSendItemMsg.class, content.getData());
153 153 PlayMsgCallback playMsgCallback = callbacks.get(key);
154 154 if (playMsgCallback != null) {
155 155 callbacksForError.remove(key);
... ... @@ -174,7 +174,7 @@ public class RedisGbPlayMsgListener implements MessageListener {
174 174 }
175 175 break;
176 176 case WvpRedisMsgCmd.REQUEST_PUSH_STREAM:
177   - WVPResult wvpResult = JSON.toJavaObject((JSONObject)wvpRedisMsg.getContent(), WVPResult.class);
  177 + WVPResult wvpResult = JSON.to(WVPResult.class, wvpRedisMsg.getContent());
178 178 String serial = wvpRedisMsg.getSerial();
179 179 switch (wvpResult.getCode()) {
180 180 case 0:
... ...