Merge branch 'release' into project-jp

src/main/java/com/fdkankan/download/bean/SceneEditControlsVO.java

@@ -121,4 +121,8 @@ public class SceneEditControlsVO implements Serializable {
 
     private Integer showPanos;
 
+    private Integer showAi;
+
+    private Integer showSurveilScope;
+
 }

src/main/java/com/fdkankan/download/bean/SceneViewInfo.java

@@ -255,6 +255,8 @@ public class SceneViewInfo implements Serializable {
 
     private Integer floorLogoType;
 
+    private String orientation;
+
     /**
      * 空间绘制
      */
@@ -263,5 +265,7 @@ public class SceneViewInfo implements Serializable {
     //动态面板
     private int dynamicPanel;
 
+    private Integer hasRecognition;
+
 
 }

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);
         }