|
@@ -722,24 +722,30 @@ public class RunBuild {
|
|
|
|
|
|
Integer facesNum = 0;
|
|
|
if("fbx".equals(modelType)){
|
|
|
- uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + fileId + "/" + fileId + "_preview.jpg", filePath + fileId + "_preview.jpg");
|
|
|
-
|
|
|
- OkHttpUtils.httpGet(maxObjUrl + "fbxToObj?uuid=" + fileId +"&fbx=" + fileId +
|
|
|
- ".fbx&obj=" + fileId + ".obj&jpg=" + fileId + ".jpg&r=30");
|
|
|
+ String ossUrl = "domain/eHome/furniture/ue4data/" + fileId + "/" + fileId + "_preview.jpg";
|
|
|
+ String localUrl = filePath + fileId + "_preview.jpg";
|
|
|
+ uploadToOssUtil.downloadFileTo4dTjw(ossUrl, localUrl);
|
|
|
+ log.info("ossUrl-{}", ossUrl);
|
|
|
+ log.info("本地Url-{}", localUrl);
|
|
|
+
|
|
|
+ String maxObjUrlGet = maxObjUrl + "fbxToObj?uuid=" + fileId +"&fbx=" + fileId +
|
|
|
+ ".fbx&obj=" + fileId + ".obj&jpg=" + fileId + ".jpg&r=30";
|
|
|
+ OkHttpUtils.httpGet(maxObjUrlGet);
|
|
|
+ log.info("请求maxObj地址-{}", maxObjUrlGet);
|
|
|
}
|
|
|
|
|
|
if("datasmith".equals(modelType)){
|
|
|
-// uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + fileId + "/" + fileId + ".fbx", filePath + fileId + ".fbx");
|
|
|
-// uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + fileId + "/" + fileId + ".jpg", filePath + fileId + ".jpg");
|
|
|
-// uploadToOssUtil.downloadFileTo4dTjw("domain/eHome/furniture/ue4data/" + fileId + "/" + fileId + "_preview.jpg", filePath + fileId + "_preview.jpg");
|
|
|
- CreateObjUtil.ossCommonUtilCp("domain/eHome/furniture/ue4data/" + fileId, filePath);
|
|
|
-
|
|
|
+ String ossDownlUrl = "domain/eHome/furniture/ue4data/" + fileId;
|
|
|
+ CreateObjUtil.ossCommonUtilCp(ossDownlUrl, filePath);
|
|
|
+ log.info("oss下载datasmith-{}", ossDownlUrl);
|
|
|
|
|
|
if(new File(filePath + fileId + "-base.obj").exists()){
|
|
|
facesNum = ObjProcess.findFacesNum(filePath + fileId + "-base.obj");
|
|
|
|
|
|
- OkHttpUtils.httpGet(maxObjUrl + "objToObj?uuid=" + fileId +"&inObj=" + fileId +
|
|
|
- "-base.obj&outObj=" + fileId + ".obj&r=3000");
|
|
|
+ String maxObjUrlGet = maxObjUrl + "objToObj?uuid=" + fileId +"&inObj=" + fileId +
|
|
|
+ "-base.obj&outObj=" + fileId + ".obj&r=3000";
|
|
|
+ OkHttpUtils.httpGet(maxObjUrlGet);
|
|
|
+ log.info("请求maxObj地址-{}", maxObjUrlGet);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -755,6 +761,7 @@ public class RunBuild {
|
|
|
|
|
|
|
|
|
modelUploadEntity.setStatus(1);
|
|
|
+ modelUploadEntity.setProgress(100);
|
|
|
modelUploadEntity.setObjPath(objPath.replace(buildPath, ""));
|
|
|
// modelUploadEntity.setImgPath(imgPath.replace(buildPath, ""));
|
|
|
modelUploadEntity.setFacesNum(facesNum);
|