增加模型上传过程日志

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

@@ -913,12 +913,12 @@ public class RunBuild {
                         modelHandelStepService.save(modelHandelStep);
                         timer.restart();
                         postJson(fileId, filePath, jsonObject);
-                        modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
-                        modelHandelStepService.updateById(modelHandelStep);
 
                         Thread.sleep(1000L);
 
                         checkResultJson(fileId, filePath, jsonObject, modelUploadId);
+                        modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
+                        modelHandelStepService.updateById(modelHandelStep);
 
                         Integer facesNum = 0;
                         if ("fbx".equals(modelType)) {
@@ -936,12 +936,23 @@ public class RunBuild {
 
                         if ("datasmith".equals(modelType)) {
                             String ossDownlUrl = "domain/eHome/furniture/ue4data/" + fileId;
+                            modelHandelStep = new ModelHandelStepEntity();
+                            modelHandelStep.setStep(3);
+                            modelHandelStep.setStepRemarks("oss下载datasmith");
+                            modelHandelStep.setType(Integer.valueOf(UploadType));
+                            modelHandelStep.setParentId(Long.valueOf(modelUploadId));
+                            timer.restart();
+                            modelHandelStepService.save(modelHandelStep);
+
                             CreateObjUtil.ossCommonUtilCp(ossDownlUrl, filePath);
+                            modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
+                            modelHandelStepService.updateById(modelHandelStep);
+
                             RunBuild.log.info("oss下载datasmith-{}", ossDownlUrl);
                             if (new File(filePath + fileId + "-base.obj").exists()) {
                                 facesNum = ObjProcess.findFacesNum(filePath + fileId + "-base.obj");
                                 modelHandelStep = new ModelHandelStepEntity();
-                                modelHandelStep.setStep(3);
+                                modelHandelStep.setStep(4);
                                 modelHandelStep.setStepRemarks("obj转成obj并进行压缩：objToObj");
                                 modelHandelStep.setType(Integer.valueOf(UploadType));
                                 modelHandelStep.setParentId(Long.valueOf(modelUploadId));
@@ -971,6 +982,12 @@ public class RunBuild {
                         modelUploadEntity.setObjPath(objPath.replace(buildPath, ""));
                         modelUploadEntity.setFacesNum(facesNum);
                         modelUploadService.updateById(modelUploadEntity);
+                        modelHandelStep = new ModelHandelStepEntity();
+                        modelHandelStep.setStep(5);
+                        modelHandelStep.setStepRemarks("结束");
+                        modelHandelStep.setType(Integer.valueOf(UploadType));
+                        modelHandelStep.setParentId(Long.valueOf(modelUploadId));
+                        modelHandelStepService.save(modelHandelStep);
                         break;
                     case "2":
 
@@ -1091,6 +1108,12 @@ public class RunBuild {
 
                         //分组处理文件
                         Thread.sleep(2000L);
+                        modelHandelStep = new ModelHandelStepEntity();
+
+                        modelHandelStep.setStep(2);
+                        modelHandelStep.setStepRemarks("通知3D渲染业务端发送渲染请求：请求PRO接口");
+                        modelHandelStep.setType(Integer.valueOf(UploadType));
+                        modelHandelStep.setParentId(Long.valueOf(modelUploadId));
 
                         postJsonObj.put("params1", params1);
                         postJson(fileId, filePath, postJsonObj);
@@ -1098,6 +1121,8 @@ public class RunBuild {
                         Thread.sleep(1000L);
                         postJsonObj.remove("params1");
                         checkResultJson(fileId, filePath, postJsonObj, modelUploadId);
+                        modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
+                        modelHandelStepService.updateById(modelHandelStep);
 
                         String productName = "";
                         //拿预览图+obj 成品+组件
@@ -1130,7 +1155,6 @@ public class RunBuild {
                                     componentEntity.setThumPath(uploadPath.replace(buildPath, "") + "_preview.jpg");
                                     componentEntity.setObjPath(uploadPath.replace(buildPath, "") + ".obj");
                                     componentEntity.setMtlPath(uploadPath.replace(buildPath, "") + ".mtl");
-                                    //TODO 贴图是啥
                                     componentEntity.setImgPath(uploadPath.replace(buildPath, "") + ".jpg");
                                     componentEntity.setStatus(1);
                                     componentEntity.setProgress(100);
@@ -1147,6 +1171,12 @@ public class RunBuild {
                         modelUploadEntity.setStatus(1);
                         modelUploadEntity.setProgress(100);
                         modelUploadService.updateById(modelUploadEntity);
+                        modelHandelStep = new ModelHandelStepEntity();
+                        modelHandelStep.setStep(5);
+                        modelHandelStep.setStepRemarks("结束");
+                        modelHandelStep.setType(Integer.valueOf(UploadType));
+                        modelHandelStep.setParentId(Long.valueOf(modelUploadId));
+                        modelHandelStepService.save(modelHandelStep);
                         RunBuild.log.info("配件逻处理完毕");
                         break;
 
@@ -1167,16 +1197,31 @@ public class RunBuild {
                         componetJsonObject.put("taskId", userId);
                         componetJsonObject.put("postfix", modelType);
 //            String buildResult = OkHttpUtils.httpPostJson(buildUrl + "pro", jsonObject.toJSONString());
-
+                        modelHandelStep = new ModelHandelStepEntity();
+                        modelHandelStep.setStep(2);
+                        modelHandelStep.setStepRemarks("通知3D渲染业务端发送渲染请求：请求PRO接口");
+                        modelHandelStep.setType(Integer.valueOf(UploadType));
+                        modelHandelStep.setParentId(Long.valueOf(modelUploadId));
                         postJson(fileId, filePath, componetJsonObject);
 
                         Thread.sleep(1000L);
 
                         checkResultJson(fileId, filePath, componetJsonObject, modelUploadId);
+                        modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
+                        modelHandelStepService.updateById(modelHandelStep);
 
                         if ("datasmith".equals(modelType)) {
                             String ossDownlUrl = "domain/eHome/furniture/ue4data/" + fileId;
+                            modelHandelStep = new ModelHandelStepEntity();
+                            modelHandelStep.setStep(3);
+                            modelHandelStep.setStepRemarks("oss下载dataSmith");
+                            modelHandelStep.setType(Integer.valueOf(UploadType));
+                            modelHandelStep.setParentId(Long.valueOf(modelUploadId));
+                            timer.restart();
+                            modelHandelStepService.save(modelHandelStep);
                             CreateObjUtil.ossCommonUtilCp(ossDownlUrl, filePath);
+                            modelHandelStep.setUseTime(String.valueOf(timer.intervalMs()));
+                            modelHandelStepService.updateById(modelHandelStep);
                             RunBuild.log.info("oss下载datasmith-{}", ossDownlUrl);
                             if (FileUtil.exist(filePath + fileId + "-base.obj")) {
                                 FileUtil.copyFile(filePath + fileId + "-base.obj", filePath + fileId + ".obj");
@@ -1198,6 +1243,12 @@ public class RunBuild {
 //                    componentModelUploadEntity.setImgPath(objPath.replace(buildPath, "").replace(".obj", "") + ".jpg");
                         componentModelUploadEntity.setObjPath(objPath.replace(buildPath, ""));
                         componentModelUploadService.updateById(componentModelUploadEntity);
+                        modelHandelStep = new ModelHandelStepEntity();
+                        modelHandelStep.setStep(4);
+                        modelHandelStep.setStepRemarks("结束");
+                        modelHandelStep.setType(Integer.valueOf(UploadType));
+                        modelHandelStep.setParentId(Long.valueOf(modelUploadId));
+                        modelHandelStepService.save(modelHandelStep);
                         break;
 
                     default: