summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfangshunjian <[email protected]>2022-10-10 13:51:06 +0800
committerfangshunjian <[email protected]>2022-10-10 13:51:06 +0800
commiteeb63e55f6aa2f69ecbe6483fb31e47bf9a268b0 (patch)
treef96c4c838b65574c99b4a68c51b8c527bf246097
parentfed3de1da5d6e4abdeef4a7343f5a8968923a9d4 (diff)
fix: 修改 dashboard snapshot 查询超时时间
-rw-r--r--nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
index 995bd86b..ec24fb75 100644
--- a/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/panel/service/impl/VisualPanelServiceImpl.java
@@ -86,8 +86,11 @@ import cn.hutool.log.Log;
public class VisualPanelServiceImpl extends ServiceImpl<VisualPanelDao, VisualPanel> implements VisualPanelService {
private Log log = Log.get();
- @Value("${connect.timeout:30000}")
- private Integer connectTimeout;
+ /**
+ * dashboard snapshot 查询超时时间,单位:ms
+ */
+ @Value("${dashboard.snapshot.timeout:300000}")
+ private Integer timeout;
@Autowired
private VisualChartService visualChartService;
@@ -703,8 +706,7 @@ public class VisualPanelServiceImpl extends ServiceImpl<VisualPanelDao, VisualPa
List<CompletableFuture<Map>> futureList = this.recursionChartsData(chartsList, resultMap, varList);
try {
Map chartsDataMap = new HashMap();
- CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0])).get(connectTimeout,
- TimeUnit.MILLISECONDS);
+ CompletableFuture.allOf(futureList.toArray(new CompletableFuture[0])).get(timeout,TimeUnit.MILLISECONDS);
futureList.forEach(future -> {
Map<String, Object> result = future.getNow(null);
if (Tool.MapUtil.isNotEmpty(result)) {