|
@@ -15,7 +15,6 @@ import com.qmth.distributed.print.common.contant.SystemConstant;
|
|
|
import com.qmth.distributed.print.common.util.Result;
|
|
|
import com.qmth.distributed.print.common.util.ResultUtil;
|
|
|
import org.apache.commons.io.FileUtils;
|
|
|
-import org.apache.velocity.runtime.directive.contrib.For;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
@@ -28,6 +27,7 @@ import java.util.Date;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.StringJoiner;
|
|
|
+import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
|
|
/**
|
|
|
* @Description: 异步导入模版
|
|
@@ -140,6 +140,10 @@ public abstract class AsyncImportTaskTemplete {
|
|
|
stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), EXCEPTION_CREATE_TXT_TITLE, EXCEPTION_DATA, e.getMessage()));
|
|
|
tbTask.setSummary(stringJoinerSummary.toString());
|
|
|
tbTask.setResult(TaskResultEnum.ERROR);
|
|
|
+ TBTask dbTask = tbTaskService.getById(tbTask.getId());
|
|
|
+ if (tbTask.getVersion() == dbTask.getVersion()) {
|
|
|
+ tbTask.setResetCount(new AtomicInteger(tbTask.getResetCount()).incrementAndGet());
|
|
|
+ }
|
|
|
if (e instanceof ApiException) {
|
|
|
ResultUtil.error((ApiException) e, e.getMessage());
|
|
|
} else {
|