From 5fd51c437819f1c9d027a936db4ba2ee7cd2e053 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期二, 07 一月 2025 15:02:58 +0800
Subject: [PATCH] 升级架构
---
zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
index d38240b..3ea43ac 100644
--- a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
@@ -184,7 +184,7 @@
<if test="energyId != null">#{energyId},
</if>
</trim>
-
+
</insert>
<insert id="insertNodeIndex">
insert into node_index (node_id, index_id) values (#{nodeId}, #{indexId});
@@ -331,7 +331,7 @@
and ei.meter_id = me.id
order by ei.order_num
</select>
-
+
<select id="selectEnergyIndexPage" resultMap="EnergyIndexResult">
select ni.index_id, name, code, index_type, remark, unit_id, index_category
from energy_index ei left join node_index ni on ei.index_id = ni.index_id
@@ -346,7 +346,7 @@
</if>
</where>
order by ei.order_num
-
+
</select>
<select id="listIndexByMeterIds" resultType="com.zhitan.model.domain.EnergyIndex">
select ei.index_id,
@@ -363,7 +363,7 @@
from energy_index ei
left join node_index ni on ei.index_id = ni.index_id
<where>
-
+
<if test="nodeId != null and nodeId != ''">and ni.node_id = #{nodeId}</if>
<if test="meterIds != null">
and ei.meter_id in
@@ -377,4 +377,18 @@
<include refid="selectEnergyIndexVo"/>
where code = #{cdoe}
</select>
+ <select id="getIndexByCode" resultType="com.zhitan.model.domain.EnergyIndex">
+ SELECT ei.code,mi.meter_name||'_'||ei.name as name from energy_index ei
+ LEFT JOIN node_device nd on ei.meter_id = nd.device_id
+ LEFT JOIN meter_implement mi on mi."id" = nd.device_id
+ <where>
+ <if test="nodeId != null and nodeId != ''">and nd.node_id = #{nodeId}</if>
+ <if test="code != null and code != ''">
+ and (mi.meter_name like concat('%', #{code}, '%')
+ or ei.code like concat('%', #{code}, '%')
+ or ei.name like concat('%', #{code}, '%')
+ )
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3