111

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -2255,8 +2255,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //查询是否有等待通知计算的上传批次记录，如果有则加入，没有则新增
 
         boolean lock = redisLockUtil.lock("single:upload:uuid:" + uuid, uuid, 1);
-        if(!lock){
-            throw new BusinessException(ErrorCode.SYSTEM_BUSY);
+        if(!lock){//如果拿不到锁，证明
+            Thread.sleep(2000L);
         }
 
         OrigFileUploadBatch condition = new OrigFileUploadBatch();
@@ -2277,7 +2277,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         origFileUpload.setBatchId(origFileUploadBatch.getBatchId());
         origFileUploadService.save(origFileUpload);
 
-        redisLockUtil.unlockLua("single:upload:uuid:" + uuid, uuid);
+        if(lock){
+            redisLockUtil.unlockLua("single:upload:uuid:" + uuid, uuid);
+        }
 
         if(fileName.equals("config.json")){
             HttpUtil.downloadFile(filePath, sendCallAlgorithmPath.concat(uuid).concat("/config.json"));