增加转换mview逻辑

startJar.sh

@@ -24,9 +24,9 @@ checkEnv(){
                       else
                         echo "没有设置环境"
             fi
-      else
-            # echo "已经设置-${APP_NAME}-${APP_DEBUG}"
-      fi
+     # else
+         #    echo "已经设置-${APP_NAME}-${APP_DEBUG}"
+     fi
 }
 
 # 判断当前服务是否已经启动的函数

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

@@ -323,7 +323,7 @@ public class CreateObjUtil {
 
     public static void callshell(String command) {
         try {
-            log.error("开始调用脚本 :" + command);
+            log.warn("开始调用脚本 :" + command);
             Process process = Runtime.getRuntime().exec(command);
             //process.waitFor();
         	/*

sxz-common/src/main/java/com/fdkk/sxz/logging/LogAppender.java

@@ -23,7 +23,7 @@ public class LogAppender extends ConsoleAppender<ILoggingEvent> {
         if (eventObject.getMessage().contains("::")) {
             message = eventObject.getMessage().split("::")[0];
         }
-        Log log = new Log(eventObject.getLoggerName(), eventObject.getMessage(), eventObject.getThreadName(), DateUtil.convert2CST(eventObject.getTimeStamp()), eventObject.getLevel().toString(),
+        Log log = new Log(eventObject.getLoggerName(), eventObject.getFormattedMessage(), eventObject.getThreadName(), DateUtil.convert2CST(eventObject.getTimeStamp()), eventObject.getLevel().toString(),
                 TRACE_ID, message);
         //添加到阻塞队列
         if (!log.getMessage().contains("/logging/") &&

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

@@ -34,9 +34,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by Hb_zzZ on 2020/12/1.
@@ -584,6 +582,19 @@ public class ManagerController extends BaseController {
         //先执行python-NewResortForOne脚本，处理obj文件
         CreateObjUtil.objHandle(buildPath + modelUploadEntity.getObjPath());
 
+
+        log.info("配件obj转换成mview格式");
+        Map<String, String> paramsMap = new HashMap<>();
+        paramsMap.put("uuid",modelUploadEntity.getFileId());
+        paramsMap.put("inObj",buildPath + modelUploadEntity.getObjPath());
+        paramsMap.put("outFilePath",buildPath + buildPath + modelUploadEntity.getObjPath().replace(".obj", ""));
+        OkHttpUtils.httpPostForm(maxObjUrl+"toToolbag",paramsMap);
+        Thread.sleep(1000);
+        uploadToOssUtil.uploadTo4dTjw(buildPath + modelUploadEntity.getObjPath().replace(".obj", ".mview"), "domain/eHome/furniture/temp/" + modelUploadEntity.getFileId() + ".mview");
+        log.info("配件obj转换成mview格式结束{}",modelUploadEntity.getObjPath().replace(".obj", ".mview"));
+
+
+
         //obj转换成glb格式
         String glbPath = buildPath + "upload/" + modelUploadEntity.getFileId() + "/" + modelUploadEntity.getFileId() + ".glb";
         log.info("obj转换成glb格式路径-{}", glbPath);
@@ -616,7 +627,7 @@ public class ManagerController extends BaseController {
         RenovationPartsDetailEntity renovationPartsDetailEntity = new RenovationPartsDetailEntity();
         BeanUtils.copyProperties(param, renovationPartsDetailEntity);
         renovationPartsDetailEntity.setExamine(0);
-
+        renovationPartsDetailEntity.setMviewPath(prefix + "domain/eHome/furniture/temp/" + modelUploadEntity.getFileId() + ".mview");
         renovationPartsDetailEntity.setName(modelUploadEntity.getFileId());
         renovationPartsDetailEntity.setPath(prefix + "domain/eHome/furniture/temp/" + modelUploadEntity.getFileId() + ".glb");
 
@@ -773,11 +784,18 @@ public class ManagerController extends BaseController {
             uploadToOssUtil.copyTo4dTjw(renovationPartsDetailEntity.getPath().replace(prefix, ""),
                     renovationPartsDetailEntity.getPath().replace("/temp/", "/models/").replace(prefix, ""));
 
+            uploadToOssUtil.copyTo4dTjw(renovationPartsDetailEntity.getMviewPath().replace(prefix, ""),
+                    renovationPartsDetailEntity.getMviewPath().replace("/temp/", "/models/").replace(prefix, ""));
+
             uploadToOssUtil.deleteTo4dTjw(renovationPartsDetailEntity.getImg().replace(prefix, ""));
             uploadToOssUtil.deleteTo4dTjw(renovationPartsDetailEntity.getPath().replace(prefix, ""));
+            uploadToOssUtil.deleteTo4dTjw(renovationPartsDetailEntity.getMviewPath().replace(prefix, ""));
+
             renovationPartsDetailEntity.setImg(renovationPartsDetailEntity.getImg().replace("/temp/", "/models/"));
             renovationPartsDetailEntity.setHighImg(renovationPartsDetailEntity.getHighImg().replace("/temp/", "/models/"));
             renovationPartsDetailEntity.setPath(renovationPartsDetailEntity.getPath().replace("/temp/", "/models/"));
+            renovationPartsDetailEntity.setMviewPath(renovationPartsDetailEntity.getMviewPath().replace("/temp/", "/models/"));
+
         }
 
         renovationPartsDetailService.updateById(renovationPartsDetailEntity);

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

@@ -37,7 +37,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Wrapper;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @description: ComponentModelUpload 相关的服务实现类
@@ -67,6 +69,8 @@ public class ComponentModelUploadServiceImpl extends BaseServiceImpl<IComponentM
     private UploadToOssUtil uploadToOssUtil;
 
 
+    @Value("${max.obj.url}")
+    private String maxObjUrl;
 
 
     @Override
@@ -143,6 +147,18 @@ public class ComponentModelUploadServiceImpl extends BaseServiceImpl<IComponentM
                     uploadToOssUtil.uploadTo4dTjw(buildPath + componentModel.getThumPath(), "domain/eHome/furniture/models/" + componentModel.getFileId() + "_preview.jpg");
 
                     customComponentEntity.setThumbnailSrc(prefix + "domain/eHome/furniture/models/" + componentModel.getFileId() + "_preview.jpg");
+
+                    log.info("配件obj转换成mview格式");
+                    Map<String, String> paramsMap = new HashMap<>();
+                    paramsMap.put("uuid",componentModel.getFileId());
+                    paramsMap.put("inObj",buildPath +componentModel.getObjPath());
+                    paramsMap.put("outFilePath",buildPath + componentModel.getObjPath().replace(".obj", ""));
+                    OkHttpUtils.httpPostForm(maxObjUrl+"toToolbag",paramsMap);
+                    uploadToOssUtil.uploadTo4dTjw(buildPath + componentModel.getObjPath().replace(".obj", ".mview"), "domain/eHome/furniture/models/" + componentModel.getFileId() + ".mview");
+                    customComponentEntity.setMviewPath(prefix + "domain/eHome/furniture/models/" + componentModel.getFileId() + ".mview");
+                    log.info("配件obj转换成mview格式结束{}",customComponentEntity.getMviewPath());
+
+
                     //obj转换成glb格式
                     log.info("配件obj转换成glb格式");
                     String glbPath = buildPath + componentModel.getObjPath().replace(".obj", ".glb");

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

@@ -1,5 +1,9 @@
 package com.fdkk.sxz.webApi.service.impl;
 
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.io.watch.SimpleWatcher;
+import cn.hutool.core.io.watch.WatchMonitor;
+import cn.hutool.core.io.watch.Watcher;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -31,7 +35,11 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.nio.file.Path;
+import java.nio.file.WatchEvent;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by Hb_zzZ on 2020/12/1.
@@ -64,11 +72,15 @@ public class ModelUploadServiceImpl extends BaseServiceImpl<IModelUploadMapper,
     private String buildPath;
 
     @Value("${prefix.ali}")
-
     private String prefix;
+
     @Value("${build.url}")
     private String buildUrl;
 
+    @Value("${max.obj.url}")
+    private String maxObjUrl;
+
+
     @Autowired
     private CacheChannel cacheChannel;
 
@@ -155,6 +167,32 @@ public class ModelUploadServiceImpl extends BaseServiceImpl<IModelUploadMapper,
                                 uploadToOssUtil.uploadTo4dTjw(buildPath + componentModel.getThumPath(), "domain/eHome/furniture/models/" + componentModel.getFileId() + "_preview.jpg");
 
                                 customComponentEntity.setThumbnailSrc(prefix + "domain/eHome/furniture/models/" + componentModel.getFileId() + "_preview.jpg");
+
+                                log.info("配件obj转换成mview格式");
+                                Map<String, String> paramsMap = new HashMap<>();
+                                paramsMap.put("uuid",componentModel.getFileId());
+                                paramsMap.put("inObj",buildPath +componentModel.getObjPath());
+                                paramsMap.put("outFilePath",buildPath + componentModel.getObjPath().replace(".obj", ""));
+                                OkHttpUtils.httpPostForm(maxObjUrl+"toToolbag",paramsMap);
+                                log.info("上传开始");
+                                int count=4;
+                                boolean flag=true;
+                                while (flag){
+                                    if(FileUtil.exist(buildPath + componentModel.getObjPath().replace(".obj", ".mview"))){
+                                        log.info("文件存在");
+                                        uploadToOssUtil.uploadTo4dTjw(buildPath + componentModel.getObjPath().replace(".obj", ".mview"), "domain/eHome/furniture/models/" + componentModel.getFileId() + ".mview");
+                                        customComponentEntity.setMviewPath(prefix + "domain/eHome/furniture/models/" + componentModel.getFileId() + ".mview");
+                                        flag=false;
+                                    }else {
+                                        Thread.sleep(1000);
+                                    }
+                                    if (count<=0){
+                                        break;
+                                    }
+                                     count -= 1;
+                                }
+
+                                log.info("配件obj转换成mview格式结束{}",customComponentEntity.getMviewPath());
                                 //obj转换成glb格式
                                 log.info("配件obj转换成glb格式");
                                 String glbPath = buildPath + componentModel.getObjPath().replace(".obj", ".glb");

sxz-modules/src/main/java/com/fdkk/sxz/entity/RenovationPartsDetailEntity.java

@@ -52,6 +52,9 @@ public class RenovationPartsDetailEntity extends BaseEntity {
     @TableField( "path")
     private String path;
 
+    @TableField( "mview_path")
+    private String mviewPath;
+
     @TableField( "name")
     private String name;
 

sxz-modules/src/main/java/com/fdkk/sxz/entity/custuom/CustomComponentEntity.java

@@ -75,6 +75,13 @@ public class CustomComponentEntity extends BaseEntity {
     private String thumbnailSrc;
 
     /**
+     * mview_OSS路径
+     */
+    @TableField("mview_path")
+    @ApiModelProperty(value = "mview_OSS路径", name = "mviewPath")
+    private String mviewPath;
+
+    /**
      * 色系
      */
     @TableField("colorTypeId")