From 8babd61414ff62e4f8379bdf54e7a7d9c3b9b70b Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期一, 10 二月 2025 10:21:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo
---
zhitan-system/src/main/resources/mapper/dataitem/DataItemMapper.xml | 24 ++++++++++++++++++++----
1 files changed, 20 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..37b928f 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,20 @@
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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3