From 16d77a440e12c3de262c48c79af5fc0494dd87b7 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 11 四月 2025 18:42:19 +0800
Subject: [PATCH] Merge pull request #52 from zhitan-cloud/zhangjw
---
zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java b/zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java
index 3df1018..320b453 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java
@@ -5,18 +5,21 @@
import com.zhitan.basicdata.domain.MeterImplement;
import com.zhitan.basicdata.domain.SysEnergy;
import com.zhitan.basicdata.domain.SysProduct;
+import com.zhitan.common.enums.TimeType;
+import com.zhitan.dataitem.domain.vo.NodeIndexValueVO;
import com.zhitan.model.domain.EnergyIndex;
import com.zhitan.model.domain.ModelNode;
-import com.zhitan.model.domain.vo.ModelNodeIndexInfor;
+import com.zhitan.model.domain.vo.ModelNodeIndexInfo;
import org.apache.ibatis.annotations.Param;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/**
* 妯″瀷鑺傜偣Mapper鎺ュ彛
*
- * @author fanxinfu
+ * @author ZhiTan
* @date 2020-02-10
*/
public interface ModelNodeMapper extends BaseMapper<ModelNode> {
@@ -135,7 +138,7 @@
* @param code
* @return
*/
- List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByCode(@Param("code") String code);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByCode(@Param("code") String code);
/**
* 鏍规嵁nodeId鏌ヨ瀵瑰簲璇︾粏淇℃伅
@@ -143,7 +146,7 @@
* @param nodeId
* @return
*/
- List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByNodeId(@Param("nodeId") String nodeId);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByNodeId(@Param("nodeId") String nodeId);
/**
* 鏍规嵁鐖秈d鏌ヨ璇︾粏淇℃伅
@@ -151,7 +154,7 @@
* @param parentId
* @return
*/
- List<ModelNodeIndexInfor> listModelNodeIndexIdRelationInforByParentId(@Param("parentId") String parentId);
+ List<ModelNodeIndexInfo> listModelNodeIndexIdRelationInforByParentId(@Param("parentId") String parentId);
/**
* 鏍规嵁code鏌ヨ鐖剁骇淇℃伅
@@ -168,7 +171,7 @@
* @param nodeId 鑺傜偣id
* @return 缁撴灉
*/
- List<ModelNodeIndexInfor> selectIndexByModelCodeAndNodeId(@Param("modelCode") String modelCode, @Param("nodeId") String nodeId);
+ List<ModelNodeIndexInfo> selectIndexByModelCodeAndNodeId(@Param("modelCode") String modelCode, @Param("nodeId") String nodeId);
void delIndexNodeIdAndIndexType(@Param("nodeId")String nodeId, @Param("indexType")String indexType);
@@ -179,21 +182,37 @@
/**
* @description: 鏍规嵁鑺傜偣id鍜岃兘婧愮被鍨嬫煡璇㈢偣浣嶄俊鎭�
* @param nodeId
- * @author: hmj
+ * @author ZhiTan
* @date: 2024/10/16 19:16
*/
- List<ModelNodeIndexInfor> getModelNodeIndexIdByNodeId(@Param("nodeId")String nodeId, @Param("energyType")String energyType);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdByNodeId(@Param("nodeId")String nodeId, @Param("energyType")String energyType);
/**
* @description: 鏍规嵁nodeId鏌ヨ瀛愯妭鐐圭殑鎵�鏈夌粺璁℃寚鏍�
* @param parentId
* @return java.util.List<com.zhitan.model.domain.vo.ModelNodeIndexInfor>
- * @author: hmj
+ * @author ZhiTan
* @date: 2024/10/18 16:12
*/
- List<ModelNodeIndexInfor> getModelNodeByParentId(String parentId);
+ List<ModelNodeIndexInfo> getModelNodeByParentId(String parentId);
ModelNode getFirstModeNodeInfo(String modelCode);
- List<ModelNodeIndexInfor> selectIndexByNodeIds(@Param("modelCode") String modelCode,@Param("nodeIds") List<String> nodeIds);
+ List<ModelNodeIndexInfo> selectIndexByNodeIds(@Param("modelCode") String modelCode, @Param("nodeIds") List<String> nodeIds);
+
+ /**
+ * 鏍规嵁鐖惰妭鐐筰d鍜岃兘婧愮被鍨嬫煡璇㈢偣浣嶄笅鐨勭疮绉噺
+ */
+ List<NodeIndexValueVO> getDataItemByParentNodeId(@Param("parentId") String parentId,
+ @Param("energyType") String energyType,
+ @Param("timeType") TimeType timeType,
+ @Param("dateTimeMap") Map<String, LocalDateTime> dateTimeMap);
+
+ /**
+ * 鏍规嵁鑺傜偣id鍜岃兘婧愮被鍨嬫煡璇㈢偣浣嶄笅鐨勭疮绉噺
+ */
+ List<NodeIndexValueVO> getDataItemByNodeId(@Param("nodeId") String nodeId,
+ @Param("energyType") String energyType,
+ @Param("timeType") TimeType timeType,
+ @Param("dateTimeMap") Map<String, LocalDateTime> dateTimeMap);
}
--
Gitblit v1.9.3