xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改设备监控电表类型设备曲线不展示问题

Browse Source
This commit is contained in:
zq
2026-01-28 19:21:30 +08:00
parent 2b22b70baa
commit 8a44009c42
5 changed files with 97 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
View File

@ -178,6 +178,7 @@
t.match_field as matchField,
t.device_category as deviceCategory,
t.point_name as pointName,
t.data_point_name as dataPointName,
t.data_type as dataType
from ems_point_match t
where 1=1
@ -190,8 +191,11 @@
<if test="deviceCategory != null and deviceCategory != ''">
and t.device_category = #{deviceCategory}
</if>
<if test="deviceId != null and deviceId != ''">
and t.device_id = #{deviceId}
</if>
<if test="pointName != null and pointName != ''">
and t.point_name like concat('%', #{pointName}, '%')
and (t.point_name like concat('%', #{pointName}, '%') or t.data_point_name like concat('%', #{pointName}, '%'))
</if>
</select>
@ -423,6 +427,7 @@
t.data_point as dataPoint,
t.data_point_name as dataPointName,
t.data_device as dataDevice,
t.match_field as matchField,
t.need_diff_device_id as isNeedDeviceId,
t.data_unit as dataUnit,
t.ip_address as ipAddress,
@ -459,6 +464,7 @@
SELECT tmp.pointName,
tmp.dataPoint,
tmp.dataDevice,
tmp.matchField,
tmp.dataPointName,
tmp.dataUnit,
tmp.ipAddress,
@ -469,6 +475,7 @@
when t.need_diff_device_id = 1 and t.data_device = 'BMSD' then concat(#{parentDeviceId}, t.data_point)
else t.data_point end as dataPoint,
t.data_point_name as dataPointName,
t.match_field as matchField,
t.data_device as dataDevice,
t.data_unit as dataUnit,
t.ip_address as ipAddress,