From 195a89f78b78503aa13732799d342719310051b3 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 21 Nov 2023 18:17:20 +0800
Subject: [PATCH] 水位库容曲线填报
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
index 5f1df48..4ede815 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResBaseServiceImpl.java
@@ -243,6 +243,7 @@
CompletableFuture<List<Map<String,Object>>> tbAttResWaterBlock = getTbInfo("tb_att_res_water_block",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbAttResWaterDelivery = getTbInfo("tb_att_res_water_delivery",resGuid,executor);
CompletableFuture<List<Map<String,Object>>> tbFileStorageLocation = getTbInfo("tb_file_storage_location",resGuid,executor);
+ CompletableFuture<List<Map<String,Object>>> tbResStagCapDisc = getTbInfo("tb_res_stag_cap_disc",resGuid,executor);
//等待所有任务执行完成
try {
CompletableFuture.allOf(
@@ -259,7 +260,9 @@
tbAttResSafetyMonitor,
tbAttResStagChar,
tbAttResWaterBlock,
- tbAttResWaterDelivery).get();
+ tbAttResWaterDelivery,
+ tbResStagCapDisc
+ ).get();
// 数据处理
list.addAll(tbAttResBaseInfo.get());
list.addAll(tbAttResEngBene.get());
@@ -275,6 +278,7 @@
list.addAll(tbAttResWaterBlock.get());
list.addAll(tbAttResWaterDelivery.get());
list.addAll(tbFileStorageLocation.get());
+ list.addAll(tbResStagCapDisc.get());
} catch (InterruptedException e) {
e.printStackTrace();
} catch (ExecutionException e) {
--
Gitblit v1.9.3