Browse Source

修改文件名

xiewenjie 3 years ago
parent
commit
69dfb95e43

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

@@ -160,7 +160,7 @@ public class RunBuild {
                         RenovationPartsDetailEntity partsDetailServiceById = renovationPartsDetailService.findById(id);
                         checkFlag = checkMviewFile(path, fileId, type);
                         if (checkFlag) {
-                            partsDetailServiceById.setMviewPath(prefix + "domain/eHome/furniture/temp/" + fileId + ".mview");
+                            partsDetailServiceById.setMviewPath(prefix + "domain/eHome/furniture/temp/" + fileId + ".fdage");
                             partsDetailServiceById.setMviewStatus(2);
                             renovationPartsDetailService.updateById(partsDetailServiceById);
                         } else {
@@ -173,7 +173,7 @@ public class RunBuild {
                         CustomComponentEntity componentServiceById = customComponentService.findById(id);
                         checkFlag = checkMviewFile(path, fileId, type);
                         if (checkFlag) {
-                            componentServiceById.setMviewPath(prefix + "domain/eHome/furniture/models/" + fileId + ".mview");
+                            componentServiceById.setMviewPath(prefix + "domain/eHome/furniture/models/" + fileId + ".fdage");
                             componentServiceById.setMviewStatus(2);
                             customComponentService.updateById(componentServiceById);
                             //抛出异常MQ重试
@@ -201,10 +201,10 @@ public class RunBuild {
         File file = FileUtil.file(path);
         if (FileUtil.exist(file)) {
             if (type.equals("1")) {
-                uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + fileId + ".mview");
+                uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + fileId + ".fdage");
                 return true;
             } else {
-                uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + fileId + ".mview");
+                uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + fileId + ".fdage");
                 return true;
             }
         } else {
@@ -214,10 +214,10 @@ public class RunBuild {
                 if (FileUtil.exist(path)) {
                     RunBuild.log.info("BuildMview文件存在{}", fileId);
                     if (type.equals("1")) {
-                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + fileId + ".mview");
+                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + fileId + ".fdage");
                         return true;
                     } else {
-                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + fileId + ".mview");
+                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + fileId + ".fdage");
                         return true;
                     }
                 } else {

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/ManagerController.java

@@ -711,7 +711,7 @@ public class ManagerController extends BaseController {
         }
 
         String messageStr = renovationPartsDetailEntity.getId() + ":;1:;" + buildPath + modelUploadEntity.getObjPath().replace(
-                ".obj", ".mview") + ":;" + modelUploadEntity.getFileId();
+                ".obj", ".fdage") + ":;" + modelUploadEntity.getFileId();
         rabbitTemplate.convertAndSend(TopicRabbitConfig.DELAY_EXCHANGE, TopicRabbitConfig.MVIEW, messageStr, message -> {
             // 设置过期时间
             message.getMessageProperties().setDelay(1800000);

+ 6 - 6
sxz-core/src/main/java/com/fdkk/sxz/webApi/controller/testController.java

@@ -94,10 +94,10 @@ public class testController extends BaseController {
             if (ObjectUtil.isNotNull(renovationPartsDetailEntity.getMviewPath()) && StrUtil.isNotBlank(renovationPartsDetailEntity.getMviewPath())) {
                 if (!uploadToOssUtil.existFileToOSS(renovationPartsDetailEntity.getMviewPath(), "4d-tjw")) {
                     ModelUploadEntity byFileId = modelUploadService.findByFileId(renovationPartsDetailEntity.getName());
-                    String path = byFileId.getObjPath().replace(".obj", ".mview");
+                    String path = byFileId.getObjPath().replace(".obj", ".fdage");
                     if (ObjectUtil.isNotNull(byFileId) && FileUtil.exist(path)) {
-                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + renovationPartsDetailEntity.getName() + ".mview");
-                        renovationPartsDetailEntity.setMviewPath(prefix + "domain/eHome/furniture/temp/" + renovationPartsDetailEntity.getName() + ".mview");
+                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/temp/" + renovationPartsDetailEntity.getName() + ".fdage");
+                        renovationPartsDetailEntity.setMviewPath(prefix + "domain/eHome/furniture/temp/" + renovationPartsDetailEntity.getName() + ".fdage");
                         renovationPartsDetailEntity.setMviewStatus(2);
                         renovationPartsDetailService.updateById(renovationPartsDetailEntity);
                     } else {
@@ -114,11 +114,11 @@ public class testController extends BaseController {
                 if (!uploadToOssUtil.existFileToOSS(customComponentEntity.getMviewPath(), "4d-tjw")) {
                     ComponentModelUploadEntity byFileId = componentModelUploadService.findByFileId(customComponentEntity.getFileId());
 
-                    String path = byFileId.getObjPath().replace(".obj", ".mview");
+                    String path = byFileId.getObjPath().replace(".obj", ".fdage");
                     if (ObjectUtil.isNotNull(byFileId) && FileUtil.exist(path)) {
-                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + customComponentEntity.getFileId() + ".mview");
+                        uploadToOssUtil.uploadTo4dTjw(path, "domain/eHome/furniture/models/" + customComponentEntity.getFileId() + ".fdage");
 
-                        customComponentEntity.setMviewPath(prefix + "domain/eHome/furniture/models/" + customComponentEntity.getFileId() + ".mview");
+                        customComponentEntity.setMviewPath(prefix + "domain/eHome/furniture/models/" + customComponentEntity.getFileId() + ".fdage");
                         customComponentEntity.setMviewStatus(2);
                         customComponentService.updateById(customComponentEntity);
                     } else {

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/ComponentModelUploadServiceImpl.java

@@ -171,7 +171,7 @@ public class ComponentModelUploadServiceImpl extends BaseServiceImpl<IComponentM
                     ComponentModelUploadServiceImpl.log.info("上传obj到simpleObj-Mtl结束");
                     Boolean componentSaveFlag = customComponentService.save(customComponentEntity);
                     if (componentSaveFlag) {
-                        String messageStr = customComponentEntity.getId() + ":;2:;" + buildPath + componentModel.getObjPath().replace(".obj", ".mview") + ":;" + componentModel.getFileId();
+                        String messageStr = customComponentEntity.getId() + ":;2:;" + buildPath + componentModel.getObjPath().replace(".obj", ".fdage") + ":;" + componentModel.getFileId();
                         rabbitTemplate.convertAndSend(TopicRabbitConfig.DELAY_EXCHANGE, TopicRabbitConfig.MVIEW,
                                 messageStr, message -> {
                                     // 设置过期时间

+ 1 - 1
sxz-core/src/main/java/com/fdkk/sxz/webApi/service/impl/ModelUploadServiceImpl.java

@@ -230,7 +230,7 @@ public class ModelUploadServiceImpl extends BaseServiceImpl<IModelUploadMapper,
                                     paramsMap.put("outFilePath", buildPath + componentModel.getObjPath().replace(".obj", ""));
                                     OkHttpUtils.httpPostForm(maxObjUrl + "toToolbag", paramsMap);
                                     ModelUploadServiceImpl.log.info("上传开始");
-                                    String messageStr = customComponentEntity.getId() + ":;2:;" + buildPath + componentModel.getObjPath().replace(".obj", ".mview") + ":;" + componentModel.getFileId();
+                                    String messageStr = customComponentEntity.getId() + ":;2:;" + buildPath + componentModel.getObjPath().replace(".obj", ".fdage") + ":;" + componentModel.getFileId();
                                     rabbitTemplate.convertAndSend(TopicRabbitConfig.DELAY_EXCHANGE, TopicRabbitConfig.MVIEW,
                                             messageStr, message -> {
                                                 // 设置过期时间