From d7ac861cab28bc39f87c1af464ec4d319a0cbb37 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期二, 19 十一月 2024 15:46:15 +0800
Subject: [PATCH] test配置增加deploy.server属性，解决多网卡ip注册错误的问题
---
iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 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 d53ecb3..9371aa9 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
@@ -10,7 +10,6 @@
t1.point_name,
t1.point_type ,
t1.data_type,
- t1.value_type,
t1.unit,
t1.unittransfactor,
t1.default_value,
@@ -66,7 +65,72 @@
and t1.is_enable = #{params.isEnable}
</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">
+ select
+ t1.id,
+ t1.point_no,
+ t1.point_name,
+ t1.point_type ,
+ t1.data_type,
+ t1.unit,
+ t1.unittransfactor,
+ t1.default_value,
+ t1.max_value,
+ t1.min_value,
+ t1.minfreqid,
+ t1.remark,
+ t1.is_enable,
+ t1.creator,
+ t1.create_time,
+ t1.updater,
+ t1.update_time,
+ t2.source_type,
+ t3.source_name,
+ t2.tag_no,
+ t2.dimension,
+ t2.value_type
+ from t_da_point t1
+ left join t_da_measure_point t2 on t2.point_id = t1.id
+ left join (
+ select id source_id,server_name source_name
+ from t_channel_opcua_device
+ union
+ select id source_id, name source_name
+ from t_channel_modbus_device
+ union
+ select id source_id, code source_name
+ from t_http_api
+ union
+ select id source_id, instance_name source_name
+ from t_channel_kio_device
+ ) t3 on t3.source_id = t2.source_id
+ <where>
+ <if test="pointNo != null and pointNo != ''">
+ and t1.point_no like concat('%', #{pointNo}, '%')
+ </if>
+ <if test="pointName != null and pointName != ''">
+ and t1.point_name like concat('%', #{pointName}, '%')
+ </if>
+ <if test="pointType != null and pointType != ''">
+ and t1.point_type = #{pointType}
+ </if>
+ <if test="dataType != null and dataType != ''">
+ and t1.data_type = #{dataType}
+ </if>
+ <if test="sourceName != null and sourceName != ''">
+ and t3.source_name like concat('%', #{sourceName}, '%')
+ </if>
+ <if test="tagNo != null and tagNo != ''">
+ and t2.tag_no like concat('%', #{tagNo}, '%')
+ </if>
+ <if test="isEnable != null ">
+ and t1.is_enable = #{isEnable}
+ </if>
+ </where>
+ order by t1.create_time desc, t1.point_no desc
</select>
<select id="getConstantPoint" resultType="com.iailab.module.data.point.dto.DaPointDTO">
@@ -76,7 +140,8 @@
t1.default_value,
t1.point_type,
t1.store_type,
- t1.data_type
+ t1.data_type,
+ t1.minfreqid
FROM t_da_point t1
<where>
t1.point_type = #{pointType}
@@ -106,6 +171,7 @@
t1.unittransfactor,
t1.max_value,
t1.min_value,
+ t1.minfreqid,
t2.source_type,
t2.source_id,
t3.source_name,
@@ -146,6 +212,7 @@
</if>
</where>
</select>
+
<select id="getMathPoint" resultType="com.iailab.module.data.point.dto.DaPointDTO">
SELECT
t1.point_no,
@@ -154,6 +221,7 @@
t1.point_type,
t1.data_type,
t1.store_type,
+ t1.minfreqid,
t2.expression
FROM t_da_point t1
LEFT JOIN t_da_math_point t2 ON t2.point_id = t1.id
--
Gitblit v1.9.3