From d338b50afd6504a9676f0a26b3ecbcc844483e7c Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 21 十一月 2024 08:57:08 +0800
Subject: [PATCH] 并发采集

---
 iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml |    9 ++++++---
 1 files changed, 6 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 976c199..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
@@ -65,7 +65,7 @@
                 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">
@@ -130,7 +130,7 @@
                 and t1.is_enable = #{isEnable}
             </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">
@@ -140,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}
@@ -170,6 +171,7 @@
         t1.unittransfactor,
         t1.max_value,
         t1.min_value,
+        t1.minfreqid,
         t2.source_type,
         t2.source_id,
         t3.source_name,
@@ -219,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