project-jmga-2.2.0-2.0.1

src/main/java/com/fdkankan/contro/controller/SceneFileController.java

@@ -264,7 +264,11 @@ public class SceneFileController{
         String localPath = parentPath + details.getIndex() + details.getFileName();
         FileUtil.mkParentDirs(localPath);
         String url = "https://survey.4dkankan.com"  + localPath.replace("4dkankan/", "");
-        file.transferTo(new File(localPath));
+        if(details.getFileName().equals("data.fdage")){
+            file.transferTo(new File(parentPath + details.getFileName()));
+        }else{
+            file.transferTo(new File(localPath));
+        }
 
         SendCallAlgorithmParam param = new SendCallAlgorithmParam();
         param.setFilepath(url);

src/main/java/com/fdkankan/contro/mq/listener/UpdateSceneStatusListener.java

@@ -3,7 +3,6 @@ package com.fdkankan.contro.mq.listener;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.model.constants.UploadFilePath;

src/main/java/com/fdkankan/contro/mq/listener/UploadShootingListener.java

@@ -6,12 +6,8 @@ import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.common.constant.SceneStatus;
 import com.fdkankan.contro.constant.RedisConstants;
-import com.fdkankan.contro.entity.OrigFileUpload;
-import com.fdkankan.contro.entity.OrigFileUploadBatch;
-import com.fdkankan.contro.entity.ScenePlus;
-import com.fdkankan.contro.service.IOrigFileUploadBatchService;
-import com.fdkankan.contro.service.IOrigFileUploadService;
-import com.fdkankan.contro.service.IScenePlusService;
+import com.fdkankan.contro.entity.*;
+import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.util.HttpUtilExt;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
@@ -42,6 +38,16 @@ public class UploadShootingListener {
     private IScenePlusService scenePlusService;
     @Resource
     private RedisUtil redisUtil;
+    @Autowired
+    private ICommonService commonService;
+    @Autowired
+    private ISceneEditInfoService sceneEditInfoService;
+    @Autowired
+    private ISceneEditInfoExtService sceneEditInfoExtService;
+    @Autowired
+    private IScenePlusExtService scenePlusExtService;
+    @Autowired
+    private ISceneEditControlsService sceneEditControlsService;
 
 
     @RabbitListener(
@@ -55,6 +61,22 @@ public class UploadShootingListener {
         Integer index = params.getInteger("index");
         String uuid = params.getString("uuid");
         try {
+
+            //查出所有uuid相关的上传中的点位批次号
+
+            //遍历检查点位相关文件是否齐全，如果齐全改为进入计算
+
+            //下载文件
+
+            //调用算法
+
+            //上传文件
+
+            //写表
+
+            //处理删除点位
+
+
             List<OrigFileUpload> fileUploadList = origFileUploadService.getByBatchId(batchId);
             String path = ConstantFilePath.BUILD_MODEL_PATH + "upload_while_shooting/" + uuid + "/" + index + "/";
             for (OrigFileUpload origFileUpload : fileUploadList) {
@@ -91,8 +113,14 @@ public class UploadShootingListener {
             }
             if(status == CommonSuccessStatus.SUCCESS.code()){
                 status = SceneStatus.PREVIEW.code();
+                ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
+                SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
+                SceneEditInfoExt sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
+                SceneEditControls sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
+                commonService.writeSceneJson(num,new JSONObject(), sceneEditInfo,
+                        sceneEditInfoExt,sceneEditControls, scenePlus,scenePlusExt, null);
             }else{
-                log.info("点云系统处理失败,num:{}", num);
+                status = SceneStatus.FAILD.code();
             }
             scenePlus.setSceneStatus(status);
             scenePlusService.updateById(scenePlus);