重算接口

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

@@ -2167,13 +2167,25 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                         jsonObject.getInteger("resolution"),buildType,ConstantFilePath.BUILD_MODEL_LASER_PATH + unicode);
                 mqProducer.syncSend(topicLaserA, mqMsg.concat(":;1"));
             }else{
-                String mqMsg = ComputerUtil.getMQMsg(sceneCode,cameraName,unicode,cameraType,fileId,
-                        sceneProExt.getDataSource().replace(ConstantFilePath.BUILD_MODEL_PATH, "")
-                                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH,"")+ File.separator,
-                        "zip.Zip", "0",userName,
-                        jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam",
-                        jsonObject.getInteger("resolution"),buildType,ConstantFilePath.BUILD_MODEL_PATH + unicode);
-                mqProducer.syncSend(topicModelingA, mqMsg.concat(":;1"));
+//                String mqMsg = ComputerUtil.getMQMsg(sceneCode,cameraName,unicode,cameraType,fileId,
+//                        sceneProExt.getDataSource().replace(ConstantFilePath.BUILD_MODEL_PATH, "")
+//                                .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH,"")+ File.separator,
+//                        "zip.Zip", "0",userName,
+//                        jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam",
+//                        jsonObject.getInteger("resolution"),buildType,ConstantFilePath.BUILD_MODEL_PATH + unicode);
+
+                BuildSceneMqMessage buildSceneMqMessage =this.getBuildSceneMqMessage(
+                    sceneCode, cameraName, unicode, cameraType, fileId,
+                    sceneProExt.getDataSource().replace(ConstantFilePath.BUILD_MODEL_PATH, "")
+                        .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH,"")+ File.separator,
+                    "zip.Zip", "0",
+                    userName, jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam",
+                    jsonObject.getInteger("resolution"), buildType,
+                    ConstantFilePath.BUILD_MODEL_PATH + unicode, scenePro.getId(), scenePro.getSceneName(),
+                    scenePro.getWebSite(), scenePro.getCreateTime(), scenePro.getUserId(),
+                    sceneProExt.getDataSource(), scenePro.getSceneStatus(), scenePro.getPayStatus(), scenePro.getThumb());
+
+                mqProducer.syncSend(topicModelingA, buildSceneMqMessage);
             }
             sceneProService.updateStatus(sceneCode,0);
             // 更新imageVersion
@@ -2183,6 +2195,54 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return ResultData.ok();
     }
 
+//    public static String getMQMsg(String projectNum, String cameraName, String unicode, Long cameraType, String fileId,
+//        String prefix, String imgsName, String isModel,String userName,
+//        String algorithm, Integer resolution, String buildType, String path) {
+//
+//        BuildSceneMqMessage mq = new BuildSceneMqMessage();
+//        mq.setSceneNum(projectNum);
+//        mq.setCameraName(cameraName);
+//        mq.setUnicode(unicode);
+//        mq.setCameraType(String.valueOf(cameraType));
+//        mq.setFileId(fileId);
+//        mq.setPrefix(prefix);
+//        mq.setImgsName(imgsName);
+//        mq.setIsModel(isModel);
+//        mq.setUserName(userName);
+//        mq.setAlgorithm(algorithm);
+//        mq.setResolution(resolution);
+//        mq.setBuildType(buildType);
+//        mq.setPath(path);
+//
+//
+//
+//
+//
+//        String parametr = "";
+//        parametr+= unicode +":;"+ path +":;"+ prefix +":;"+ imgsName +":;"+ projectNum +":;"+ isModel;
+//        if(userName !=null&&!userName.trim().equals("")){
+//            parametr+=":;"+ userName;
+//        }else{
+//            parametr+=":;noMan";
+//        }
+//        parametr+=":;"+ cameraType;
+//        parametr+=":;"+ algorithm;
+//        parametr += ":;" + fileId;
+//        parametr += ":;" + cameraName;
+//        if(resolution == null){
+//            parametr += ":;0";
+//        }else {
+//            parametr += ":;" + resolution.intValue();
+//        }
+//
+//        if(buildType != null){
+//            parametr += ":;" + buildType;
+//        }
+//
+//        log.info("pro大场景添加到队列："+parametr);
+//        return parametr;
+//    }
+
     public ResultData rebuildVideoScene(RebuildVedioSceneParamVO param) throws Exception {
 
         if(StringUtils.isEmpty(param.getNum()) || StringUtils.isEmpty(param.getPanoId())){