1、添加摄像头归属单位字段 (d9a3063f) · Commits · AI算法平台 / RuoYi-Vue-master · GitLab

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/AlgorithmCameraBase.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -30,6 +30,10 @@ public class AlgorithmCameraBase extends BaseEntity
	@Excel(name = "排序")		@Excel(name = "排序")
	private Long sort;		private Long sort;

			/** 归属矿场 */
			@Excel(name = "归属矿场")
			private String belong;

	/** 帐号状态（0正常 */		/** 帐号状态（0正常 */
	@Excel(name = "帐号状态", readConverterExp = "帐号状态（0正常")		@Excel(name = "帐号状态", readConverterExp = "帐号状态（0正常")
	private String status;		private String status;
	@@ -92,6 +96,14 @@ public class AlgorithmCameraBase extends BaseEntity
	return delFlag;		return delFlag;
	}		}

			public String getBelong() {
			return belong;
			}

			public void setBelong(String belong) {
			this.belong = belong;
			}

	@Override		@Override
	public String toString() {		public String toString() {
	return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/algorithm/domain/dto/AlgorithmCameraListDto.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,6 +26,9 @@ public class AlgorithmCameraListDto {
	/** 排序 */		/** 排序 */
	private Long sort;		private Long sort;

			/** 归属矿场 */
			private String belong;

	/** 状态 */		/** 状态 */
	private String status;		private String status;
	}		}

ruoyi-admin/src/main/resources/mapper/system/AlgorithmCameraBaseMapper.xml

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	<result property="cameraName" column="camera_name" />		<result property="cameraName" column="camera_name" />
	<result property="rtsp" column="rtsp" />		<result property="rtsp" column="rtsp" />
	<result property="sort" column="sort" />		<result property="sort" column="sort" />
			<result property="belong" column="belong" />
	<result property="status" column="status" />		<result property="status" column="status" />
	<result property="delFlag" column="del_flag" />		<result property="delFlag" column="del_flag" />
	<result property="createBy" column="create_by" />		<result property="createBy" column="create_by" />
	@@ -26,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	<result property="createTime" column="create_time" />		<result property="createTime" column="create_time" />
	<result property="sort" column="sort" />		<result property="sort" column="sort" />
	<result property="status" column="status" />		<result property="status" column="status" />
			<result property="belong" column="belong" />
	</resultMap>		</resultMap>

	<sql id="selectAlgorithmCameraBaseVo">		<sql id="selectAlgorithmCameraBaseVo">
	select id, camera_name, rtsp, sort, status, del_flag, create_by, create_time, update_by, update_time, remark from algorithm_camera_base		select id, camera_name, rtsp, sort, belong,status, del_flag, create_by, create_time, update_by, update_time, remark from algorithm_camera_base
	</sql>		</sql>

	<select id="selectAlgorithmCameraBaseList" parameterType="AlgorithmCameraBase" resultMap="AlgorithmCameraBaseResult">		<select id="selectAlgorithmCameraBaseList" parameterType="AlgorithmCameraBase" resultMap="AlgorithmCameraBaseResult">
	@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	su.nick_name,		su.nick_name,
	acb.create_time,		acb.create_time,
	acb.sort,		acb.sort,
			acb.belong
	acb.`status`		acb.`status`
	FROM		FROM
	algorithm_camera_base acb		algorithm_camera_base acb
	@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	<if test="cameraName != null">camera_name,</if>		<if test="cameraName != null">camera_name,</if>
	<if test="rtsp != null">rtsp,</if>		<if test="rtsp != null">rtsp,</if>
	<if test="sort != null">sort,</if>		<if test="sort != null">sort,</if>
			<if test="belong != null">belong,</if>
	<if test="status != null">status,</if>		<if test="status != null">status,</if>
	<if test="delFlag != null">del_flag,</if>		<if test="delFlag != null">del_flag,</if>
	<if test="createBy != null">create_by,</if>		<if test="createBy != null">create_by,</if>
	@@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
	<if test="cameraName != null">#{cameraName},</if>		<if test="cameraName != null">#{cameraName},</if>
	<if test="rtsp != null">#{rtsp},</if>		<if test="rtsp != null">#{rtsp},</if>
	<if test="sort != null">#{sort},</if>		<if test="sort != null">#{sort},</if>