任务提交 站点信息加入摄像头配置信息

ruoyi-system/src/main/java/com/ruoyi/system/domain/SiteInfo.java

@@ -78,5 +78,26 @@ public class SiteInfo implements Serializable {
      */
     private String deviceId;
 
+    /**
+     * 远程摄像头链接地址
+     */
+    private String videoUrl;
+
+    /**
+     * 远程摄像头端口
+     */
+    private String videoPort;
+
+    /**
+     * 远程摄像头用户名
+     */
+    private String videoUser;
+
+    /**
+     * 远程摄像头密码
+     */
+    private String videoPwd;
+    
+
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/dto/SiteInfoDTO.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.dto;
 
 import lombok.Data;
-import lombok.NonNull;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -84,5 +83,24 @@ public class SiteInfoDTO implements Serializable {
     @NotBlank(message = "站点设备ID不能为空")
     private String deviceId;
 
+    /**
+     * 远程摄像头链接地址
+     */
+    private String videoUrl;
+
+    /**
+     * 远程摄像头端口
+     */
+    private String videoPort;
+
+    /**
+     * 远程摄像头用户名
+     */
+    private String videoUser;
+
+    /**
+     * 远程摄像头密码
+     */
+    private String videoPwd;
 }
 

ruoyi-system/src/main/java/com/ruoyi/system/paramet/SiteInfoQuery.java

@@ -13,6 +13,11 @@ import java.io.Serializable;
 @Data
 public class SiteInfoQuery implements Serializable {
 
+    /**
+     * 站点ID
+     */
+    private Long siteId;
+
     /**
      * 站码
      */

ruoyi-system/src/main/resources/mapper/SiteInfoMapper.xml

@@ -18,12 +18,16 @@
         <result property="creatTime" column="creat_time" jdbcType="TIMESTAMP"/>
         <result property="isDel" column="is_del" jdbcType="INTEGER"/>
         <result property="deviceId" column="device_id" jdbcType="VARCHAR"/>
+        <result property="videoUrl" column="video_url" jdbcType="VARCHAR"/>
+        <result property="videoUser" column="video_user" jdbcType="VARCHAR"/>
+        <result property="videoPwd" column="video_pwd" jdbcType="VARCHAR"/>
+        <result property="videoPort" column="video_port" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
     <select id="queryById" resultMap="SiteInfoMap">
         select
-site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id
+            site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id, video_url, video_user, video_pwd, video_port
         from site_info
         where site_id = #{siteId}
     </select>
@@ -31,9 +35,12 @@ site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_uni
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="SiteInfoMap">
         select
-            site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id
+            site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id, video_url, video_user, video_pwd, video_port
         from site_info
         <where>
+            <if test="siteInfoQuery.siteId != null">
+                and site_id = #{siteInfoQuery.siteId}
+            </if>
             <if test="siteInfoQuery.id != null and siteInfoQuery.id != ''">
                 and id = #{siteInfoQuery.id}
             </if>
@@ -105,23 +112,23 @@ site_id, id, site_name, site_type, lon, lat, site_time, admin_region, manage_uni
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="siteId" useGeneratedKeys="true">
-        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id)
-        values (#{id}, #{siteName}, #{siteType}, #{lon}, #{lat}, #{siteTime}, #{adminRegion}, #{manageUnit}, #{affiliatedUnit}, #{contactName}, #{contactPhone}, #{creatTime}, #{isDel}, #{deviceId})
+        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id, video_url, video_user, video_pwd, video_port)
+        values (#{id}, #{siteName}, #{siteType}, #{lon}, #{lat}, #{siteTime}, #{adminRegion}, #{manageUnit}, #{affiliatedUnit}, #{contactName}, #{contactPhone}, #{creatTime}, #{isDel}, #{deviceId}, #{videoUrl}, #{videoUser}, #{videoPwd}, #{videoPort})
     </insert>
 
     <insert id="insertBatch" keyProperty="siteId" useGeneratedKeys="true">
-        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id)
+        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id, video_url, video_user, video_pwd, video_port)
         values
         <foreach collection="entities" item="entity" separator=",">
-        (#{entity.id}, #{entity.siteName}, #{entity.siteType}, #{entity.lon}, #{entity.lat}, #{entity.siteTime}, #{entity.adminRegion}, #{entity.manageUnit}, #{entity.affiliatedUnit}, #{entity.contactName}, #{entity.contactPhone}, #{entity.creatTime}, #{entity.isDel}, #{entity.deviceId})
+        (#{entity.id}, #{entity.siteName}, #{entity.siteType}, #{entity.lon}, #{entity.lat}, #{entity.siteTime}, #{entity.adminRegion}, #{entity.manageUnit}, #{entity.affiliatedUnit}, #{entity.contactName}, #{entity.contactPhone}, #{entity.creatTime}, #{entity.isDel}, #{entity.deviceId}, #{entity.videoUrl}, #{entity.videoUser}, #{entity.videoPwd}, #{entity.videoPort})
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="siteId" useGeneratedKeys="true">
-        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id)
+        insert into site_info(id, site_name, site_type, lon, lat, site_time, admin_region, manage_unit, affiliated_unit, contact_name, contact_phone, creat_time, is_del, device_id, video_url, video_user, video_pwd, video_port)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id}, #{entity.siteName}, #{entity.siteType}, #{entity.lon}, #{entity.lat}, #{entity.siteTime}, #{entity.adminRegion}, #{entity.manageUnit}, #{entity.affiliatedUnit}, #{entity.contactName}, #{entity.contactPhone}, #{entity.creatTime}, #{entity.isDel}, #{entity.deviceId})
+            (#{entity.id}, #{entity.siteName}, #{entity.siteType}, #{entity.lon}, #{entity.lat}, #{entity.siteTime}, #{entity.adminRegion}, #{entity.manageUnit}, #{entity.affiliatedUnit}, #{entity.contactName}, #{entity.contactPhone}, #{entity.creatTime}, #{entity.isDel}, #{entity.deviceId}, #{entity.videoUrl}, #{entity.videoUser}, #{entity.videoPwd}, #{entity.videoPort})
         </foreach>
         on duplicate key update
 id = values(id),
@@ -137,7 +144,11 @@ contact_name = values(contact_name),
 contact_phone = values(contact_phone),
 creat_time = values(creat_time),
 is_del = values(is_del),
-device_id = values(device_id)
+device_id = values(device_id),
+video_url = values(video_url),
+video_user = values(video_user),
+video_pwd = values(video_pwd),
+video_port = values(video_port)
     </insert>
 
     <!--通过主键修改数据-->
@@ -186,6 +197,18 @@ device_id = values(device_id)
             <if test="deviceId != null and deviceId != ''">
                 device_id = #{deviceId},
             </if>
+            <if test="videoUrl != null and videoUrl != ''">
+                video_url = #{videoUrl},
+            </if>
+            <if test="videoUser != null and videoUser != ''">
+                video_user = #{videoUser},
+            </if>
+            <if test="videoPwd != null and videoPwd != ''">
+                video_pwd = #{videoPwd},
+            </if>
+            <if test="videoPort != null and videoPort != ''">
+                video_port = #{videoPort},
+            </if>
         </set>
         where site_id = #{siteId}
     </update>