ai识别迁移至文杰的系统

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

@@ -97,7 +97,8 @@ public class SceneController extends BaseController {
         log.info("initScene-params:{}", JSON.toJSONString(param));
         return scenePlusService.initScene(param.getBucket(), param.getNum(), param.getTitle(), param.getDes(),
                 param.getSceneSource(), param.getDataSource(), param.getSceneScheme(),
-                param.getSceneResolution(), param.getSceneFrom(), param.getModelKind(), param.getAlgorithmTime(), param.getOrientation());
+                param.getSceneResolution(), param.getSceneFrom(), param.getModelKind(), param.getAlgorithmTime(), param.getOrientation(),
+                param.isHasFloorplanAi(), param.isHasRecognition());
     }
 
     /**

src/main/java/com/fdkankan/scene/service/IScenePlusService.java

@@ -41,7 +41,7 @@ public interface IScenePlusService extends IService<ScenePlus> {
 
     ResultData initScene(String bucket, String num, String title, String des, Integer sceneSource,
                          String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind, Date algorithmTime,
-                         String orientation) throws Exception;
+                         String orientation, boolean hasFloorplanAi, boolean hasRecognition) throws Exception;
 
     ResultData editScene(LaserSceneBean param);
 

src/main/java/com/fdkankan/scene/service/impl/ScenePlusServiceImpl.java

@@ -293,7 +293,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Override
     public ResultData initScene(String bucket, String num, String title, String des, Integer sceneSource,
         String dataSource, Integer sceneScheme, String sceneResolution, String sceneFrom, String mdoelKind, Date algorithmTime,
-                                String orientation) throws Exception {
+                                String orientation, boolean hasFloorplanAi, boolean hasRecognition) throws Exception {
 
         ScenePlus scenePlus = this.getScenePlusByNum(num);
 
@@ -342,7 +342,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         }
 
         //开始场景图ai识别
-        aiService.detectScenePano(scenePlus, scenePlusExt, dataSource);
+        if(hasRecognition){
+            scenePlusExt.setHasRecognition(CommonStatus.YES.code().intValue());
+        }else{
+            scenePlusExt.setHasRecognition(CommonStatus.NO.code().intValue());
+        }
         scenePlusExtService.saveOrUpdate(scenePlusExt);
 
         //生成编辑主表
@@ -386,16 +390,11 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
 
         //平面图ai识别
-        this.uploadFloorplanAi(num, dataSource, bucket);
-        LinkedHashMap<Integer, Boolean> detFloorplan = floorplanAiService.detFloorplan(dataSource);
-        boolean hasFloorplanAi = floorplanAiService.detFloorPlanAi(num, dataSource, detFloorplan, bucket);
         if(hasFloorplanAi){
             scenePlus.setHasFloorplanAi(CommonStatus.YES.code().intValue());
         }else{
             scenePlus.setHasFloorplanAi(CommonStatus.NO.code().intValue());
         }
-        scenePlus.setSceneStatus(SceneStatus.SUCCESS.code());
-        this.saveOrUpdate(scenePlus);
 
 
         //清除用户编辑业务数据
@@ -446,6 +445,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
         redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
 
+        scenePlus.setSceneStatus(SceneStatus.SUCCESS.code());
+        this.saveOrUpdate(scenePlus);
+
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/scene/vo/InitSceneParamVO.java

@@ -27,6 +27,8 @@ public class InitSceneParamVO {
     private String modelKind;
     private Date algorithmTime;
     private String orientation;
+    private boolean hasFloorplanAi;
+    private boolean hasRecognition;
 
 
 }