四维深巡

src/main/java/com/fdkankan/contro/entity/CameraType.java

@@ -12,10 +12,10 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 @Getter
@@ -62,5 +62,8 @@ public class CameraType implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("is_laser")
+    private Integer isLaser;
+
 
 }

src/main/java/com/fdkankan/contro/enums/CameraTypeEnum.java

@@ -1,5 +1,7 @@
 package com.fdkankan.contro.enums;
 
+import com.fdkankan.common.constant.FileBizType;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -10,7 +12,8 @@ public enum CameraTypeEnum {
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
     LASER_TURN(10,"SS-","4DKKLA_","激光转台"),
-    LASER_SG(11,"SG-","4DSG_","深光");
+    LASER_SG(11,"SG-","4DSG_","深光"),
+    LASER_SX(12,"SX-","4DSX_","深巡");
 
 
     private int type;
@@ -48,4 +51,16 @@ public enum CameraTypeEnum {
         return "";
     }
 
+    public static CameraTypeEnum get(Integer type){
+        CameraTypeEnum[] values = CameraTypeEnum.values();
+        Integer enumValue = null;
+        for(CameraTypeEnum eachValue : values){
+            enumValue = eachValue.type;
+            if(enumValue.equals(type)){
+                return eachValue;
+            }
+        }
+        return null;
+    }
+
 }

src/main/java/com/fdkankan/contro/service/ICameraTypeService.java

@@ -8,11 +8,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  *  服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 public interface ICameraTypeService extends IService<CameraType> {
 
     CameraType getByCamType(int camType);
 
+    boolean isLaser(int camType);
+
 }

src/main/java/com/fdkankan/contro/service/impl/CameraTypeServiceImpl.java

@@ -1,18 +1,21 @@
 package com.fdkankan.contro.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.contro.entity.CameraType;
 import com.fdkankan.contro.mapper.ICameraTypeMapper;
 import com.fdkankan.contro.service.ICameraTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Objects;
+
 /**
  * <p>
  *  服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
 @Service
@@ -21,4 +24,14 @@ public class CameraTypeServiceImpl extends ServiceImpl<ICameraTypeMapper, Camera
     public CameraType getByCamType(int camType) {
         return this.getOne(new LambdaQueryWrapper<CameraType>().eq(CameraType::getCameraType, camType));
     }
+
+    @Override
+    public boolean isLaser(int camType) {
+        CameraType cameraType = this.getOne(new LambdaQueryWrapper<CameraType>().eq(CameraType::getCameraType, camType));
+        if(Objects.nonNull(cameraType) && cameraType.getIsLaser() == CommonStatus.YES.code().intValue()){
+            return true;
+        }else{
+            return false;
+        }
+    }
 }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -173,6 +173,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     @Autowired
     private RedisLockUtil redisLockUtil;
+    @Autowired
+    private ICameraTypeService cameraTypeService;
 
     private RestTemplate restTemplate = new RestTemplate();
 
@@ -837,7 +839,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //激光相机10 13
         int camType = fdageJson.getJSONObject("cam").getIntValue("type");
         log.info("camType:{}", camType);
-        if(laserCamTypeList.contains(camType)){
+        if(cameraTypeService.isLaser(camType)){
             //激光转台
             cameraType = 14L;
         }
@@ -1003,6 +1005,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             if(camType == CameraTypeEnum.LASER_SG.getType()){
                 scenePlus.setSceneSource(SceneSource.SG.code());
             }
+            if(camType == CameraTypeEnum.LASER_SG.getType()){
+                scenePlus.setSceneSource(SceneSource.SG.code());
+            }
         }
 
         //全景看看场景用相机类型包括 看看 看见 深时 深光，所以这里做一个统一处理，为了让场景不在各平台中显示出来