Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

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

@@ -88,12 +88,12 @@ public class UploadShootingServiceImpl implements UploadShootingService {
         }
         String uuid = details.getUuid();
 
-        boolean lock = redisLockUtil.lock("lock:uploadshooting:upload:uuid:" + uuid, uuid, 1);
+        boolean lock = redisLockUtil.lock("lock:uploadshooting:upload:uuid:" + uuid+ ":index:" + details.getIndex(), uuid, 1);
         if (!lock) {//如果拿不到锁，证明
             Thread.sleep(2000L);
         }
 
-        String batchId = redisUtil.get("uploadshooting:upload:uuid:" + uuid);
+        String batchId = redisUtil.get("uploadshooting:upload:uuid:" + uuid + ":index:" + details.getIndex());
         if (StrUtil.isEmpty(batchId)) {
             OrigFileUploadBatch condition = new OrigFileUploadBatch();
             condition.setUuid(uuid);
@@ -102,10 +102,10 @@ public class UploadShootingServiceImpl implements UploadShootingService {
             condition.setCallType(2);
             OrigFileUploadBatch origFileUploadBatch = origFileUploadBatchService.getByCondition(condition);
             if (Objects.isNull(origFileUploadBatch)) {
-                batchId = redisUtil.get("uploadshooting:upload:uuid:" + uuid);
+                batchId = redisUtil.get("uploadshooting:upload:uuid:" + uuid + ":index:" + details.getIndex());
                 if (StrUtil.isEmpty(batchId)) {
                     batchId = UUID.fastUUID().toString().replace("-", "");
-                    redisUtil.set("uploadshooting:upload:uuid:" + uuid, batchId);
+                    redisUtil.set("uploadshooting:upload:uuid:" + uuid+ ":index:" + details.getIndex(), batchId);
                     origFileUploadBatch = new OrigFileUploadBatch();
                     origFileUploadBatch.setUuid(uuid);
                     origFileUploadBatch.setBatchId(batchId);
@@ -124,7 +124,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
         origFileUploadService.save(origFileUpload);
 
         if (lock) {
-            redisLockUtil.unlockLua("lock:single:upload:uuid:" + uuid, uuid);
+            redisLockUtil.unlockLua("lock:single:upload:uuid:" + uuid + ":index:" + details.getIndex(), uuid);
         }
 
     }