通道编号

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

@@ -2,6 +2,7 @@ package com.sooka.sponest.monitor.camera.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author ruoyi
  * @date 2022-06-10
  */
+@Data
 public class CentermonitorTCamerachannel extends BaseBusinessEntity
 {
     private static final long serialVersionUID = 1L;
@@ -30,9 +32,13 @@ public class CentermonitorTCamerachannel extends BaseBusinessEntity
     @Excel(name = "摄像头ID")
     private String cameraId;
 
+    /** 摄像头编码 */
+    @Excel(name = "摄像头编码")
+    private String channelCode;
+
     /** 通道编号 */
     @Excel(name = "通道编号")
-    private String channelCode;
+    private String channelNumber;
 
     /** 通道名称 */
     @Excel(name = "通道名称")

src/main/resources/mapper/monitor/camera/CentermonitorTCamerachannelMapper.xml

@@ -14,6 +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="channelName"    column="channel_name"    />
         <result property="channelType"    column="channel_type"    />
         <result property="deviceCode"    column="device_code"    />
@@ -32,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 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_number from centermonitor_t_camerachannel
     </sql>
 
     <select id="getHaiKangVideoServer" parameterType="String" resultMap="HaiKangCameraBORseult">
@@ -72,6 +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="channelName != null">channel_name,</if>
             <if test="channelType != null">channel_type,</if>
             <if test="deviceCode != null">device_code,</if>
@@ -89,6 +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="channelName != null">#{channelName},</if>
             <if test="channelType != null">#{channelType},</if>
             <if test="deviceCode != null">#{deviceCode},</if>
@@ -109,6 +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="channelName != null">channel_name = #{channelName},</if>
             <if test="channelType != null">channel_type = #{channelType},</if>
             <if test="deviceCode != null">device_code = #{deviceCode},</if>