浏览代码

设备树

lchao 6 天之前
父节点
当前提交
6fb99687a6

+ 1 - 1
src/main/java/com/sooka/sponest/monitor/camera/domain/CentermonitorTCamerachannel.java

@@ -38,7 +38,7 @@ public class CentermonitorTCamerachannel extends BaseBusinessEntity
 
     /** 通道编号 */
     @Excel(name = "通道编号")
-    private String channelNumber;
+    private String channelNum;
 
     /** 通道名称 */
     @Excel(name = "通道名称")

+ 1 - 1
src/main/resources/mapper/monitor/camera/CentermonitorTCameraMapper.xml

@@ -127,7 +127,7 @@
         SELECT 
             id, create_by, create_time, update_by, update_time, data_status, 
             data_dept_id, camera_id, channel_code, channel_name, channel_type,
-            device_code, device_sn, device_protocol_type, device_login_type, channel_number
+            device_code, device_sn, device_protocol_type, device_login_type, channel_num
         FROM centermonitor_t_camerachannel
         WHERE camera_id = #{id} AND data_status = '0'
     </select>

+ 5 - 5
src/main/resources/mapper/monitor/camera/CentermonitorTCamerachannelMapper.xml

@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataDeptId"    column="data_dept_id"    />
         <result property="cameraId"    column="camera_id"    />
         <result property="channelCode"    column="channel_code"    />
-        <result property="channelNumber"    column="channel_number"    />
+        <result property="channelNum"    column="channel_num"    />
         <result property="channelName"    column="channel_name"    />
         <result property="channelType"    column="channel_type"    />
         <result property="deviceCode"    column="device_code"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCentermonitorTCamerachannelVo">
-        select id, create_by, create_time, update_by, update_time, data_status, data_dept_id, camera_id, channel_code, channel_name, channel_type,device_code,device_sn,device_protocol_type,device_login_type,channel_number from centermonitor_t_camerachannel
+        select id, create_by, create_time, update_by, update_time, data_status, data_dept_id, camera_id, channel_code, channel_name, channel_type,device_code,device_sn,device_protocol_type,device_login_type,channel_num from centermonitor_t_camerachannel
     </sql>
 
     <select id="getHaiKangVideoServer" parameterType="String" resultMap="HaiKangCameraBORseult">
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataDeptId != null">data_dept_id,</if>
             <if test="cameraId != null">camera_id,</if>
             <if test="channelCode != null">channel_code,</if>
-            <if test="channelNumber != null">channel_number,</if>
+            <if test="channelNum != null">channel_num,</if>
             <if test="channelName != null">channel_name,</if>
             <if test="channelType != null">channel_type,</if>
             <if test="deviceCode != null">device_code,</if>
@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataDeptId != null">#{dataDeptId},</if>
             <if test="cameraId != null">#{cameraId},</if>
             <if test="channelCode != null">#{channelCode},</if>
-            <if test="channelNumber != null">#{channelNumber},</if>
+            <if test="channelNum != null">#{channelNum},</if>
             <if test="channelName != null">#{channelName},</if>
             <if test="channelType != null">#{channelType},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="dataDeptId != null">data_dept_id = #{dataDeptId},</if>
             <if test="cameraId != null">camera_id = #{cameraId},</if>
             <if test="channelCode != null">channel_code = #{channelCode},</if>
-            <if test="channelNumber != null">channel_number = #{channelNumber},</if>
+            <if test="channelNum != null">channel_num = #{channelNum},</if>
             <if test="channelName != null">channel_name = #{channelName},</if>
             <if test="channelType != null">channel_type = #{channelType},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>