|
|
@@ -53,6 +53,7 @@ import java.nio.file.Files;
|
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
|
import java.util.*;
|
|
|
+import java.util.concurrent.CompletableFuture;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -240,21 +241,36 @@ public class ConvergeServiceImpl implements ConvergeService {
|
|
|
|
|
|
fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "数据已完成目录构建。。。。", "info");
|
|
|
//这里进行数据汇交
|
|
|
- try {
|
|
|
- operationFileStrategy(convergeTableList);
|
|
|
- } catch (Exception e) {
|
|
|
- throw new ServiceException("汇交失败,数据错误"+e);
|
|
|
- }
|
|
|
+ CompletableFuture<Object> future =
|
|
|
+ CompletableFuture.supplyAsync(()-> {
|
|
|
+ try {
|
|
|
+ operationFileStrategy(convergeTableList);
|
|
|
+ } catch (Exception e) {
|
|
|
+ throw new ServiceException("汇交失败,数据错误"+e);
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ });
|
|
|
+ future.handle((v,e)->{
|
|
|
+ log.info("汇交异步方法执行msg:{}",e.getMessage());
|
|
|
+ //更新状态
|
|
|
+ ConvergeUpdateVo updateVo = new ConvergeUpdateVo();
|
|
|
+ updateVo.setId(convergeId);
|
|
|
+ updateVo.setFilePath(convergedir + converge.getName());
|
|
|
+ updateVo.setFileCostTime(String.valueOf((System.currentTimeMillis()-startTime)/1000));
|
|
|
+ updateVo.setStatus("1");
|
|
|
+ updateVo.setReadMessage("创建成功");
|
|
|
+ convergeMapper.update(updateVo);
|
|
|
+ fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "汇交数据文件创建成功。", "info");
|
|
|
+ log.info("汇交异步方法执行result:{}",v);
|
|
|
+ return v;
|
|
|
+ });
|
|
|
+
|
|
|
+// try {
|
|
|
+// operationFileStrategy(convergeTableList);
|
|
|
+// } catch (Exception e) {
|
|
|
+// throw new ServiceException("汇交失败,数据错误"+e);
|
|
|
+// }
|
|
|
|
|
|
- //更新状态
|
|
|
- ConvergeUpdateVo updateVo = new ConvergeUpdateVo();
|
|
|
- updateVo.setId(convergeId);
|
|
|
- updateVo.setFilePath(convergedir + converge.getName());
|
|
|
- updateVo.setFileCostTime(String.valueOf((System.currentTimeMillis()-startTime)/1000));
|
|
|
- updateVo.setStatus("1");
|
|
|
- updateVo.setReadMessage("创建成功");
|
|
|
- convergeMapper.update(updateVo);
|
|
|
- fzssFxrwrzHandleService.insertFxrwrz(convergeId, "地籍库管理", "汇交数据文件创建成功。", "info");
|
|
|
}
|
|
|
}
|
|
|
|