更换场景主表

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneResultMQListener.java

@@ -203,7 +203,7 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
             //如果相机容量不足，需要把场景的paystatus改为容量不足状态
             this.sealScene(arrearCap, scenePlus.getId(), scenePro.getId());
 
-            Object[] editInfoArr = this.updateEditInfo(scenePlus);
+            Object[] editInfoArr = this.updateEditInfo(scenePro, scenePlus);
             SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
             SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[1];
 
@@ -428,12 +428,13 @@ public class BuildSceneResultMQListener implements RocketMQListener<String> {
         return false;
     }
 
-    private Object[] updateEditInfo(ScenePlus scenePlus){
+    private Object[] updateEditInfo(ScenePro scenePro, ScenePlus scenePlus){
         SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
         SceneEditControls sceneEditControls = null;
         if(sceneEditInfo == null){
             sceneEditInfo = new SceneEditInfo();
-            sceneEditInfo.setSceneProId(scenePlus.getId());
+            sceneEditInfo.setScenePlusId(scenePlus.getId());
+            sceneEditInfo.setSceneProId(scenePro.getId());
             sceneEditInfo.setDescription(scenePlus.getDescription());
             sceneEditInfo.setTitle(scenePlus.getTitle());
             sceneEditInfoService.save(sceneEditInfo);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -181,16 +181,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         String num = param.getNum();
 
         //根据场景码查询数据库
-        ScenePro scenePro = sceneProService.findBySceneNum(sceneNum);
-        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
-        SceneEditInfo sceneEditInfo = this.getBySceneProId(scenePro.getId());
-        SceneEditInfoExt sceneEditInfoExt = null;
-            SceneEditControls sceneEditControls = null;
-//        ScenePro scenePro = sceneProService.findBySceneNum(num);
-//        SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
+        ScenePro scenePro = sceneProService.findBySceneNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         SceneEditInfo sceneEditInfo = this.getByScenePlusId(scenePlus.getId());
+        SceneEditInfoExt sceneEditInfoExt = null;
         SceneEditControls sceneEditControls = null;
         if(sceneEditInfo == null){
             sceneEditInfo = new SceneEditInfo();
@@ -262,6 +257,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             this.updateById(sceneEditInfo);
         }
         sceneEditInfoExt.setSceneProId(scenePro.getId());
+        sceneEditInfoExt.setScenePlusId(scenePlus.getId());
         sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
         sceneEditInfoExtService.saveOrUpdate(sceneEditInfoExt);
 
@@ -500,8 +496,6 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
                 return new ScreenshotHandlerFactory().getHandler().save(num, fileInfo);
 
         }
-
-
         return ResultData.ok();
     }
 
@@ -640,7 +634,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public ResultData resetCad(String num){
 
-//        ScenePro scenePro = sceneProService.findBySceneNum(num);
+        ScenePro scenePro = sceneProService.findBySceneNum(num);
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         if(Objects.isNull(scenePlus))
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
@@ -657,6 +651,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfoDb.getId());
         }else{
             sceneEditInfoDb = new SceneEditInfo();
+            sceneEditInfoDb.setSceneProId(scenePro.getId());
             sceneEditInfoDb.setScenePlusId(scenePlus.getId());
             sceneEditInfoDb.setFloorPlanUser(CommonStatus.NO.code());
             this.save(sceneEditInfoDb);
@@ -664,6 +659,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         if(Objects.isNull(sceneEditInfoExt)){
             sceneEditInfoExt = new SceneEditInfoExt();
             sceneEditInfoExt.setSceneProId(scenePro.getId());
+            sceneEditInfoDb.setScenePlusId(scenePlus.getId());
             sceneEditInfoExt.setEditInfoId(sceneEditInfoDb.getId());
         }
         sceneEditInfoExt.setFloorPlanAngle(0f);
@@ -1039,7 +1035,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
         String path = scenePlusExt.getDataSource();
         //校验文件名
-        String videos = scenePro.getVideos();
+        String videos = scenePlusExt.getVideos();
         if(StrUtil.isEmpty(videos)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_7012);
         }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -566,8 +566,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         if(flag){
             //调用建模的方法
-            buildScene(filePathBuffer.toString(), fileId, false, null);
         }
+        buildScene(filePathBuffer.toString(), fileId, false, null);
         return ResultData.ok();
     }
 
@@ -1841,8 +1841,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 //        UploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data/data"+projectNum+File.separator+"scene.json", "data/data"+projectNum+File.separator+"scene.json");
 
         //生成二维码
-        MatrixToImageWriterUtil.createQRCode(url + projectNum, ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+".png", null);
-        MatrixToImageWriterUtil.createQRCode(url + projectNum + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+"_en.png", null);
+        MatrixToImageWriterUtil.createQRCode(url + projectNum, ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+".png", false, null);
+        MatrixToImageWriterUtil.createQRCode(url + projectNum + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+projectNum+"_en.png", false, null);
         log.info("二维码生成完成");
 
         return scenePlusVO;