From 6a020a8c15b4b04467e90c4ba4773c8c2faa51a8 Mon Sep 17 00:00:00 2001 From: dengzedong <dengzedong@email> Date: 星期四, 08 五月 2025 15:26:51 +0800 Subject: [PATCH] arcdata 默认开始时间,code找不到空指针bug --- iailab-module-data/iailab-module-data-biz/src/main/resources/mapper/point/DaPointDao.xml | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 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 8e67c76..07dba14 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 @@ -71,6 +71,12 @@ <if test="params.collectQuality != null and params.collectQuality != ''"> and t6.collect_quality = #{params.collectQuality} </if> + <if test="params.pointNos != null"> + AND t1.point_no in + <foreach collection="params.pointNos" item="item" index="item" open="(" close=")" separator=","> + #{item} + </foreach> + </if> </where> order by t1.create_time desc, t1.point_no desc </select> @@ -232,6 +238,9 @@ t1.point_no, t1.point_name, t1.default_value, + t1.unittransfactor, + t1.max_value, + t1.min_value, t1.point_type, t1.data_type, t1.store_type, @@ -247,6 +256,12 @@ <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> @@ -258,10 +273,15 @@ t1.point_type, t1.data_type, t1.store_type, + t1.unittransfactor, + t1.max_value, + t1.min_value, t1.minfreqid, t2.moment_point, t2.length, - t2.divisor + t2.cumulate_unit, + t2.divisor, + t2.is_cumu_neg FROM t_da_point t1 LEFT JOIN t_da_cumulate_point t2 ON t2.point_id = t1.id <where> @@ -272,6 +292,21 @@ <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="getPointPage" parameterType="map" resultType="com.iailab.module.data.api.point.dto.ApiPointDTO"> + select point_no pointNo,point_name pointName from t_da_point + <where> + point_no in + <foreach item="value" collection="paramsMap.values" separator="," open="(" close=")"> + '${value}' + </foreach> </where> </select> -- Gitblit v1.9.3