From e8401b85ea303e7cb87062dfa918cb59071befb3 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 18 四月 2025 12:40:02 +0800
Subject: [PATCH] 报警代码优化

---
 zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
index 279d42f..1145863 100644
--- a/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
+++ b/zhitan-system/src/main/resources/mapper/model/EnergyIndexMapper.xml
@@ -4,7 +4,7 @@
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhitan.model.mapper.EnergyIndexMapper">
 
-  <resultMap type="EnergyIndex" id="EnergyIndexResult">
+  <resultMap type="com.zhitan.model.domain.EnergyIndex" id="EnergyIndexResult">
     <result property="indexId" column="index_id"/>
     <result property="name" column="name"/>
     <result property="code" column="code"/>
@@ -34,7 +34,7 @@
     from energy_index
   </sql>
 
-  <select id="selectEnergyIndexList" parameterType="EnergyIndex" resultMap="EnergyIndexResult">
+  <select id="selectEnergyIndexList" parameterType="com.zhitan.model.domain.EnergyIndex" 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
     <where>
@@ -59,7 +59,7 @@
     <include refid="selectEnergyIndexVo"/>
     where
         index_id IN
-        <foreach collection="list" item="indexId" open="(" separator="," close=")">
+        <foreach collection="indexIds" item="indexId" open="(" separator="," close=")">
           #{indexId}
         </foreach>
   </select>
@@ -145,7 +145,7 @@
     order by ei.order_num
   </select>
 
-  <insert id="insertEnergyIndex" parameterType="EnergyIndex">
+  <insert id="insertEnergyIndex" parameterType="com.zhitan.model.domain.EnergyIndex">
     insert into energy_index
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="indexId != null  and indexId != ''">index_id,</if>
@@ -271,7 +271,7 @@
     </foreach>
   </insert>
 
-  <update id="updateEnergyIndex" parameterType="EnergyIndex">
+  <update id="updateEnergyIndex" parameterType="com.zhitan.model.domain.EnergyIndex">
     update energy_index
     <trim prefix="SET" suffixOverrides=",">
       <if test="name != null  and name != ''">name = #{name},</if>
@@ -408,4 +408,23 @@
         </if>
     </where>
   </select>
+    <select id="getModelNodeIndexInfoListByIndexIds"
+            resultType="com.zhitan.model.domain.vo.ModelNodeIndexInfo">
+        SELECT 	mi.model_name modelName,
+          mi.model_code,
+          mn."name" "name",
+          ei.index_id,
+          ei.code indexCode,
+          ei."name" indexName,
+          ei.energy_id,
+          ei.energy_id
+        FROM node_index ni
+        INNER JOIN energy_index ei ON ni.index_id = ei.index_id
+        LEFT JOIN model_node mn ON ni.node_id = mn.node_id
+        LEFT JOIN model_info mi ON mn.model_code = mi.model_code
+        WHERE ei.index_id IN
+        <foreach collection="indexIds" item="indexId" open="(" separator="," close=")">
+            #{indexId}
+        </foreach>
+    </select>
 </mapper>

--
Gitblit v1.9.3