From 47691c3e41d367c757f57fff50f201476454e7b6 Mon Sep 17 00:00:00 2001 From: letsgocoding <sdxt_0802@163.com> Date: 星期四, 13 二月 2025 11:56:01 +0800 Subject: [PATCH] !69 成本趋势分析/分时能耗消耗页面接口。 Merge pull request !69 from 潘晓明/pxm_from_develop1.0 --- zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java index 27fb12a..2256b65 100644 --- a/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java @@ -158,18 +158,13 @@ if(ObjectUtils.isEmpty(modelNodes)){ throw new RuntimeException("鏈煡璇㈠埌妯″瀷淇℃伅"); } - Optional<ModelNode> modelNodeInfo = modelNodes.stream().findFirst(); - String nodeId = modelNodeInfo.map(ModelNode::getNodeId).toString(); + ModelNode modelNode = modelNodes.stream().findFirst().get(); + String nodeId = modelNode.getNodeId(); dto.setNodeId(nodeId); String energyType = dto.getEnergyType(); LocalDate queryTime = dto.getQueryTime(); TimeType timeType = dto.getTimeType(); - // 鑾峰彇鑺傜偣淇℃伅 - ModelNode modelNode = modelNodeMapper.selectModelNodeById(nodeId); - if (ObjectUtils.isEmpty(modelNode)) { - return flowChartsVO; - } // 鑾峰彇鏌ヨ鏃堕棿 Map<String, LocalDateTime> dateTimeMap = getDataItemByIndexId(timeType, queryTime); -- Gitblit v1.9.3