2D监控

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

@@ -19,10 +19,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dw"    column="dw"    />
         <result property="trayCode"    column="tray_code"    />
         <result property="taskNo"    column="task_no"    />
+        <result property="exception"    column="exception"    />
+        <result property="traySize"    column="tray_size"    />
+        <result property="allowPut"    column="allow_put"    />
     </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 from device_ssj
+        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
     </sql>
 
     <select id="selectDeviceSsjList" parameterType="DeviceSsj" resultMap="DeviceSsjResult">
@@ -40,6 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dw != null  and dw != ''"> and dw = #{dw}</if>
             <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
             <if test="taskNo != null  and taskNo != ''"> and task_no = #{taskNo}</if>
+            <if test="exception != null  and exception != ''"> and exception = #{exception}</if>
+            <if test="traySize != null  and traySize != ''"> and tray_size = #{traySize}</if>
+            <if test="allowPut != null  and allowPut != ''"> and allow_put = #{allowPut}</if>
+
         </where>
     </select>