From bddd6baa0b99ac55426541124ea5f9db9c1992aa Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期二, 11 二月 2025 17:12:28 +0800
Subject: [PATCH] 能流图调试
---
zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java | 5 ++++-
zhitan-system/src/main/java/com/zhitan/dataitem/service/impl/DataItemServiceImpl.java | 13 ++++++++++++-
2 files changed, 16 insertions(+), 2 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 2f95c17..27fb12a 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
@@ -1,5 +1,7 @@
package com.zhitan.dataitem.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhitan.common.enums.TimeType;
import com.zhitan.dataitem.domain.StagseDataEntry;
import com.zhitan.dataitem.domain.vo.NodeIndexValueVO;
@@ -149,7 +151,16 @@
public FlowChartsVO getFlowCharts(FlowChartsDTO dto) {
FlowChartsVO flowChartsVO = new FlowChartsVO();
// 鐖惰妭鐐筰d
- String nodeId = dto.getNodeId();
+ LambdaQueryWrapper<ModelNode> wrapper = Wrappers.<ModelNode>lambdaQuery()
+ .eq(ModelNode::getModelCode, dto.getModelCode())
+ .isNull(ModelNode::getParentId);
+ List<ModelNode> modelNodes = modelNodeMapper.selectList(wrapper);
+ if(ObjectUtils.isEmpty(modelNodes)){
+ throw new RuntimeException("鏈煡璇㈠埌妯″瀷淇℃伅");
+ }
+ Optional<ModelNode> modelNodeInfo = modelNodes.stream().findFirst();
+ String nodeId = modelNodeInfo.map(ModelNode::getNodeId).toString();
+ dto.setNodeId(nodeId);
String energyType = dto.getEnergyType();
LocalDate queryTime = dto.getQueryTime();
TimeType timeType = dto.getTimeType();
diff --git a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
index b9dc2f9..968c4d7 100644
--- a/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
+++ b/zhitan-system/src/main/java/com/zhitan/statisticalAnalysis/domain/dto/FlowChartsDTO.java
@@ -44,10 +44,13 @@
/**
* 鑺傜偣id
*/
- @NotBlank(message = "鑺傜偣id涓嶈兘涓虹┖")
@ApiModelProperty(value = "鑺傜偣id")
private String nodeId;
+ @NotBlank(message = "妯″瀷缂栫爜涓嶈兘涓虹┖")
+ @ApiModelProperty(value = "妯″瀷缂栫爜")
+ private String modelCode;
+
public TimeType getTimeType() {
if (ObjectUtils.isEmpty(timeType)) {
return TimeType.DAY;
--
Gitblit v1.9.3