Merge branch 'master' into dev-dsx-modeling-20220309

# Conflicts:
#	4dkankan-common-utils/src/main/java/com/fdkankan/common/util/ComputerUtil.java

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/ComputerUtil.java

@@ -205,6 +205,24 @@ public class ComputerUtil {
         return map;
     }
 
+    public static String getPath(String path, String cameraName, String fileId, int cameraType, String unicode){
+        if(cameraType < 3){
+            return path;
+        }
+        String localPath = cameraName.replace("4DKKPRO_", "")
+            .replace("-fdage", "").toLowerCase() +
+            File.separator + fileId + File.separator + unicode;
+
+        if(cameraType == 5 || cameraType == 6){
+            path = ConstantFilePath.BUILD_MODEL_PATH + unicode;
+        }else if(cameraType == 14) {
+            path = ConstantFilePath.BUILD_MODEL_LASER_PATH + localPath;
+        } else{
+            path = ConstantFilePath.BUILD_MODEL_PATH + localPath;
+        }
+        return path;
+    }
+
     public static Map<String,String> computerRebuildVideo(String projectNum, String path) throws Exception{
 
         String videosPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);     //新版本文件路径