lhq/FT546-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 ssj tsj srgv cdz的读取调度，监控调度

Browse Source
This commit is contained in:
liuhanqing
2026-01-05 14:10:56 +08:00
parent f209620cd7
commit 5fe90b8bb4
12 changed files with 124 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/resources/mapper/device/DeviceCdzMapper.xml
View File

@@ -100,11 +100,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDeviceCdz" parameterType="DeviceCdz">
update device_cdz
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="ip != null">ip = #{ip},</if>
<if test="port != null">port = #{port},</if>
<if test="plcDbReadAddress != null">plc_db_read_address = #{plcDbReadAddress},</if>
<if test="plcDbWriteAddress != null">plc_db_write_address = #{plcDbWriteAddress},</if>
<if test="rwh != null">rwh = #{rwh},</if>
<if test="status != null">status = #{status},</if>
<if test="xtxh != null">xtxh = #{xtxh},</if>

15
ruoyi-admin/src/main/resources/mapper/device/DeviceSrgvMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.srgv.mapper.DeviceSrgvMapper">
<resultMap type="DeviceSrgv" id="DeviceSrgvResult">
<result property="guid" column="guid" />
<result property="deviceId" column="device_id" />
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDeviceSrgvList" parameterType="DeviceSrgv" resultMap="DeviceSrgvResult">
<include refid="selectDeviceSrgvVo"/>
<where>
<where>
<if test="deviceId != null "> and device_id = #{deviceId}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="ip != null and ip != ''"> and ip = #{ip}</if>
@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare5 != null and spare5 != ''"> and spare5 = #{spare5}</if>
</where>
</select>
<select id="selectDeviceSrgvByGuid" parameterType="String" resultMap="DeviceSrgvResult">
<include refid="selectDeviceSrgvVo"/>
where guid = #{guid}
@@ -180,11 +180,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDeviceSrgv" parameterType="DeviceSrgv">
update device_srgv
<trim prefix="SET" suffixOverrides=",">
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="deviceName != null">device_name = #{deviceName},</if>
<if test="ip != null">ip = #{ip},</if>
<if test="port != null">port = #{port},</if>
<if test="type != null">type = #{type},</if>
<if test="setFloor != null">set_floor = #{setFloor},</if>
<if test="powerTime != null">power_time = #{powerTime},</if>
<if test="lastTime != null">last_time = #{lastTime},</if>
@@ -225,9 +220,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDeviceSrgvByGuids" parameterType="String">
delete from device_srgv where guid in
delete from device_srgv where guid in
<foreach item="guid" collection="array" open="(" separator="," close=")">
#{guid}
</foreach>
</delete>
</mapper>
</mapper>

15
ruoyi-admin/src/main/resources/mapper/device/DeviceTsjMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.device.tsj.mapper.DeviceTsjMapper">
<resultMap type="DeviceTsj" id="DeviceTsjResult">
<result property="id" column="id" />
<result property="name" column="name" />
@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDeviceTsjList" parameterType="DeviceTsj" resultMap="DeviceTsjResult">
<include refid="selectDeviceTsjVo"/>
<where>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="ip != null and ip != ''"> and ip = #{ip}</if>
<if test="port != null and port != ''"> and port = #{port}</if>
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="spare3 != null "> and spare3 = #{spare3}</if>
</where>
</select>
<select id="selectDeviceTsjById" parameterType="Long" resultMap="DeviceTsjResult">
<include refid="selectDeviceTsjVo"/>
where id = #{id}
@@ -124,11 +124,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDeviceTsj" parameterType="DeviceTsj">
update device_tsj
<trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if>
<if test="ip != null">ip = #{ip},</if>
<if test="port != null">port = #{port},</if>
<if test="plcDbReadAddress != null">plc_db_read_address = #{plcDbReadAddress},</if>
<if test="plcDbWriteAddress != null">plc_db_write_address = #{plcDbWriteAddress},</if>
<if test="rwh != null">rwh = #{rwh},</if>
<if test="jdbz != null">jdbz = #{jdbz},</if>
<if test="sbzt != null">sbzt = #{sbzt},</if>
@@ -155,9 +150,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteDeviceTsjByIds" parameterType="String">
delete from device_tsj where id in
delete from device_tsj where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>
</mapper>