增加上传需求

sxz-base/src/main/java/com/fdkk/sxz/util/CreateObjUtil.java

@@ -78,7 +78,14 @@ public class CreateObjUtil {
         CreateObjUtil.callshell(command);
         CreateObjUtil.log.info("oss下载文件完成,时间为：" + (System.currentTimeMillis() - start));
     }
-
+    //$bucket/$ossdir  $locathpath
+    public static void ossdownload(String bucket,String ossKey, String path) throws Exception {
+        String command = "bash /opt/ossutil/ossDownload.sh " + ossKey + " " + path + " " + bucket;
+        Long start = System.currentTimeMillis();
+        CreateObjUtil.log.info("开始oss下载文件：" + command);
+        CreateObjUtil.callshell(command);
+        CreateObjUtil.log.info("oss下载文件完成,时间为：" + (System.currentTimeMillis() - start));
+    }
     public static void panoCutaway(String fileUrl) throws Exception {
         String command = "krpanotools makepano -config=templates/vtour-multires.config " + fileUrl;
         Long start = System.currentTimeMillis();

sxz-core/src/main/java/com/fdkk/sxz/other/listener/AddMoldelBuild.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
 import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -90,10 +91,12 @@ public class AddMoldelBuild {
         String token = RedisUtil.tryLock(param.getModelUploadId().toString() + "syncModel", 60 * 1000);
         try {
             if (token != null) {
-                String objPath = buildPath + "upload/" + param.getFileId() + "/" + param.getFileId() + ".obj";
+                String locationPath = buildPath + "upload/" + param.getFileId() + "/";
+                String objPath = locationPath + param.getFileId() + ".obj";
+
+                CreateObjUtil.ossdownload("4d-tjw",param.getObjPath(),locationPath);
                 //下载OBJ。
-                uploadToOssUtil.download(objPath, param.getObjPath());
-                //先执行python-NewResortForOne脚本，处理obj文件
+                 //先执行python-NewResortForOne脚本，处理obj文件
                 AddMoldelBuild.log.info("NewResortForOne脚本处理ojb：");
                 CreateObjUtil.objHandle(objPath);
 
@@ -171,6 +174,8 @@ public class AddMoldelBuild {
                 modelUploadEntity.setStatus(1);
                 modelUploadEntity.setFileType(1);
                 modelUploadEntity.setPartsDetailId(renovationPartsDetailEntity.getId());
+                modelUploadEntity.setFacesNum(param.getFacesNum());
+                modelUploadEntity.setObjSize(param.getObjSize());
                 modelUploadService.save(modelUploadEntity);
 
             }

sxz-modules/src/main/java/com/fdkk/sxz/vo/request/RequestRenovationPartsDetailManager.java

@@ -100,7 +100,12 @@ public class RequestRenovationPartsDetailManager implements Serializable {
     @ApiModelProperty(value = "OBJ路径", name = "fileId")
     private String fileId;
 
-
     @ApiModelProperty(value = "用户id", name = "fileId")
     private Long userId;
+
+    @ApiModelProperty(value = "原始模型面数", name = "obj_size")
+    private Integer facesNum;
+    @ApiModelProperty(value = "最终obj模型大小", name = "obj_size")
+    private Integer objSize;
+
 }