From d6464955dc20cb527f7be02ac8631c1effb1768a Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 23 十二月 2024 16:12:11 +0800
Subject: [PATCH] 计算点查询问题修复
---
iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml b/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
index 2643637..4b08398 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
+++ b/iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml
@@ -26,9 +26,13 @@
t3.source_name,
t2.tag_no,
t2.dimension,
- t2.value_type
+ t2.value_type,
+ t6.collect_value,
+ t6.collect_quality,
+ t6.collect_time
from t_da_point t1
left join t_da_measure_point t2 on t2.point_id = t1.id
+ left join t_da_point_collect_status t6 on t6.point_no = t1.point_no
left join (
select id source_id,server_name source_name
from t_channel_opcua_device
@@ -64,8 +68,11 @@
<if test="params.isEnable != null ">
and t1.is_enable = #{params.isEnable}
</if>
+ <if test="params.collectQuality != null and params.collectQuality != ''">
+ and t6.collect_quality = #{params.collectQuality}
+ </if>
</where>
- order by t1.create_time desc
+ order by t1.create_time desc, t1.point_no desc
</select>
<select id="getList" resultType="com.iailab.module.data.point.dto.DaPointDTO">
@@ -91,9 +98,13 @@
t3.source_name,
t2.tag_no,
t2.dimension,
- t2.value_type
+ t2.value_type,
+ t6.collect_value,
+ t6.collect_quality,
+ t6.collect_time
from t_da_point t1
left join t_da_measure_point t2 on t2.point_id = t1.id
+ left join t_da_point_collect_status t6 on t6.point_no = t1.point_no
left join (
select id source_id,server_name source_name
from t_channel_opcua_device
@@ -129,8 +140,11 @@
<if test="isEnable != null ">
and t1.is_enable = #{isEnable}
</if>
+ <if test="collectQuality != null and collectQuality != ''">
+ and t6.collect_quality = #{collectQuality}
+ </if>
</where>
- order by t1.create_time desc
+ order by t1.create_time desc, t1.point_no desc
</select>
<select id="getConstantPoint" resultType="com.iailab.module.data.point.dto.DaPointDTO">
@@ -233,6 +247,43 @@
<if test="minfreqid != null and minfreqid != ''">
AND t1.minfreqid = #{minfreqid}
</if>
+ <if test="pointNos != null">
+ AND t1.point_no in
+ <foreach collection="pointNos" item="item" index="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ </where>
+ </select>
+
+ <select id="getCumulatePoint" resultType="com.iailab.module.data.point.dto.DaPointDTO">
+ SELECT
+ t1.point_no,
+ t1.point_name,
+ t1.default_value,
+ t1.point_type,
+ t1.data_type,
+ t1.store_type,
+ t1.minfreqid,
+ t2.moment_point,
+ t2.length,
+ t2.divisor
+ FROM t_da_point t1
+ LEFT JOIN t_da_cumulate_point t2 ON t2.point_id = t1.id
+ <where>
+ t1.point_type = #{pointType}
+ <if test="isEnable != null">
+ AND t1.is_enable = #{isEnable}
+ </if>
+ <if test="minfreqid != null and minfreqid != ''">
+ AND t1.minfreqid = #{minfreqid}
+ </if>
+ <if test="pointNos != null">
+ AND t1.point_no in
+ <foreach collection="pointNos" item="item" index="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</where>
</select>
--
Gitblit v1.9.3