增加PC 地址配置

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysUrlConfig.java

@@ -91,6 +91,12 @@ public class SysUrlConfig extends BaseEntity {
     @ApiModelProperty("大屏外网地址")
     private String screenExtranetUrl;
 
+    @ApiModelProperty("pc内网地址")
+    private String pcIntranetUrl;
+
+    @ApiModelProperty("pc外网地址")
+    private String pcExtranetUrl;
+
     public Long getId() {
         return id;
     }
@@ -218,5 +224,21 @@ public class SysUrlConfig extends BaseEntity {
     public void setIpIdentify(String ipIdentify) {
         this.ipIdentify = ipIdentify;
     }
+
+    public String getPcIntranetUrl() {
+        return pcIntranetUrl;
+    }
+
+    public void setPcIntranetUrl(String pcIntranetUrl) {
+        this.pcIntranetUrl = pcIntranetUrl;
+    }
+
+    public String getPcExtranetUrl() {
+        return pcExtranetUrl;
+    }
+
+    public void setPcExtranetUrl(String pcExtranetUrl) {
+        this.pcExtranetUrl = pcExtranetUrl;
+    }
 }
 

zd-modules/zd-modules-system/src/main/resources/mapper/system/SysUrlConfigDao.xml

@@ -46,6 +46,8 @@
                mqtt_extranet_password,
                screen_intranet_url,
                screen_extranet_url,
+               pc_intranet_url,
+               pc_extranet_url,
                dept_id,
                create_time,
                user_id,
@@ -62,7 +64,8 @@
         select
         id, file_intranet_url, file_extranet_url, camera_intranet_url, camera_extranet_url, camera_intranet_agent,
         camera_extranet_agent, ip_identify, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password, mqtt_extranet_url,
-        mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url, dept_id, create_time,
+        mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url, pc_intranet_url,
+        pc_extranet_url,dept_id, create_time,
         user_id, create_by, update_time, update_by, remark
         from sys_url_config
         <where>
@@ -214,19 +217,22 @@
         insert into sys_url_config(file_intranet_url, file_extranet_url, camera_intranet_url, camera_extranet_url,
                                    camera_intranet_agent, camera_extranet_agent, ip_identify, mqtt_intranet_url, mqtt_intranet_user,
                                    mqtt_intranet_password, mqtt_extranet_url, mqtt_extranet_user,
-                                   mqtt_extranet_password, screen_intranet_url, screen_extranet_url, dept_id,
+                                   mqtt_extranet_password, screen_intranet_url, screen_extranet_url, pc_intranet_url,
+                                   pc_extranet_url,dept_id,
                                    create_time, user_id, create_by, update_time, update_by, remark)
         values (#{fileIntranetUrl}, #{fileExtranetUrl}, #{cameraIntranetUrl}, #{cameraExtranetUrl},
                 #{cameraIntranetAgent}, #{cameraExtranetAgent}, #{ipIdentify}, #{mqttIntranetUrl}, #{mqttIntranetUser},
                 #{mqttIntranetPassword}, #{mqttExtranetUrl}, #{mqttExtranetUser}, #{mqttExtranetPassword},
-                #{screenIntranetUrl}, #{screenExtranetUrl}, #{deptId}, #{createTime}, #{userId}, #{createBy},
+                #{screenIntranetUrl}, #{screenExtranetUrl}, #{pcIntranetUrl},
+                #{pcExtranetUrl}, #{deptId}, #{createTime}, #{userId}, #{createBy},
                 #{updateTime}, #{updateBy}, #{remark})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
         insert into sys_url_config(file_intranet_url, file_extranet_url, camera_intranet_url, camera_extranet_url,
         camera_intranet_agent, camera_extranet_agent, ip_identify, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password,
-        mqtt_extranet_url, mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url,
+        mqtt_extranet_url, mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url, pc_intranet_url,
+        pc_extranet_url,
         dept_id, create_time, user_id, create_by, update_time, update_by, remark)
         values
         <foreach collection="entities" item="entity" separator=",">
@@ -234,7 +240,8 @@
             #{entity.cameraExtranetUrl}, #{entity.cameraIntranetAgent}, #{entity.cameraExtranetAgent}, #{ipIdentify},
             #{entity.mqttIntranetUrl}, #{entity.mqttIntranetUser}, #{entity.mqttIntranetPassword},
             #{entity.mqttExtranetUrl}, #{entity.mqttExtranetUser}, #{entity.mqttExtranetPassword},
-            #{entity.screenIntranetUrl}, #{entity.screenExtranetUrl}, #{entity.deptId}, #{entity.createTime},
+            #{entity.screenIntranetUrl}, #{entity.screenExtranetUrl}, #{entity.pcIntranetUrl},
+            #{entity.pcExtranetUrl}, #{entity.deptId}, #{entity.createTime},
             #{entity.userId}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}, #{entity.remark})
         </foreach>
     </insert>
@@ -242,7 +249,8 @@
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
         insert into sys_url_config(file_intranet_url, file_extranet_url, camera_intranet_url, camera_extranet_url,
         camera_intranet_agent, camera_extranet_agent, ip_identify, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password,
-        mqtt_extranet_url, mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url,
+        mqtt_extranet_url, mqtt_extranet_user, mqtt_extranet_password, screen_intranet_url, screen_extranet_url, pc_intranet_url,
+        pc_extranet_url,
         dept_id, create_time, user_id, create_by, update_time, update_by, remark)
         values
         <foreach collection="entities" item="entity" separator=",">
@@ -250,7 +258,8 @@
             #{entity.cameraExtranetUrl}, #{entity.cameraIntranetAgent}, #{entity.cameraExtranetAgent}, #{ipIdentify},
             #{entity.mqttIntranetUrl}, #{entity.mqttIntranetUser}, #{entity.mqttIntranetPassword},
             #{entity.mqttExtranetUrl}, #{entity.mqttExtranetUser}, #{entity.mqttExtranetPassword},
-            #{entity.screenIntranetUrl}, #{entity.screenExtranetUrl}, #{entity.deptId}, #{entity.createTime},
+            #{entity.screenIntranetUrl}, #{entity.screenExtranetUrl}, #{entity.pcIntranetUrl},
+            #{entity.pcExtranetUrl}, #{entity.deptId}, #{entity.createTime},
             #{entity.userId}, #{entity.createBy}, #{entity.updateTime}, #{entity.updateBy}, #{entity.remark})
         </foreach>
         on duplicate key update
@@ -269,6 +278,8 @@
         mqtt_extranet_password = values(mqtt_extranet_password),
         screen_intranet_url = values(screen_intranet_url),
         screen_extranet_url = values(screen_extranet_url),
+        pc_intranet_url = values(pc_intranet_url),
+        pc_extranet_url = values(pc_extranet_url),
         dept_id = values(dept_id),
         create_time = values(create_time),
         user_id = values(user_id),
@@ -327,6 +338,15 @@
             <if test="screenExtranetUrl != null and screenExtranetUrl != ''">
                 screen_extranet_url = #{screenExtranetUrl},
             </if>
+
+            <if test="pcIntranetUrl != null and pcIntranetUrl != ''">
+                pc_intranet_url = #{pcIntranetUrl},
+            </if>
+
+            <if test="pcExtranetUrl != null and pcExtranetUrl != ''">
+                pc_extranet_url = #{pcExtranetUrl},
+            </if>
+
             <if test="deptId != null">
                 dept_id = #{deptId},
             </if>