优化代码

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -211,13 +211,12 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
             SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
 
-            String sceneUrl = mainUrl + "/" + sceneProNewUrl;
             String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+sceneCode+".png";
             String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+sceneCode+"_en.png";
             //生成新的分享的二维码-中文版本
-            MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneCode, outPathZh, false,null);
+            MatrixToImageWriterUtil.createQRCode(scenePlusExt.getWebSite(), outPathZh, false,null);
             //生成新的分享的二维码-英文版本
-            MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneCode + "&lang=en", outPathEn, false, null);
+            MatrixToImageWriterUtil.createQRCode(scenePlusExt.getWebSite() + "&lang=en", outPathEn, false, null);
             //上传二维码
             fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, sceneCode) + sceneCode + ".png");
             fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, sceneCode) + sceneCode + "_en.png");
@@ -649,8 +648,8 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ScenePlus updateDbPlus(String num, Long space, String videosJson, Long computeTime, String fileId,boolean isObj){
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
-        List<ScenePlus> list = scenePlusService.list(
-                new LambdaQueryWrapper<ScenePlus>().select(ScenePlus::getId).eq(ScenePlus::getNum, num));
+        List<ScenePlus> list = scenePlusService.list(new LambdaQueryWrapper<ScenePlus>()
+                .select(ScenePlus::getId).eq(ScenePlus::getNum, num));
         if (CollUtil.isEmpty(list)) {
             return null;
         }
@@ -661,21 +660,21 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
             .in(ScenePlus::getId, scenePlusIds)
             .set(ScenePlus::getSceneStatus, SceneStatus.NO_DISPLAY.code())
-            .set(ScenePlus::getCreateTime, Calendar.getInstance().getTime())
+            .set(ScenePlus::getUpdateTime, new Date())
             .set(ScenePlus::getPayStatus, PayStatus.PAY.code()));
 
-        scenePlusExtService.update(new LambdaUpdateWrapper<ScenePlusExt>()
-                .in(ScenePlusExt::getPlusId, scenePlusIds)
-                .set(ScenePlusExt::getSpace, space)
-                .set(ScenePlusExt::getComputeTime, computeTime)
-                .set(ScenePlusExt::getVideos, videosJson).set(ScenePlusExt::getIsObj, isObj ? 1 : 0));
-
         SceneFileBuild sceneFileBuild = sceneFileBuildService.findByFileId(fileId);
         if(sceneFileBuild != null){
             sceneFileBuild.setBuildStatus(BuildStatus.success.code());
             sceneFileBuildService.updateById(sceneFileBuild);
         }
 
+        scenePlusExt.setSpace(space);
+        scenePlusExt.setComputeTime(computeTime.toString());
+        scenePlusExt.setAlgorithmTime(new Date());
+        scenePlusExt.setVideos(videosJson);
+        scenePlusExt.setIsObj(isObj ? 1 : 0);
+
         SceneSource sceneSource = SceneSource.get(scenePlus.getSceneSource());
         switch (sceneSource){
             case BM:

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

@@ -101,12 +101,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
 
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
     @Value("${queue.modeling.modeling-pre}")
     private String queueModelingPre;
-    @Value("${fyun.type}")
-    private String fyunType;
 
     @Autowired
     private RedisUtil redisUtil;
@@ -356,11 +352,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main.png", imgViewPath + "logo-main.png");
             fYunFileService.uploadFile(ConstantFilePath.LOGO_PATH + "logo-main-en.png", imgViewPath + "logo-main-en.png");
         }
-        ScenePlusVO scenePlusVO = null;
-        Object[] objects = null;
-        BuildSceneCallMessage mqMessage = null;
 
-        objects = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
+        Object[] objects = this.createScenePlus(sceneNum, camera.getId(), camera.getChildName(), jsonObject.getString("creator"),
                 jsonObject.getString("pwd"), unicode,
                 cameraType, fileId, prefix, "", icon, "0", cameraDetail.getUserId(), userName,
                 jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam",
@@ -368,8 +361,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
 
-        scenePlusVO = (ScenePlusVO) objects[0];
-        mqMessage = (BuildSceneCallMessage) objects[1];
+        ScenePlusVO scenePlusVO = (ScenePlusVO) objects[0];
+        BuildSceneCallMessage mqMessage = (BuildSceneCallMessage) objects[1];
 
 
         if (Objects.nonNull(scenePlusVO)) {
@@ -387,17 +380,12 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
         //删除oss的houst_floor.json(国际版可能会卡住)
         fYunFileService.deleteFile(dataViewPath + "houst_floor.json");
-
         if (cameraDetail.getCompanyId() != null) {
             Company company = companyService.getById(cameraDetail.getCompanyId());
             if (company != null) {
-
                 log.info("复制企业logo");
                 SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlusVO.getId());
-                SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
-
                 if (StrUtil.isNotEmpty(company.getTopLogo())) {
-                    //复制阿里云主服务器的图片到横琴云副服务器中
                     if (!new File(ConstantFilePath.BASE_PATH + File.separator + company.getTopLogo()).exists()) {
                         log.info("下载topLogo");
                         FileUtils.downLoadFromUrl(mainUrl + company.getTopLogo() + "?t=" + System.currentTimeMillis(),
@@ -411,7 +399,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 }
 
                 if (StrUtil.isNotEmpty(company.getFloorLogo())) {
-                    //复制阿里云主服务器的图片到横琴云副服务器中
                     if (!new File(ConstantFilePath.BASE_PATH + File.separator + company.getFloorLogo()).exists()) {
                         log.info("下载floorLogo");
                         FileUtils.downLoadFromUrl(mainUrl + company.getFloorLogo() + "?t=" + System.currentTimeMillis(),