|
|
|
@ -47,6 +47,7 @@ import java.io.File;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
|
import java.util.concurrent.locks.Lock;
|
|
|
|
|
import java.util.concurrent.locks.ReentrantLock;
|
|
|
|
@ -118,10 +119,12 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
saveClue(bathNo, byTaskName, taskId, tagList, responseList);
|
|
|
|
|
}
|
|
|
|
|
if (byTaskName.getType() == DefaultNumberConstants.TWO_NUMBER) {
|
|
|
|
|
downResource(bathNo, byTaskName, originalList, responseList);
|
|
|
|
|
// 异步方式下载
|
|
|
|
|
List<String> finalResponseList = responseList;
|
|
|
|
|
CompletableFuture.runAsync(() -> downResource(bathNo, byTaskName, originalList, finalResponseList));
|
|
|
|
|
}
|
|
|
|
|
if (byTaskName.getType() == DefaultNumberConstants.FOUR_NUMBER) {
|
|
|
|
|
downReceptionResource(bathNo, byTaskName, originalList);
|
|
|
|
|
CompletableFuture.runAsync(() -> downReceptionResource(bathNo, byTaskName, originalList));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 兑换结果失败也将结果返回
|
|
|
|
@ -220,7 +223,7 @@ public class DmpCallbackServiceImpl implements DmpCallbackService {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@SneakyThrows(value = ZipException.class)
|
|
|
|
|
private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List<List<String>> originalList) {
|
|
|
|
|
private void downReceptionResource(String bathNo, DeliveryRecord byTaskName, List<List<String>> originalList) {
|
|
|
|
|
String uuid = IdUtil.fastSimpleUUID();
|
|
|
|
|
String format = DateUtil.format(DateUtil.date(), DatePattern.NORM_DATE_PATTERN);
|
|
|
|
|
String file = deliveryProperties.getFileUrl().concat(StrPool.SLASH).concat(uuid);
|
|
|
|
|