浏览代码

增加四位神光相机

dsx 2 年之前
父节点
当前提交
88f5032fd6

+ 2 - 1
src/main/java/com/fdkankan/contro/enums/CameraTypeEnum.java

@@ -9,7 +9,8 @@ public enum CameraTypeEnum {
     FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKLITE_","双目转台"),
-    LASER_TURN(10,"SS-","4DKKLA_","激光转台");
+    LASER_TURN(10,"SS-","4DKKLA_","激光转台"),
+    LASER_SG(13,"SG-","4DSG_","深光");
 
 
     private int type;

+ 7 - 2
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -95,6 +95,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${build.notSupport.beforeTime:202203}")
     private String jgNotSupportBuildTime;
 
+    @Value("#{'${camType.laser:}'.split(',')}")
+    private List<Integer> camTypeList;
+
     @Autowired
     private RedisUtil redisUtil;
 
@@ -712,8 +715,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //13表示转台
         Long cameraType = 13L;
 
-        //激光转台 八目相机占用 10 和 11
-        if(fdageJson.getJSONObject("cam").getIntValue("type") == 10){
+        //激光相机10 13
+        int camType = fdageJson.getJSONObject("cam").getIntValue("type");
+        log.info("camType:{}", camType);
+        if(camTypeList.contains(camType)){
             //激光转台
             cameraType = 14L;
         }