|
|
@@ -54,6 +54,8 @@ import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
+import java.util.concurrent.ExecutorService;
|
|
|
+import java.util.concurrent.Executors;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -176,7 +178,9 @@ public class ConvergeServiceImpl implements ConvergeService {
|
|
|
fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "汇交任务创建", "info");
|
|
|
fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "汇交数据执行开始。。。", "info");
|
|
|
long startTime = System.currentTimeMillis();
|
|
|
- //这里进行数据汇交
|
|
|
+
|
|
|
+ //这里进行数据汇交(异步执行)
|
|
|
+ ExecutorService executor = Executors.newSingleThreadExecutor();
|
|
|
CompletableFuture<Object> future = CompletableFuture.supplyAsync(()-> {
|
|
|
//-----------------------------------
|
|
|
List<ConvergeRes> convergeTableList = new ArrayList<>();
|
|
|
@@ -247,13 +251,6 @@ public class ConvergeServiceImpl implements ConvergeService {
|
|
|
throw new ServiceException("汇交失败,数据错误"+e);
|
|
|
}
|
|
|
|
|
|
- }
|
|
|
- //-----------------------------------
|
|
|
- return null;
|
|
|
- });
|
|
|
-
|
|
|
- future.handle((v,e)->{
|
|
|
- log.info("汇交异步方法执行msg:{}",e.getMessage());
|
|
|
//更新状态
|
|
|
ConvergeUpdateVo updateVo = new ConvergeUpdateVo();
|
|
|
updateVo.setId(convergeId);
|
|
|
@@ -263,9 +260,10 @@ public class ConvergeServiceImpl implements ConvergeService {
|
|
|
updateVo.setReadMessage("创建成功");
|
|
|
convergeMapper.update(updateVo);
|
|
|
fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "汇交数据文件创建成功。", "info");
|
|
|
- log.info("汇交异步方法执行result:{}",v);
|
|
|
- return v;
|
|
|
- });
|
|
|
+ }
|
|
|
+ return "success";
|
|
|
+ },executor);
|
|
|
+ executor.shutdown();
|
|
|
}
|
|
|
|
|
|
|