|
@@ -339,20 +339,26 @@ public class WmTaskControllerV2 {
|
|
|
}
|
|
|
|
|
|
// 设置执行锁
|
|
|
+ int lockTime = 60 * 60 * 24;
|
|
|
redisTemplate.opsForValue().multiSet(lockKeys);
|
|
|
redisTemplate.executePipelined(
|
|
|
(RedisCallback<Object>)
|
|
|
connection -> {
|
|
|
- lockKeys.forEach((k, v) -> connection.expire(k.getBytes(), 600));
|
|
|
+ lockKeys.forEach((k, v) -> connection.expire(k.getBytes(), lockTime));
|
|
|
return null;
|
|
|
});
|
|
|
|
|
|
// 发起审核
|
|
|
try {
|
|
|
taskManager.doBatchCheck(checkReq, user);
|
|
|
- } finally {
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error(e.getMessage(), e);
|
|
|
redisTemplate.delete(lockKeys.keySet());
|
|
|
}
|
|
|
+// finally {
|
|
|
+// 不论审核结果如何都不删除锁了
|
|
|
+// redisTemplate.delete(lockKeys.keySet());
|
|
|
+// }
|
|
|
|
|
|
return ok(Boolean.TRUE);
|
|
|
}
|