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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
张怡蓉
2025-12-11 14:20:29 +08:00
parent 337ffd8ef4 cbda1d15e8
commit b12d9270f8
9 changed files with 645 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
ruoyi-admin/src/main/resources/mapper/bas/BasFaultRecordMapper.xml Normal file
View File

@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.bas.fault.mapper.BasFaultRecordMapper">
<resultMap type="BasFaultRecord" id="BasFaultRecordResult">
<result property="id" column="id" />
<result property="deviceId" column="device_id" />
<result property="deviceName" column="device_name" />
<result property="deviceType" column="device_type" />
<result property="taskNo" column="task_no" />
<result property="jobId" column="job_id" />
<result property="fault" column="fault" />
<result property="startTime" column="start_time" />
<result property="finishTime" column="finish_time" />
<result property="warehouseId" column="warehouse_id" />
</resultMap>
<sql id="selectBasFaultRecordVo">
select id, device_id, device_name, device_type, task_no, job_id, fault, start_time, finish_time, warehouse_id from bas_fault_record
</sql>
<select id="selectBasFaultRecordList" parameterType="BasFaultRecord" resultMap="BasFaultRecordResult">
<include refid="selectBasFaultRecordVo"/>
<where>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
<if test="deviceType != null and deviceType != ''"> and device_type = #{deviceType}</if>
<if test="taskNo != null and taskNo != ''"> and task_no = #{taskNo}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="fault != null and fault != ''"> and fault = #{fault}</if>
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if>
</where>
</select>
<select id="selectBasFaultRecordById" parameterType="String" resultMap="BasFaultRecordResult">
<include refid="selectBasFaultRecordVo"/>
where id = #{id}
</select>
<insert id="insertBasFaultRecord" parameterType="BasFaultRecord">
insert into bas_fault_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
<if test="deviceId != null and deviceId != ''">device_id,</if>
<if test="deviceName != null and deviceName != ''">device_name,</if>
<if test="deviceType != null and deviceType != ''">device_type,</if>
<if test="taskNo != null">task_no,</if>
<if test="jobId != null">job_id,</if>
<if test="fault != null">fault,</if>
<if test="startTime != null">start_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="warehouseId != null">warehouse_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
<if test="deviceId != null and deviceId != ''">#{deviceId},</if>
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="deviceType != null and deviceType != ''">#{deviceType},</if>
<if test="taskNo != null">#{taskNo},</if>
<if test="jobId != null">#{jobId},</if>
<if test="fault != null">#{fault},</if>
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="warehouseId != null">#{warehouseId},</if>
</trim>
</insert>
<update id="updateBasFaultRecord" parameterType="BasFaultRecord">
update bas_fault_record
<trim prefix="SET" suffixOverrides=",">
<if test="deviceId != null and deviceId != ''">device_id = #{deviceId},</if>
<if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
<if test="deviceType != null and deviceType != ''">device_type = #{deviceType},</if>
<if test="taskNo != null">task_no = #{taskNo},</if>
<if test="jobId != null">job_id = #{jobId},</if>
<if test="fault != null">fault = #{fault},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteBasFaultRecordById" parameterType="String">
delete from bas_fault_record where id = #{id}
</delete>
<delete id="deleteBasFaultRecordByIds" parameterType="String">
delete from bas_fault_record where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

4
ruoyi-admin/src/main/resources/mapper/device/DeviceSsjMapper.xml
View File

@@ -22,10 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="exception" column="exception" />
<result property="traySize" column="tray_size" />
<result property="allowPut" column="allow_put" />
<result property="ipAddress" column="ip_address" />
<result property="port" column="port" />
</resultMap>
<sql id="selectDeviceSsjVo">
select id, device_code , name , type, ip_address, plc_db_read_address, is_active, create_time, plc_db_write_address, rkqq, kx, dw, tray_code, task_no,exception,tray_size,allow_put from device_ssj
select id, device_code , name , type, plc_db_read_address, is_active, create_time, plc_db_write_address, rkqq, kx, dw, tray_code, task_no,exception,tray_size,allow_put,ip_address , port from device_ssj
</sql>
<select id="selectDeviceSsjList" parameterType="DeviceSsj" resultMap="DeviceSsjResult">