计算完成时间

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -71,7 +71,7 @@ public class OsgbToB3dmConsumer {
             }
             //String ossPath = sourcePath.replace(CacheUtil.basePath,"");
             //localToOssUtil.uploadOss(sourcePath,ossPath);
-            String url = CacheUtil.mapping + dir+ File.separator +jsonFile.getName();
+            String url = CacheUtil.mapping + dir + File.separator +jsonFile.getName();
             HashMap<String,String> resultMap = ReadXmlUtil.getLatMap(file);
             if(resultMap != null && !resultMap.isEmpty()){
                 commonUploadService.updateByPath(uploadId,url,resultMap.get("wgs84"),resultMap.get("gcj02"));

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -161,13 +161,13 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
 
     private String uploadObjOss(String unzipPath, File modelFile) {
         OBJToGLBUtil.checkObj(modelFile.getPath());
-        String localGlbPath = modelFile.getPath().replace(".obj",".glb");
-        OBJToGLBUtil.objToGlb2(modelFile.getPath(),localGlbPath);
-        File file = new File(localGlbPath);
-        if(!file.exists()){
-            throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
-        }
-        return  unzipPath +File.separator+file.getName();
+        //String localGlbPath = modelFile.getPath().replace(".obj",".glb");
+        //OBJToGLBUtil.objToGlb2(modelFile.getPath(),localGlbPath);
+//        File file = new File(localGlbPath);
+//        if(!file.exists()){
+//            throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
+//        }
+        return  unzipPath +File.separator+modelFile.getName();
     }
 
     private String uploadB3dm(String unzipPath, File modelFile) {
@@ -195,7 +195,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         if(!modelFile.exists()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
         }
-       return  unzipPath +File.separator +modelFile.getParentFile().getName();
+       return  unzipPath ;
        // return  modelFile.getParentFile().getPath();
     }
 
@@ -203,7 +203,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         if(!modelFile.exists()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
         }
-        return unzipPath+File.separator +modelFile.getName();
+        return unzipPath;
        // return  modelFile.getPath();
     }
 
@@ -213,7 +213,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         if(!file.exists()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_ERROR);
         }
-        return  unzipPath+File.separator +mntFile.getName() + File.separator +"webcloud";
+        return  unzipPath + File.separator +"webcloud";
        // return  mntFile.getPath()+ File.separator +"webcloud";
 
     }

src/main/resources/application.yml

@@ -7,7 +7,7 @@ server:
 
 spring:
   profiles:
-    active: ${activeProfile:jm}
+    active: ${activeProfile:local}
   servlet:
     multipart:
       max-file-size: 1000MB