浏览代码

修改计算结果处理逻辑

tianboguang 2 年之前
父节点
当前提交
f3c5caf75c

+ 0 - 9
src/main/java/com/fdkankan/contro/service/impl/BuildScenePreServiceImpl.java

@@ -67,15 +67,6 @@ public class BuildScenePreServiceImpl implements IBuildScenePreService {
     public void buildScenePre(BuildSceneCallMessage message) {
         boolean success = false;
         try {
-            String key = String.format(RedisKey.SCENE_BUILDING, message.getSceneNum());
-            Long building = redisUtil.incr(key, 1);
-            if (building.compareTo(1L) != 0) {
-                log.info("场景正在构建中,退出构建,参数:{}", JSONObject.toJSONString(message));
-                return;
-            } else {
-                redisUtil.expire(key, Duration.of(modelTimeOut, ChronoUnit.HOURS));
-            }
-
             //根据相机类型,组装资源路径
             String path = SceneUtil.getPath(message.getPath(), message.getCameraName(),
                 message.getFileId(), Integer.parseInt(message.getCameraType()), message.getUnicode());

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

@@ -1093,6 +1093,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(Objects.isNull(scenePlus)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
+        if(scenePlus.getSceneStatus() == 0){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5033);
+        }
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         String path = scenePlusExt.getDataSource();
         Integer sceneSource = scenePlus.getSceneSource();