From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/java/com/zhitan/model/mapper/ModelNodeMapper.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 9b6bb93..56b41e1 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
@@ -9,7 +9,7 @@
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;
@@ -138,7 +138,7 @@
* @param code
* @return
*/
- List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByCode(@Param("code") String code);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByCode(@Param("code") String code);
/**
* 鏍规嵁nodeId鏌ヨ瀵瑰簲璇︾粏淇℃伅
@@ -146,7 +146,7 @@
* @param nodeId
* @return
*/
- List<ModelNodeIndexInfor> getModelNodeIndexIdRelationInforByNodeId(@Param("nodeId") String nodeId);
+ List<ModelNodeIndexInfo> getModelNodeIndexIdRelationInforByNodeId(@Param("nodeId") String nodeId);
/**
* 鏍规嵁鐖秈d鏌ヨ璇︾粏淇℃伅
@@ -154,7 +154,7 @@
* @param parentId
* @return
*/
- List<ModelNodeIndexInfor> listModelNodeIndexIdRelationInforByParentId(@Param("parentId") String parentId);
+ List<ModelNodeIndexInfo> listModelNodeIndexIdRelationInforByParentId(@Param("parentId") String parentId);
/**
* 鏍规嵁code鏌ヨ鐖剁骇淇℃伅
@@ -171,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);
@@ -185,7 +185,7 @@
* @author: hmj
* @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鏌ヨ瀛愯妭鐐圭殑鎵�鏈夌粺璁℃寚鏍�
@@ -194,11 +194,11 @@
* @author: hmj
* @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鍜岃兘婧愮被鍨嬫煡璇㈢偣浣嶄笅鐨勭疮绉噺
--
Gitblit v1.9.3