Merge branch 'release' into test

src/main/java/com/fdkankan/download/service/impl/SceneDownLoadServiceImpl.java

@@ -1,12 +1,16 @@
 package com.fdkankan.download.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import com.fdkankan.download.bean.CurrentDownloadNumUtil;
 import com.fdkankan.download.bean.DownLoadTaskBean;
 import com.fdkankan.download.service.ISceneDownLoadService;
 import com.fdkankan.redis.constant.RedisKey;
+import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisUtil;
+
+import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -51,6 +55,12 @@ public class SceneDownLoadServiceImpl implements ISceneDownLoadService {
             if(Objects.isNull(downLoadTaskBean)){
                 continue;
             }
+
+            List<String> list = redisUtil.lGet(RedisLockKey.LOCK_SCENE_DOWNLOAD_ING, 0, -1);
+            if(CollUtil.isNotEmpty(list) && list.contains(downLoadTaskBean.getNum())){
+                continue;
+            }
+
             handlerService.download(downLoadTaskBean);
         }