From 34bc36c653c4809722ba4b561097aa320036612f Mon Sep 17 00:00:00 2001
From: zt916916 <1903964620@qq.com>
Date: 星期三, 26 三月 2025 17:22:45 +0800
Subject: [PATCH] 支路用能分析优化
---
zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
index 82f5062..73859cb 100644
--- a/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/branchanalysis/service/impl/BranchAnalysisServiceImpl.java
@@ -10,6 +10,7 @@
import com.zhitan.branchanalysis.service.IBranchAnalysisService;
import com.zhitan.common.utils.PropUtils;
import com.zhitan.dataitem.mapper.DataItemMapper;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
import com.zhitan.model.mapper.ModelNodeMapper;
import com.zhitan.realtimedata.domain.DataItem;
@@ -38,17 +39,17 @@
public BranchAnalysisVO getBranchAnalysisService(BranchAnalysisDTO dto) {
String timeType = dto.getTimeType();
String dataTime = dto.getDataTime();
- Date beginTime = DateTimeUtil.getTypeTime(timeType, dataTime);
+ Date beginTime = DateTimeUtil.getTime(timeType, dataTime);
DateTime endTime = null;
- List<ModelNodeIndexInfor> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
- List<String> indexlist = nodeIndexInfo.stream().map(ModelNodeIndexInfor::getIndexId).collect(Collectors.toList());
+ List<ModelNodeIndexInfo> nodeIndexInfo = modelNodeMapper.getModelNodeIndexIdByNodeId(dto.getNodeId(), dto.getEnergyType());
+ List<String> indexlist = nodeIndexInfo.stream().map(ModelNodeIndexInfo::getIndexId).collect(Collectors.toList());
if (ObjectUtil.isEmpty(indexlist)) {
return new BranchAnalysisVO();
}
- ModelNodeIndexInfor info = nodeIndexInfo.stream().findFirst().get();
+ ModelNodeIndexInfo info = nodeIndexInfo.stream().findFirst().get();
//鏍规嵁鏃堕棿绫诲瀷璋冩暣鏃堕棿鑼冨洿
switch (dto.getTimeType()) {
@@ -67,7 +68,7 @@
default:
throw new ServiceException("鏃堕棿鏍煎紡閿欒");
}
- //鑾峰彇鏁版嵁椤瑰垪琛�
+
List<DataItem> dataItemlist = dataItemMapper.getDataItemTimeRangeInforByIndexIds(beginTime, endTime, timeType, indexlist);
BranchAnalysisVO vo = new BranchAnalysisVO();
--
Gitblit v1.9.3