1

src/main/java/com/fdkankan/fusion/common/util/LocalToOssUtil.java

@@ -59,7 +59,10 @@ public class LocalToOssUtil {
                 }
             }
             objectName = result.toString();
-            FileUtil.copyContent(new File(getOssPath(bucket, objectName)), new File(localPath), true);
+            String relaPath = getOssPath(bucket, objectName);
+            log.info("下载文件:{},{}",relaPath,localPath);
+
+            FileUtil.copyContent(new File(relaPath), new File(localPath), true);
         }catch (Exception e){
             log.info("下载文件失败,remoteFilePath：{}，localPath:{}", objectName, localPath);
             log.info("下载文件失败", e);

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -436,6 +436,7 @@ public class CaseDownService {
         }
         if(!rebuildOffline && buildOfflineStatus == 1){
             if(!new File(offlineFolder).exists()){
+                log.info("离线包文件不存在：{}",offlineFolder);
                 laserService.rebuildOffline(offPath,isLaser,sceneId);
                 return true;
             }

src/main/java/com/fdkankan/fusion/httpClient/LaserService.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -98,8 +99,9 @@ public class LaserService {
         try {
             SSDownSceneParamLocal param = new SSDownSceneParamLocal();
             param.setId(id);
-            param.setResultPath(buildPath);
+            param.setResultPath(buildPath+ File.separator);
             param.setOfflineType(isLaser ? 1 :2);
+            param.setFusion(true);
             laserClient.downOfflineSceneNew(param);
         }catch (Exception e){
             log.info("获取激光场景信息失败rebuildOffline-error：{},{},{}",buildPath,isLaser,id,e);

src/main/java/com/fdkankan/fusion/httpClient/request/SSDownSceneParamLocal.java

@@ -9,4 +9,5 @@ public class SSDownSceneParamLocal {
     private String lang = "zh";
     //1点云，2mesh
     private Integer offlineType;
+    private boolean fusion;
 }

src/main/java/com/fdkankan/fusion/interceptor/ControllerAopInterceptor.java

@@ -63,13 +63,11 @@ public class ControllerAopInterceptor {
 		// 记录开始时间
 		long start = System.currentTimeMillis();
 
-		log.warn("请求| ip:{} , 请求接口:{} ,请求时间:{}, 参数:{} , 请求token:{} ",
-				ip, requestURL, start,paramsBuf.toString(), request.getHeader("token"));
+		//log.warn("请求| ip:{} , 请求接口:{} ,请求时间:{}, 参数:{} , 请求token:{} ", ip, requestURL, start,paramsBuf.toString(), request.getHeader("token"));
 		// 执行目标方法
 		result = pjp.proceed();
 		// 获取执行完的时间 打印返回报文
-		log.warn("返回| 请求接口:{} , 请求时间:{} , 处理时间:{} 毫秒 , 返回结果 :{}",
-				requestURL, start, (System.currentTimeMillis() - start), result);
+		//log.warn("返回| 请求接口:{} , 请求时间:{} , 处理时间:{} 毫秒 , 返回结果 :{}", requestURL, start, (System.currentTimeMillis() - start), result);
 		return result;
 	}
 

src/main/resources/application.yml

@@ -54,7 +54,7 @@ spring:
 
 logging:
   config: classpath:logback-spring.xml
-  path: ${DPROFILE_PATH}/../bin/log
+  path: ${PROFILE_PATH}/../bin/log
 
 mybatis-plus:
   configuration:
@@ -68,10 +68,10 @@ oss:
 
 
 fdkk:
-  installPath: ${DPROFILE_PATH}
+  installPath: ${PROFILE_PATH}
 
 
 geoquery:
-  dataFilePath: ${DPROFILE_PATH}/../geoFile/GeoJSON.json
-  saveWkbsFilePath: ${DPROFILE_PATH}/../geoFile/GeoJSON.wkbs
+  dataFilePath: ${PROFILE_PATH}/../geoFile/GeoJSON.json
+  saveWkbsFilePath: ${PROFILE_PATH}/../geoFile/GeoJSON.wkbs
 

src/main/resources/logback-spring.xml

@@ -51,7 +51,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录debug级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -79,7 +79,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录info级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -106,7 +106,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录warn级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -134,7 +134,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录ERROR级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -160,7 +160,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录ERROR级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -188,7 +188,7 @@
 				<maxFileSize>100MB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!--日志文件保留天数 -->
-			<maxHistory>15</maxHistory>
+			<maxHistory>1</maxHistory>
 		</rollingPolicy>
 		<!-- 此日志文件只记录ERROR级别的 -->
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">