From 0571c03740d9069cf761695d0dcadd4d6bc9af0d Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 19 六月 2025 08:54:19 +0800
Subject: [PATCH] refactor(model): 优化模型相关功能和查询
---
zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
index ab63dde..f325529 100644
--- a/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/ModelNodeMapper.xml
@@ -309,7 +309,7 @@
ni.index_id indexId
FROM "model_node" mn
LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
- WHERE mn.parent_id = #{parentId}
+ WHERE mn.parent_id = #{parentId} or ni.node_id = #{parentId}
</select>
<select id="getModelNodeIndexIdRelationInforByNodeId"
@@ -385,7 +385,8 @@
mn."name" "name",
ni.index_id indexId,
ei.energy_id energyId,
- ei.index_type indexType
+ ei.index_type indexType,
+ ei.unit_id unitId
FROM "model_node" mn
LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
LEFT JOIN energy_index ei on ni.index_id = ei.index_id
@@ -465,4 +466,22 @@
AND di.data_time >= #{dateTimeMap.startTime}
AND di.data_time <= #{dateTimeMap.endTime}
</select>
+ <select id="getAllModelNodeIndexByAddress" resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
+ SELECT
+ mn.node_id nodeId,
+ mn.code nodeCode,
+ mn."name" nodeName,
+ ni.index_id indexId,
+ ei."name" indexName,
+ ei.index_type indexType,
+ mi.energy_type
+ FROM
+ "model_node" mn
+ LEFT JOIN "node_index" ni ON mn.node_id = ni.node_id
+ LEFT JOIN energy_index ei ON ni.index_id = ei.index_id
+ LEFT JOIN meter_implement mi ON mi."id" = ei.meter_id
+ WHERE
+ mn.model_code = #{modelCode}
+ AND mn.address LIKE concat( #{address} , '%' )
+ </select>
</mapper>
--
Gitblit v1.9.3