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

平台修改意见20251120-点位上传根据设备ID区分

Browse Source
This commit is contained in:
zq
2025-12-11 16:13:39 +08:00
parent 3488808786
commit 73c668709a
9 changed files with 90 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,10 +25,11 @@
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="isAlarm" column="is_alarm" />
<result property="deviceId" column="device_id" />
</resultMap>
<sql id="selectEmsPointMatchVo">
select id, point_name, match_table, match_field, site_id, device_category, data_point, data_point_name, data_device, data_unit, ip_address, ip_port, data_type, need_diff_device_id, create_by, create_time, update_by, update_time, remark, is_alarm from ems_point_match
select id, point_name, match_table, match_field, site_id, device_category, data_point, data_point_name, data_device, data_unit, ip_address, ip_port, data_type, need_diff_device_id, create_by, create_time, update_by, update_time, remark, is_alarm, device_id from ems_point_match
</sql>
<select id="selectEmsPointMatchList" parameterType="EmsPointMatch" resultMap="EmsPointMatchResult">
@ -77,6 +78,7 @@
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="isAlarm != null">is_alarm,</if>
<if test="deviceId != null">device_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pointName != null">#{pointName},</if>
@ -123,6 +125,7 @@
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="isAlarm != null">is_alarm = #{isAlarm},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
</trim>
where id = #{id}
</update>
@ -434,6 +437,9 @@
<if test="isAlarm != null">
and t.is_alarm = #{isAlarm}
</if>
<if test="deviceId != null">
and t.device_id = #{deviceId}
</if>
</select>
<select id="getClusterDevicePoints" resultType="com.xzzn.ems.domain.vo.PointQueryResponse">
@ -465,6 +471,9 @@
<if test="isAlarm != null">
and t.is_alarm = #{isAlarm}
</if>
<if test="deviceId != null">
and t.device_id = #{deviceId}
</if>
) as tmp
where 1=1
<if test="pointName != null and pointName != ''">
@ -490,6 +499,7 @@
<select id="getOnePointMatch" resultMap="EmsPointMatchResult">
<include refid="selectEmsPointMatchVo"/>
where site_id = #{siteId}
and device_id = #{deviceId}
and device_category = #{deviceCategory}
and data_point = #{dataPoint}
order by update_time desc
@ -499,6 +509,7 @@
<select id="getDevicePointMatchList" resultMap="EmsPointMatchResult">
<include refid="selectEmsPointMatchVo"/>
where site_id = #{siteId}
and device_id = #{deviceId}
and device_category = #{deviceCategory}
</select>
@ -515,6 +526,7 @@
ems_point_match
<where>
<if test="siteId != null and siteId != ''"> and site_id = #{siteId}</if>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="deviceCategory != null and deviceCategory != ''"> and device_category = #{deviceCategory}</if>
</where>
</select>
@ -525,6 +537,7 @@
ems_point_match
where is_alarm = 1
and site_id = #{siteId}
and device_id = #{deviceId}
and device_category = #{deviceCategory}
</select>