From 31e16712da634bb06a4788e7419ce4884f769d62 Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:11:58 +0800
Subject: [PATCH] 分项用能分析
---
zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java | 1 -
zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java | 6 ++++--
zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java | 10 +++++-----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java
index c4e0ddc..886880f 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/itemizedenergyanalysis/ItemizedEnergyAnalysisController.java
@@ -10,7 +10,6 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
import static com.zhitan.common.core.domain.AjaxResult.success;
/**
diff --git a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
index e9d2514..6b8fb0d 100644
--- a/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/Itemizedenergyanalysis/service/impl/ItemizedEnergyAnalysisServiceImpl.java
@@ -12,7 +12,7 @@
import com.zhitan.common.utils.DateTimeUtil;
import com.zhitan.common.utils.PropUtils;
import com.zhitan.dataitem.service.IDataItemService;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import com.zhitan.model.mapper.ModelNodeMapper;
import com.zhitan.realtimedata.domain.DataItem;
import lombok.AllArgsConstructor;
@@ -29,7 +29,7 @@
* 鍒嗛」鐢ㄨ兘鍒嗘瀽
*
* @author sys
- * @date 2021-01-11
+ * @date 2025-03-25
*/
@Service
@AllArgsConstructor
@@ -53,14 +53,14 @@
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 ItemizedEnergyAnalysisVO();
}
- ModelNodeIndexInfor info = nodeIndexInfo.stream().findFirst().get();
+ ModelNodeIndexInfo info = nodeIndexInfo.stream().findFirst().get();
// 鏍规嵁鏃堕棿绫诲瀷璋冩暣鏃堕棿鑼冨洿
switch (dto.getTimeType()) {
diff --git a/zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java b/zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java
index a99de97..cd2b19c 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/domain/vo/ModelNodeIndexInfo.java
@@ -38,7 +38,6 @@
* 鍚嶇О
*/
private String nodeName;
-
/**
* 鐐逛綅id
*/
@@ -60,5 +59,8 @@
* 鐐逛綅绫诲瀷
*/
private String indexType;
-
+ /**
+ * 鍗曚綅
+ */
+ private String unitId;
}
--
Gitblit v1.9.3