同步点位文件

src/main/java/com/cdf/controller/back/TestController.java

@@ -19,6 +19,8 @@ import com.cdf.schedule.ScheduleTask;
 import com.cdf.service.IShopService;
 import com.cdf.util.ExcelUtil;
 import com.cdf.util.ReadCmdLine;
+import com.cdf.util.UploadToCdfOssUtil;
+import com.cdf.util.UploadToFdkkOssUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,6 +46,10 @@ public class TestController {
     private ScheduleTask scheduleTask;
     @Resource
     FdkkClient fdkkClient;
+    @Resource
+    private UploadToFdkkOssUtil uploadToFdkkOssUtil;
+    @Resource
+    private UploadToCdfOssUtil uploadToCdfOssUtil;
 
     @RequestMapping("/test/getProductById")
     public ResultData getProductById(@RequestParam(required = false) String productId){
@@ -75,6 +81,23 @@ public class TestController {
         return ResultData.ok();
     }
 
+    @RequestMapping("/test/copyFile")
+    public ResultData copyFile() throws Exception {
+        //String res1 = "scene_view_data/%s/images/vision.modeldata";
+        //String res2 = "scene_view_data/%s/images/vision2.modeldata";
+        String res1 = "cdf/%s/vision.modeldata";
+        String res2 = "cdf/%s/vision2.modeldata";
+        updateModelData("a",res1);
+        //updateModelData("a",res2);
+
+        return ResultData.ok();
+    }
+
+    private void updateModelData(String num,String res) {
+        uploadToFdkkOssUtil.downFromS3(String.format(res, num),"D:\\temp\\cdf\\"+String.format(res, num));
+        uploadToCdfOssUtil.upload("D:\\temp\\cdf\\"+String.format(res, num),String.format(res, num));
+    }
+
     @RequestMapping("/test/one")
     public ResultData test1(@RequestHeader String token) throws Exception{
         FdkkResponse allScene = fdkkClient.getAllScene(new FdkkAllSceneRequest() ,token);

src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -1,5 +1,6 @@
 package com.cdf.service.impl;
 
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -153,18 +154,22 @@ public class FdkkSceneEditService {
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }
         writeHotJson(fdkkHotRequest.getNum());
+        String res1 = "scene_view_data/%s/images/vision.modeldata";
+        String res2 = "scene_view_data/%s/images/vision2.modeldata";
+        updateModelData(fdkkHotRequest.getNum(),res1);
+        updateModelData(fdkkHotRequest.getNum(),res2);
+
         String sell1 = "aws s3 sync s3://4dkankan/scene_view_data/"+fdkkHotRequest.getNum()+"/user " +
                 " s3://4dage-moderate2/scene_view_data/"+fdkkHotRequest.getNum()+"/user --profile user1";
-        String sell2 = "aws s3 sync s3://4dkankan/scene_view_data/"+fdkkHotRequest.getNum()+"/images/vision.modeldata " +
-                " s3://4dage-moderate2/scene_view_data/"+fdkkHotRequest.getNum()+"/images/vision.modeldata --profile user1";
-        String sell3 = "aws s3 sync s3://4dkankan/scene_view_data/"+fdkkHotRequest.getNum()+"/images/vision2.modeldata " +
-                " s3://4dage-moderate2/scene_view_data/"+fdkkHotRequest.getNum()+"/images/vision2.modeldata --profile user1";
         log.info("执行脚本:{}",sell1);
         ReadCmdLine.callShellByExec(sell1);
-        log.info("执行脚本:{}",sell2);
-        ReadCmdLine.callShellByExec(sell2);
-        log.info("执行脚本:{}",sell3);
-        ReadCmdLine.callShellByExec(sell3);
+    }
+
+    private void updateModelData(String num,String res) {
+        String localPath = "/home/cdf/"+String.format(res, num);
+        String s3PathKey = String.format(res, num);
+        uploadToFdkkOssUtil.downFromS3(s3PathKey,localPath);
+        uploadToCdfOssUtil.upload(localPath,s3PathKey);
     }
 
     public void writeHotJson(String num) throws IOException {