1

src/main/java/com/fdkankan/manage/constant/SceneTypeLabelEnum.java

@@ -0,0 +1,40 @@
+package com.fdkankan.manage.constant;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+
+public enum SceneTypeLabelEnum {
+
+    FD_KK(0,"四维看看",4, Arrays.asList(1,2,12,13,14),false),
+    FD_KJ(1,"四维看见",9, Arrays.asList(3),false),
+    FD_SS_LASER(2,"深时点云场景",10, Arrays.asList(4),true),
+    FD_SS_MESH(5,"深时Mesh场景",10, Arrays.asList(4),false),
+    FD_SG_LASER(6,"深光点云场景",11, Arrays.asList(5),true),
+    FD_SG_MESH(7,"深光Mesh场景",11, Arrays.asList(5),false),
+    FD_SX_LASER(8,"深巡点云场景",12, Arrays.asList(7),true),
+
+    FD_E57_LASER(57,"其他点云场景",null, Arrays.asList(57),true),
+    FD_E57_MESH(58,"其他Mesh场景",null, Arrays.asList(57),false),
+
+    FD_LITE(3,"四维双目Lite",null,null,false),
+    ;
+
+    Integer labelType;
+    String name;
+    Integer cameraType;
+    List<Integer> sceneSource;
+
+    Boolean isLaser;
+
+    SceneTypeLabelEnum(Integer labelType, String name,Integer cameraType,List<Integer>sceneSource ,Boolean isLaser) {
+        this.labelType = labelType;
+        this.name = name;
+        this.cameraType = cameraType;
+        this.sceneSource = sceneSource;
+        this.isLaser = isLaser;
+
+    }
+
+}

src/main/java/com/fdkankan/manage/controller/SceneController.java

@@ -43,6 +43,13 @@ public class SceneController {
    @Autowired
     ISceneCopyLogService sceneCopyLogService;
 
+
+   @GetMapping("/labelList")
+   public ResultData labelList(){
+       return ResultData.ok(sceneProService.labelList());
+   }
+
+
     @PostMapping("/list")
     public ResultData list(@RequestBody SceneParam param){
         return ResultData.ok(sceneProService.pageList(param));

src/main/java/com/fdkankan/manage/service/ISceneProService.java

@@ -65,4 +65,6 @@ public interface ISceneProService extends IService<ScenePro> {
     void restStoreSuccess(String num);
 
     void updateTitleByNum(String sceneNum, String sceneNewTitle);
+
+    Object labelList();
 }

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.SceneConstant;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.*;
+import com.fdkankan.manage.constant.SceneTypeLabelEnum;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.common.util.*;
 import com.fdkankan.manage.httpClient.client.FdKKClient;
@@ -262,6 +263,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(param.getType() == 6 ){
                 laserMap = laserService.list(sceneNumList,5);
             }
+            if(param.getType() == 8 ){
+                laserMap = laserService.list(sceneNumList,7);
+            }
             if(param.getType() == 57 ){
                 laserMap = laserService.list(sceneNumList,57);
             }
@@ -287,7 +291,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setWebSite(null);
                 }
             }else {
-                if(record.getSceneSource() != null && (record.getSceneSource()== 4 || record.getSceneSource() == 5 || record.getSceneSource() == 57)){
+                if(record.getSceneSource() != null && (record.getSceneSource()== 4 || record.getSceneSource() == 5 || record.getSceneSource() == 7|| record.getSceneSource() == 57)){
                     record.setComputeTime(record.getMeshComputeTime());
                 }
             }
@@ -955,4 +959,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         updateWrapper.set(ScenePro::getLaserTitle,sceneNewTitle);
         this.update(updateWrapper);
     }
+
+
+    @Override
+    public Object labelList() {
+        return SceneTypeLabelEnum.values();
+    }
 }

src/main/java/com/fdkankan/manage/util/NumTypeUtils.java

@@ -13,6 +13,7 @@ public class NumTypeUtils {
                 return false;
             case 2:
             case 6:
+            case 8:
             case 57:
                 return true;
         }

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -113,6 +113,9 @@
         <if test="param.type !=null and param.type == 7">
             and s.scene_source = 5 and is_obj = 1
         </if>
+        <if test="param.type !=null and param.type == 8">
+            and s.scene_source = 7
+        </if>
         <if test="param.type !=null and param.type == 57">
             and s.scene_source = 57
         </if>