Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/device/rest/VideoController.java

 package com.neotel.smfcore.core.device.rest;
 package com.neotel.smfcore.core.device.rest;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.common.bean.ResultBean;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
@@ -10,8 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 
 @Slf4j
 @Slf4j
 @RestController
 @RestController
@@ -53,6 +53,21 @@ public class VideoController {
 
 
     public static String getVideo(String cid) {
     public static String getVideo(String cid) {
         String value = videoMap.getOrDefault(cid, "");
         String value = videoMap.getOrDefault(cid, "");
+
+        if (ObjectUtil.isEmpty(value) && videoMap.size() > 0) {
+            //默认查找cid_1的视频
+            String nCid=cid+"_1";
+            value = videoMap.getOrDefault(nCid, "");
+//            List<String> keylist = new ArrayList<>(videoMap.keySet());
+//            Collections.sort(keylist);
+//            for (String key :
+//                    keylist) {
+//                if (key.startsWith(cid)) {
+//                    value = videoMap.getOrDefault(key, "");
+//                }
+//            }
+        }
+
         return value;
         return value;
     }
     }