From 06d3d15a5a08637041cc601101c063b11b07a346 Mon Sep 17 00:00:00 2001 From: net <net@netdeMBP.lan> Date: 星期五, 14 二月 2025 17:25:21 +0800 Subject: [PATCH] 合并理去杀杀人 --- zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 deletions(-) diff --git a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml index d64ec15..e06ddbe 100644 --- a/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml +++ b/zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zhitan.dataitem.mapper.DataItemMapper"> - <resultMap type="StagseDataEntry" id="stagseDataEntryResult"> + <resultMap type="com.zhitan.dataitem.domain.StagseDataEntry" id="stagseDataEntryResult"> <result property="code" column="code"/> <result property="name" column="name"/> <result property="indexId" column="index_id"/> @@ -15,7 +15,7 @@ <result property="dataTime" column="data_time"/> </resultMap> - <select id="getSettingIndex" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="getSettingIndex" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, @@ -33,7 +33,7 @@ and si.time_type = #{timeType} AND si.calc_type = #{calcType} </select> - <select id="getSettingEdit" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="getSettingEdit" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, code, @@ -54,7 +54,7 @@ AND data_time >= #{beginTime} AND data_time <= #{endTime} </select> - <select id="stagseDataByCode" parameterType="StagseDataEntry" resultMap="stagseDataEntryResult"> + <select id="stagseDataByCode" parameterType="com.zhitan.dataitem.domain.StagseDataEntry" resultMap="stagseDataEntryResult"> SELECT ei.index_id, code, @@ -199,4 +199,38 @@ AND di.data_time BETWEEN #{beginTime} AND #{endTime} AND di.time_type = #{timeType} </select> + + <select id="getDataItemHourInforByIndexIds" resultType="com.zhitan.realtimedata.domain.DataItem"> + SELECT + index_id indexId, + data_time dataTime, + "value" + FROM + "data_item" + WHERE + index_id IN + <foreach collection="indexIds" item="indexId" open="(" separator="," close=")"> + #{indexId} + </foreach> + AND ( begin_time BETWEEN #{beginTime} AND #{endTime} ) + AND time_type = #{timeType} + </select> + + <select id="getDataItemTimeRangeValueByNodeId" resultType="java.math.BigDecimal"> + SELECT + COALESCE (SUM ( "value" ), 0) + FROM + "data_item" di + JOIN energy_index ei ON di.index_id = ei.index_id + WHERE + di.index_id IN ( SELECT index_id FROM node_index WHERE node_id = #{nodeId}) + <if test="energyType !='' and energyType !=null and energyType =='allType'"> + AND ei.energy_id != '' + </if> + <if test="energyType !='' and energyType !=null and energyType !='allType'"> + AND ei.energy_id = #{energyType} + </if> + AND (di.data_time BETWEEN #{beginTime} AND #{endTime}) + AND di.time_type = #{timeType} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.3