Merge pull request #645 from IKangXu/wvp-28181-2.0

648540858

2022-10-18 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -35,11 +35,13 @@


   public static final String CALLBACK_CMD_PLAY = "CALLBACK_PLAY";



   public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAY";

   public static final String CALLBACK_CMD_PLAYBACK = "CALLBACK_PLAYBACK";



   public static final String CALLBACK_CMD_DOWNLOAD = "CALLBACK_DOWNLOAD";



   public static final String CALLBACK_CMD_STOP = "CALLBACK_STOP";



   public static final String UPLOAD_FILE_CHANNEL = "UPLOAD_FILE_CHANNEL";



   public static final String CALLBACK_CMD_MOBILEPOSITION = "CALLBACK_MOBILEPOSITION";



@@ -63,12 +65,16 @@
   

   public DeferredResult get(String key, String id) {

      Map<String, DeferredResult> deferredResultMap = map.get(key);

      if (deferredResultMap == null) return null;

      if (deferredResultMap == null) {

         return null;

      }

      return deferredResultMap.get(id);

   }



   public boolean exist(String key, String id){

      if (key == null) return false;

      if (key == null) {

         return false;

      }

      Map<String, DeferredResult> deferredResultMap = map.get(key);

      if (id == null) {

         return deferredResultMap != null;

@@ -90,7 +96,7 @@
      if (result == null) {

         return;

      }

      result.setResult(new ResponseEntity<>(msg.getData(),HttpStatus.OK));

      result.setResult(msg.getData());

      deferredResultMap.remove(msg.getId());

      if (deferredResultMap.size() == 0) {

         map.remove(msg.getKey());

@@ -112,9 +118,8 @@
         if (result == null) {

            return;

         }

         result.setResult(new ResponseEntity<>(msg.getData(),HttpStatus.OK));

         result.setResult(msg.getData());

      }

      map.remove(msg.getKey());



   }

}