结算结果处理，scene.json文件写入videos字符串格式

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/FileConvertController.java

@@ -4,16 +4,20 @@ import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.lang.UUID;
+import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.constant.ConstantFileName;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.controller.BaseController;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.CreateObjUtil;
+import com.fdkankan.scene.httpclient.FdkankanMiniClient;
 import com.fdkankan.scene.service.IFileConvertService;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.nio.file.Paths;
 import javax.servlet.ServletOutputStream;
@@ -39,28 +43,31 @@ public class FileConvertController extends BaseController {
 
     @Autowired
     private IFileConvertService fileConvertService;
+    @Autowired
+    private FdkankanMiniClient fdkankanMiniClient;
+
+    @PostMapping("/test")
+    public ResultData test(@RequestParam("file") MultipartFile file) throws Exception{
+        ForestResponse test = fdkankanMiniClient.test(file.getResource().getFile());
+        byte[] byteArray = test.getByteArray();
+        FileUtil.writeBytes(byteArray, "F:\\visiontest\\1.modeldata");
+        return ResultData.ok();
+    }
 
-    @PostMapping("/getModeldata")
-    public void convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{
+    @PostMapping("/convertTxtToModeldata")
+    public ResultData convertTxtToModeldata(@RequestParam("file") MultipartFile file) throws Exception{
         fileConvertService.convertTxtToModeldata(file, this.response);
+        return ResultData.ok();
     }
 
-    @PostMapping("/getDam")
+    @PostMapping("/convertTxtToDam")
     public void convertTxtToDam(@RequestParam("file") MultipartFile file) throws Exception{
         fileConvertService.convertTxtToDam(file, this.response);
     }
 
-    @PostMapping("/getLzma")
+    @PostMapping("/convertTxtToLzma")
     public void convertTxtToLzma(@RequestParam("file") MultipartFile file) throws Exception{
         fileConvertService.convertTxtToLzma(file, this.response);
     }
 
-//    CreateObjUtil.convertTxtToDam( path + File.separator + "results" + File.separator+"tex"+File.separator+"modeldata.txt", path + File.separator + "results" +File.separator+ ConstantFileName.modelUUID+"_50k.dam");
-//        CreateObjUtil.convertDamToLzma(path + File.separator + "results");
-//        CreateObjUtil.convertTxtToDam( path + File.separator + "results" +File.separator+"tex"+File.separator+"modeldata.txt", path + File.separator + "results" + File.separator+ConstantFileName.modelUUID+"_50k.dam");
-
-
-
-
-
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/httpclient/FdkankanMiniClient.java

@@ -1,16 +1,22 @@
 package com.fdkankan.scene.httpclient;
 
+import com.dtflys.forest.annotation.Body;
 import com.dtflys.forest.annotation.Get;
+import com.dtflys.forest.annotation.Post;
 import com.dtflys.forest.annotation.Retry;
 import com.dtflys.forest.annotation.Success;
 import com.dtflys.forest.annotation.Var;
 import com.dtflys.forest.callback.OnError;
 import com.dtflys.forest.callback.OnSuccess;
+import com.dtflys.forest.http.ForestResponse;
 import com.fdkankan.common.response.Result;
 import com.fdkankan.scene.bean.CameraBean;
 import com.fdkankan.scene.bean.UserIncrementBean;
 import com.fdkankan.scene.callback.FdkkMiniReqSuccessCondition;
+import java.io.File;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * <p>
@@ -37,4 +43,11 @@ public interface FdkankanMiniClient {
     @Retry(maxRetryCount = "3", maxRetryInterval = "100")
     Result<CameraBean> getCameraByCameraId(@Var("url") String url, OnSuccess<Result> onSuccess, OnError onError);
 
+    @Post(
+        url="http://localhost:8085/scene/service/file/convert/convertTxtToModeldata",
+        contentType = "application/octet-stream"
+    )
+    @Retry(maxRetryCount = "3", maxRetryInterval = "100")
+    ForestResponse test(@Body("file") File file);
+
 }

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

@@ -287,7 +287,7 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         String localSceneJson = FileUtils.readFile(localSceneJsonPath);
         if(StrUtil.isNotEmpty(localSceneJson)){
             JSONObject sceneJsonObject = JSON.parseObject(localSceneJson);
-            sceneJsonObject.put("videos", videosJson);
+            sceneJsonObject.put("videos", JSON.toJSONString(videosJson));
             if(arrearCap) {
                 sceneJsonObject.put("payStatus", PayStatus.NO_CAPACITY.code());
             }

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

@@ -36,8 +36,8 @@ public class FileConvertServiceImpl implements IFileConvertService {
         //生成uuid
         String fileName = "vision.modeldata";
         String uuid = UUID.randomUUID().toString();
-        String path = ConstantFilePath.FILE_CONVERT_PATH + uuid;
-//        String path = "F:\\mnt\\4Dkankan\\fileConvert\\" + uuid;
+//        String path = ConstantFilePath.FILE_CONVERT_PATH + uuid;
+        String path = "F:\\mnt\\4Dkankan\\fileConvert\\" + uuid;
         String srcPath = path + File.separator + file.getOriginalFilename();
         String targetPath = path + File.separator + fileName;
         File srcFile = new File(srcPath);