Browse Source

增加计算进度通知

dsx 2 years ago
parent
commit
98024b1b30

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

@@ -112,6 +112,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             //下载资源到本地
             //下载资源到本地
             this.downLoadSource(message, message.getPath());
             this.downLoadSource(message, message.getPath());
 
 
+            //删除project.json文件
+            FileUtil.del(message.getPath().concat(File.separator).concat("project.json"));
+
             if (!ObjectUtils.isEmpty(modelType)) {
             if (!ObjectUtils.isEmpty(modelType)) {
                 // 修改dataFdage文件
                 // 修改dataFdage文件
                 JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
                 JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
@@ -271,7 +274,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
             params.put("title", scenePlus.getTitle());
             params.put("title", scenePlus.getTitle());
             params.put("customUserId", ext.get("customUserId"));
             params.put("customUserId", ext.get("customUserId"));
             params.put("gps", ext.get("gps"));
             params.put("gps", ext.get("gps"));
-            params.put("totalTime", Integer.valueOf(redisUtil.get(String.format(RedisKey.SCENE_BUILD_EXPECT_TOTAL_TIME_NUM,sceneCode))));
+            params.put("totalTime", Integer.valueOf(redisUtil.get(String.format(RedisKey.SCENE_BUILD_EXPECT_TOTAL_TIME_NUM, sceneCode))));
             params.put("progress", 100);
             params.put("progress", 100);
             HttpUtil.post(buildProgressUrl, JSON.toJSONString(params), 2000);
             HttpUtil.post(buildProgressUrl, JSON.toJSONString(params), 2000);
 
 

+ 2 - 1
src/main/java/com/fdkankan/contro/service/impl/Scene3dNumServiceImpl.java

@@ -2,6 +2,7 @@ package com.fdkankan.contro.service.impl;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ErrorCode;
@@ -74,7 +75,7 @@ public class Scene3dNumServiceImpl extends ServiceImpl<IScene3dNumMapper, Scene3
                     CompletableFuture.runAsync(() -> batchCreateSceneNum(false));
                     CompletableFuture.runAsync(() -> batchCreateSceneNum(false));
                 }
                 }
                 redisUtil.lRightPushAll(RedisKey.FDKANKAN_SCENE_NUMS, nums);
                 redisUtil.lRightPushAll(RedisKey.FDKANKAN_SCENE_NUMS, nums);
-                this.update(new LambdaQueryWrapper<Scene3dNum>().in(Scene3dNum::getCode, nums));
+                this.update(new LambdaUpdateWrapper<Scene3dNum>().set(Scene3dNum::getUsed, CommonStatus.YES.code()).in(Scene3dNum::getCode, nums));
 //                this.updateUsedStatus(nums);
 //                this.updateUsedStatus(nums);
                 log.info("场景码加载缓存完成");
                 log.info("场景码加载缓存完成");
             } catch (Exception e) {
             } catch (Exception e) {

+ 1 - 0
src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1147,6 +1147,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         }
         mqMessage.getExt().put("deleteExtras", true);
         mqMessage.getExt().put("deleteExtras", true);
         mqMessage.getExt().put("customUserId", customUserId);
         mqMessage.getExt().put("customUserId", customUserId);
+        mqMessage.getExt().put("gps", jsonObject.getString("gps"));
         rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
         rabbitMqProducer.sendByWorkQueue(queueModelingPre, mqMessage);
 
 
         return scenePlusVO;
         return scenePlusVO;