111

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

@@ -75,9 +75,9 @@ public class SceneFileController{
      * @param params
      * @return
      */
-    @PostMapping("reverseE57")
-    public ResultData reverseE57(@RequestBody JSONObject params) throws Exception {
-        return sceneFileBuildService.reverseE57(params);
+    @PostMapping("reverseScene")
+    public ResultData reverseScene(@RequestBody JSONObject params) throws Exception {
+        return sceneFileBuildService.reverseScene(params);
     }
 
     @GetMapping("rebuildScene")

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

@@ -87,7 +87,7 @@ public class BuildReverseE57SceneServiceImpl implements IBuildSceneService {
             String e57Path = (String)message.getExt().get("path");
 
             //下载资源到本地
-            FileUtil.copyContent(new File(e57Path), new File(dataSource + "capture"), true);
+            fYunFileService.downloadFile(e57Path, dataSource + "/capture");
 
             //发送mq，就进行计算
 //            message.setPath(path);

src/main/java/com/fdkankan/contro/service/ISceneFileBuildService.java

@@ -33,5 +33,5 @@ public interface ISceneFileBuildService extends IService<SceneFileBuild> {
 
     ResultData uploadFile(MultipartFile file, String params) throws Exception;
 
-    ResultData reverseE57(JSONObject params) throws Exception;
+    ResultData reverseScene(JSONObject params) throws Exception;
 }

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

@@ -25,7 +25,6 @@ import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.enums.CameraTypeEnum;
 import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
-import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.ScenePlusVO;
@@ -59,7 +58,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -852,60 +850,69 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     }
 
     @Override
-    public ResultData reverseE57(JSONObject params) throws Exception {
+    public ResultData reverseScene(JSONObject params) throws Exception {
 
         String title = params.getString("title");
         Long userId = params.getLong("userId");
-
-        SSOUser user = userService.getSSOUserByUserId(userId);
-
-        String num = "e57" + scene3dNumService.generateSceneNum(null);
-
-        String uuid = UUID.randomUUID().toString();
-
-        //云目录
-        StringBuilder prefixBuffer = new StringBuilder(ConstantFilePath.BUILD_MODEL_PATH).append("reverseE57").append(uuid);
-
+        String otherType = params.getString("other_type");//AZ
+        String path = params.getString("path");
         String buildType = "V3";
 
+        String num = scene3dNumService.generateSceneNum(null);
         ScenePlus scenePlus = new ScenePlus();
+        ScenePlusExt scenePlusExt = new ScenePlusExt();
+        SceneEditInfo sceneEditInfo = new SceneEditInfo();
+        SceneEditInfoExt sceneEditInfoExt = new SceneEditInfoExt();
+        SceneEditControls sceneEditControls = new SceneEditControls();
         scenePlus.setTitle(title);
         scenePlus.setUserId(userId);
         scenePlus.setPayStatus(PayStatus.PAY.code());
+        if("AZ".equals(otherType)){
+            num = "AZ-" + num;
+            scenePlus.setSceneSource(SceneSource.ZT.code());
+            scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
+            scenePlusExt.setModelKind(ModelKind.DAM.code());
+        }else{
+            num = "e57-" + num;
+            scenePlus.setSceneSource(57);
+            scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
+            scenePlusExt.setModelKind(ModelKind.THREE_D_TILE.code());
+        }
+
+        SSOUser user = userService.getSSOUserByUserId(userId);
+
         scenePlus.setNum(num);
-        scenePlus.setSceneSource(57);
         scenePlusService.save(scenePlus);
 
-        ScenePlusExt scenePlusExt = new ScenePlusExt();
-        scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
+        StringBuilder prefixBuffer = new StringBuilder(ConstantFilePath.BUILD_MODEL_PATH).append("reverseScene").append(UUID.randomUUID());
         scenePlusExt.setSceneKind(SceneKind.FACE.code());
         scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
         scenePlusExt.setBuildType(buildType);
         scenePlusExt.setLocation(4);
-        scenePlusExt.setModelKind(ModelKind.THREE_D_TILE.code());
         scenePlusExt.setSceneScheme(SceneScheme.LM.code());
         scenePlusExt.setPlusId(scenePlus.getId());
         scenePlusExt.setDataSource(prefixBuffer.toString());
         scenePlusExtService.save(scenePlusExt);
 
 
-        SceneEditInfo sceneEditInfo = new SceneEditInfo();
         sceneEditInfo.setTitle(title);
         sceneEditInfo.setScenePlusId(scenePlus.getId());
         sceneEditInfoService.save(sceneEditInfo);
 
-        SceneEditInfoExt sceneEditInfoExt = new SceneEditInfoExt();
         sceneEditInfoExt.setScenePlusId(scenePlus.getId());
         sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
         sceneEditInfoExtService.save(sceneEditInfoExt);
 
-        SceneEditControls sceneEditControls = new SceneEditControls();
         sceneEditControls.setEditInfoId(sceneEditInfo.getId());
         sceneEditControlsService.save(sceneEditControls);
 
-        fdkkLaserService.saveScene(scenePlus,new JSONObject(),new Camera(),user.getUserName(),false, scenePlus.getPayStatus());
+        if("AZ".equals(otherType)){
+            rabbitMqProducer.sendByWorkQueue("reverse-scene", params);
+        }else{
+            fdkkLaserService.saveScene(scenePlus,new JSONObject(),new Camera(),user.getUserName(),false, scenePlus.getPayStatus());
+            rabbitMqProducer.sendByWorkQueue("reverseE57-modeling-pre", params);
+        }
 
-        rabbitMqProducer.sendByWorkQueue("reverseE57-modeling-pre", params);
 
         return ResultData.ok();
     }