全景图上传下载接口优化

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneListener.java

@@ -73,23 +73,23 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 @Component
 @RocketMQMessageListener(
-        consumerGroup = "${rocketmq.consumer.build-scene-group-test}",
-        topic = "${rocketmq.build-scene.topicName.topic-modeling-a-test}",
+        consumerGroup = "${rocketmq.consumer.build-scene-group}",
+        topic = "${rocketmq.build-scene.topicName.topic-modeling-a}",
         messageModel = MessageModel.CLUSTERING,//负载均衡模式
         consumeThreadMax = 1//消费者最大线程数，每次只消费一个
 )
 public class BuildSceneListener implements RocketMQListener<String> {
 
-    @Value("${rocketmq.consumer.build-scene-group-test}")
+    @Value("${rocketmq.consumer.build-scene-group}")
     private String consumerGroup;
 
-    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-test}")
+    @Value("${rocketmq.build-scene.topicName.topic-modeling-a}")
     private String topicName;
 
-    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-dt-test}")
+    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-dt}")
     private String topicNameDt;
 
-    @Value("${rocketmq.build-scene-result.topicName.topic-modeling-a-test}")
+    @Value("${rocketmq.build-scene-result.topicName.topic-modeling-a}")
     private String buildSceneResultTopic;
 
     @Autowired

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneFailDTMQListener.java

@@ -35,8 +35,8 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 @RocketMQMessageListener(
-        consumerGroup = "${rocketmq.consumer.build-scene-dt-group-test}",
-        topic = "${rocketmq.build-scene.topicName.topic-modeling-a-dt-test}",
+        consumerGroup = "${rocketmq.consumer.build-scene-dt-group}",
+        topic = "${rocketmq.build-scene.topicName.topic-modeling-a-dt}",
         messageModel = MessageModel.CLUSTERING,//负载均衡模式
         consumeThreadMax = 10
 )

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildScenePreMQListener.java

@@ -58,8 +58,8 @@ import org.springframework.stereotype.Component;
 @Slf4j
 @Component
 @RocketMQMessageListener(
-        consumerGroup = "${rocketmq.consumer.build-scene-pre-group-test}",
-        topic = "${rocketmq.build-scene.topicName.topic-modeling-a-pre-test}",
+        consumerGroup = "${rocketmq.consumer.build-scene-pre-group}",
+        topic = "${rocketmq.build-scene.topicName.topic-modeling-a-pre}",
         messageModel = MessageModel.CLUSTERING,//负载均衡模式
         consumeThreadMax = 10
 )
@@ -97,7 +97,7 @@ public class BuildScenePreMQListener implements RocketMQListener<String> {
     IBuildScenePreService buildScenePreService;
     @Autowired
     private RocketMQProducer producer;
-    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-test}")
+    @Value("${rocketmq.build-scene.topicName.topic-modeling-a}")
     private String topicName;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/listener/BuildSceneResultMQListener.java

@@ -58,16 +58,16 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Component
 @RocketMQMessageListener(
-        consumerGroup = "${rocketmq.consumer.build-scene-result-group-test}",
-        topic = "${rocketmq.build-scene-result.topicName.topic-modeling-a-test}",
+        consumerGroup = "${rocketmq.consumer.build-scene-result-group}",
+        topic = "${rocketmq.build-scene-result.topicName.topic-modeling-a}",
         messageModel = MessageModel.CLUSTERING//负载均衡模式
 )
 public class BuildSceneResultMQListener implements RocketMQListener<String> {
 
-    @Value("${rocketmq.consumer.build-scene-result-group-test}")
+    @Value("${rocketmq.consumer.build-scene-result-group}")
     private String consumerGroup;
 
-    @Value("${rocketmq.build-scene-result.topicName.topic-modeling-a-test}")
+    @Value("${rocketmq.build-scene-result.topicName.topic-modeling-a}")
     private String buildSceneResultTopic;
 
     @Value("${main.url}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -603,6 +603,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         //压缩包保存到本地
         String path =  String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
 //        String path = "F:\\mnt\\4Dkankan\\scene\\t-ieXdyGl6Md\\caches\\images\\";
+
+        //先删除本地文件
+        FileUtils.deleteDirectory(path);
+
         String targetFilePath = path + File.separator + file.getOriginalFilename();
         File targetFile = new File(targetFilePath);
         if(!targetFile.getParentFile().exists()){
@@ -639,9 +643,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             return filePath.substring(filePath.lastIndexOf(File.separator) + 1);
         }).collect(Collectors.toList());
 
-
-        //删除云caches/images
-        uploadToOssUtil.deleteFile(imgCachePath);
+        //有文件对不上号，就退出
+        if(CollUtil.isNotEmpty(notExistFileList)){
+            return notExistFileList;
+        }
 
         //上传
         Map<String, String> map = new HashMap<>();
@@ -650,7 +655,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         });
         uploadToOssUtil.uploadMulFiles(map);
 
-        return notExistFileList;
+        //删除本地目录
+        FileUtils.deleteDirectory(path);
+
+        return null;
     }
 
     @Override
@@ -702,6 +710,11 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         uploadToOssUtil.upload(zipPath, String.format(cacheFormat, num) + zipName);
         String url = ossUrlPrefix + String.format(cacheFormat, num) + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
 
+        //删除本地压缩包
+        FileUtils.deleteFile(zipPath);
+        //删除本地目录
+        FileUtils.deleteDirectory(localImagesPath);
+
         Map<String, Object> map = new HashMap<>();
         map.put("fileUrl", url + "?t=" + System.currentTimeMillis());
         map.put("fileName", zipName);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -91,7 +91,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
 
     @Value("${rocketmq.build-scene.topicName.topic-modeling-a}")
     private String topicModelingA;
-    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-pre-test}")
+    @Value("${rocketmq.build-scene.topicName.topic-modeling-a-pre}")
     private String topicModelingAPre;
 
     @Value("${rocketmq.build-scene.topicName.topic-laser-a}")