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

重构

Browse Source
This commit is contained in:
dashixiong
2026-02-15 16:02:06 +08:00
parent 6253fb6b2d
commit 71d0b0f609
30 changed files with 2844 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
ems-system/src/main/resources/mapper/ems/EmsPointConfigMapper.xml
View File

@ -213,7 +213,8 @@
</select>
<select id="getPointNameList" resultType="com.xzzn.ems.domain.vo.GeneralQueryPointOptionVo">
select point_name as pointName,
select point_id as pointId,
point_name as pointName,
data_key as dataKey,
point_desc as pointDesc
from ems_point_config
@ -237,8 +238,8 @@
or point_desc like concat('%', #{pointName}, '%')
)
</if>
group by point_name, data_key, point_desc
order by point_name asc, data_key asc
group by point_id, point_name, data_key, point_desc
order by point_id asc, point_name asc, data_key asc
</select>
<select id="getConfigListForGeneralQuery" resultMap="EmsPointConfigResult">
@ -250,21 +251,31 @@
#{siteId}
</foreach>
</if>
<if test="deviceCategory != null and deviceCategory != ''">
and device_category = #{deviceCategory}
</if>
<if test="pointNames != null and pointNames.size() > 0">
and point_name in
<foreach collection="pointNames" item="pointName" open="(" separator="," close=")">
#{pointName}
</foreach>
</if>
<if test="deviceIds != null and deviceIds.size() > 0">
and device_id in
<foreach collection="deviceIds" item="deviceId" open="(" separator="," close=")">
#{deviceId}
</foreach>
</if>
<choose>
<when test="pointIds != null and pointIds.size() > 0">
and point_id in
<foreach collection="pointIds" item="pointId" open="(" separator="," close=")">
#{pointId}
</foreach>
</when>
<otherwise>
<if test="deviceCategory != null and deviceCategory != ''">
and device_category = #{deviceCategory}
</if>
<if test="pointNames != null and pointNames.size() > 0">
and point_name in
<foreach collection="pointNames" item="pointName" open="(" separator="," close=")">
#{pointName}
</foreach>
</if>
<if test="deviceIds != null and deviceIds.size() > 0">
and device_id in
<foreach collection="deviceIds" item="deviceId" open="(" separator="," close=")">
#{deviceId}
</foreach>
</if>
</otherwise>
</choose>
</select>
<select id="selectBySiteIdAndPointIds" resultMap="EmsPointConfigResult">