Browse Source

离线包状态

lyhzzz 5 months ago
parent
commit
cb3f6f8635

+ 4 - 2
src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -461,8 +461,10 @@ public class CaseDownService {
                 laserService.rebuildOffline(offPath,isLaser,sceneId);
                 return true;
             }
-            if(!redisUtil.hasKey(redisKey)){
-                FileUtil.copyContent(new File(offlineFolder),new File(offPath+File.separator+num),true);
+            File file = new File(offlineFolder);
+            File file1 = new File(offPath + File.separator + num);
+            if(!file.getPath().equals(file1.getPath())){
+                FileUtil.copyContent(file,file1,true);
             }
             return false;
         }

+ 2 - 2
src/main/java/com/fdkankan/fusion/service/impl/SceneCommonService.java

@@ -103,7 +103,7 @@ public class SceneCommonService implements ISceneCommonService {
         if(param.getStatus() != null){
             wrapper.eq(Scene::getStatus,param.getStatus());
         }
-        wrapper.orderByDesc(Scene::getCreateTime);
+        wrapper.orderByDesc(Scene::getId);
         Page<Scene> page = sceneService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<String> numList = page.getRecords().parallelStream().map(Scene::getSceneCode).collect(Collectors.toList());
 
@@ -151,7 +151,7 @@ public class SceneCommonService implements ISceneCommonService {
                 if(scene.getBuildObjStatus() != null){
                     switch (scene.getBuildObjStatus()){
                         case -1: vo.setStatus(1); break;
-                        case 0: vo.setStatus(0); break;
+                        case 0: vo.setStatus(3); break;
                         case 1: vo.setStatus(2); break;
                         case 2: vo.setStatus(0); break;
                         case 3: vo.setStatus(6); break;

+ 13 - 0
src/main/resources/application.yml

@@ -75,3 +75,16 @@ geoquery:
   dataFilePath: ${PROFILE_PATH}/../geoFile/GeoJSON.json
   saveWkbsFilePath: ${PROFILE_PATH}/../geoFile/GeoJSON.wkbs
 
+forest:
+  ## 日志总开关,打开/关闭Forest请求/响应日志(默认为 true)
+  log-enabled: true
+  ## 打开/关闭Forest请求日志(默认为 true)
+  log-request: true
+  ## 打开/关闭Forest响应状态日志(默认为 true)
+  log-response-status: true
+  ## 打开/关闭Forest响应内容日志(默认为 false)
+  log-response-content: true
+  ## 请求超时时间,单位为毫秒, 默认值为3000
+  timeout: 3000
+  ## 连接超时时间,单位为毫秒, 默认值为2000
+  connect-timeout: 3000