Преглед на файлове

重新生成obj,清除异步操作记录

dengsixing преди 1 година
родител
ревизия
a150cdcc67

+ 3 - 0
src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -304,6 +304,9 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                 commonService.writeSceneJson(projectNum, new JSONObject(),sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
             }
 
+            //重置异步操作记录
+            commonService.removeSceneAsynOperLog(projectNum);
+
             // 如果未升级V4,则升级V4
             if("v3".equals(version)){
                 fdkkV4Service.upgradeToV4(projectNum);

+ 1 - 21
src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -307,7 +307,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             commonService.uploadFloorplanJson(sceneCode, path);
 
             //重置异步操作记录
-            this.removeSceneAsynOperLog(sceneCode);
+            commonService.removeSceneAsynOperLog(sceneCode);
 
             //清除用户编辑业务数据
             Set<String> bizs = new HashSet<>();
@@ -394,26 +394,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
         }
     }
 
-    private void removeSceneAsynOperLog(String num){
-        List<SceneAsynOperLog> list = sceneAsynOperLogService.list(new LambdaQueryWrapper<SceneAsynOperLog>().eq(SceneAsynOperLog::getNum, num));
-        if(CollUtil.isEmpty(list)){
-            return;
-        }
-        //删除数据库记录
-        List<Long> deleteIdList = list.parallelStream().map(item -> item.getId()).collect(Collectors.toList());
-        sceneAsynOperLogService.removeByIds(deleteIdList);
-
-        list.parallelStream().forEach(item -> {
-            if(StrUtil.isNotEmpty(item.getUrl())){
-                try {
-                    fYunFileService.deleteFile(item.getUrl());
-                } catch (IOException e) {
-                    log.warn("删除oss全景图下载压缩包失败,key:{}", item.getUrl());
-                }
-            }
-        });
-    }
-
 //    private void cachePanorama(String dataSource, String num){
 //        String cachedImagesPath = String.format(ConstantFilePath.SCENE_CACHE_IMAGES, num);
 //        //将全景图缓存到缓存目录

+ 2 - 0
src/main/java/com/fdkankan/contro/service/ICommonService.java

@@ -50,4 +50,6 @@ public interface ICommonService {
     void saveMqSendLog(String num, BuildSceneCallMessage message);
 
     void sendUpdateSceneStatusMqToQueues(Map<String, Object> content);
+
+    void removeSceneAsynOperLog(String num);
 }

+ 25 - 0
src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,6 +50,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.Objects;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -69,6 +71,8 @@ public class CommonServiceImpl implements ICommonService {
 
     @Value("#{'${camType.laser:}'.split(',')}")
     private List<Integer> laserCamTypeList;
+    @Autowired
+    private ISceneAsynOperLogService sceneAsynOperLogService;
 
 
     @Resource
@@ -516,4 +520,25 @@ public class CommonServiceImpl implements ICommonService {
             rabbitMqProducer.sendByWorkQueue(config.getQueueName(), content);
         }
     }
+
+    @Override
+    public void removeSceneAsynOperLog(String num) {
+        List<SceneAsynOperLog> list = sceneAsynOperLogService.list(new LambdaQueryWrapper<SceneAsynOperLog>().eq(SceneAsynOperLog::getNum, num));
+        if(CollUtil.isEmpty(list)){
+            return;
+        }
+        //删除数据库记录
+        List<Long> deleteIdList = list.parallelStream().map(item -> item.getId()).collect(Collectors.toList());
+        sceneAsynOperLogService.removeByIds(deleteIdList);
+
+        list.parallelStream().forEach(item -> {
+            if(StrUtil.isNotEmpty(item.getUrl())){
+                try {
+                    fYunFileServiceInterface.deleteFile(item.getUrl());
+                } catch (IOException e) {
+                    log.warn("删除oss全景图下载压缩包失败,key:{}", item.getUrl());
+                }
+            }
+        });
+    }
 }