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

平台修改意见20251120-设备点位匹配解析；上传点位清单修改；

Browse Source
This commit is contained in:
zq
2025-12-05 08:46:19 +08:00
parent c068e7d4ab
commit 3735c4f4d8
28 changed files with 2441 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,11 +24,11 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="deviceId" column="device_id" />
<result property="isAlarm" column="is_alarm" />
</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, device_id 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 from ems_point_match
</sql>
<select id="selectEmsPointMatchList" parameterType="EmsPointMatch" resultMap="EmsPointMatchResult">
@ -76,7 +76,7 @@
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="deviceId != null">device_id,</if>
<if test="isAlarm != null">is_alarm,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pointName != null">#{pointName},</if>
@ -97,7 +97,7 @@
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="isAlarm != null">#{isAlarm},</if>
</trim>
</insert>
@ -122,7 +122,7 @@
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="isAlarm != null">is_alarm = #{isAlarm},</if>
</trim>
where id = #{id}
</update>
@ -380,6 +380,9 @@
<if test="ipPort != null">
and t.ip_port = #{ipPort}
</if>
<if test="isAlarm != null">
and t.is_alarm = #{isAlarm}
</if>
</select>
<select id="getClusterDevicePoints" resultType="com.xzzn.ems.domain.vo.PointQueryResponse">
@ -408,6 +411,9 @@
<if test="deviceCategory != null and deviceCategory != ''">
and t.device_category = #{deviceCategory}
</if>
<if test="isAlarm != null">
and t.is_alarm = #{isAlarm}
</if>
) as tmp
where 1=1
<if test="pointName != null and pointName != ''">
@ -434,7 +440,6 @@
<include refid="selectEmsPointMatchVo"/>
where site_id = #{siteId}
and device_category = #{deviceCategory}
and device_id = #{deviceId}
and data_point = #{dataPoint}
order by update_time desc
limit 1
@ -444,6 +449,5 @@
<include refid="selectEmsPointMatchVo"/>
where site_id = #{siteId}
and device_category = #{deviceCategory}
and device_id = #{deviceId}
</select>
</mapper>