公共配置字段扩充

zd-gateway/src/main/java/com/zd/gateway/config/SwaggerProvider.java

@@ -82,8 +82,8 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         /** swagger-ui 地址 */
-        registry.addResourceHandler("/swagger-ui/**")
-                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+//        registry.addResourceHandler("/swagger-ui/**")
+//                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
 
         registry.addResourceHandler(localFilePrefix + "/**")
                 .addResourceLocations("file:" + localFilePath + File.separator);

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

@@ -48,6 +48,8 @@ public class SysUrlConfig extends BaseEntity {
      */
     @ApiModelProperty("摄像头外网代理")
     private String cameraExtranetAgent;
+    @ApiModelProperty("IP标识")
+    private String ipIdentify;
     /**
      * mqtt内网地址
      */
@@ -209,5 +211,12 @@ public class SysUrlConfig extends BaseEntity {
         this.screenExtranetUrl = screenExtranetUrl;
     }
 
+    public String getIpIdentify() {
+        return ipIdentify;
+    }
+
+    public void setIpIdentify(String ipIdentify) {
+        this.ipIdentify = ipIdentify;
+    }
 }
 

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

@@ -10,6 +10,7 @@
         <result property="cameraExtranetUrl" column="camera_extranet_url" jdbcType="VARCHAR"/>
         <result property="cameraIntranetAgent" column="camera_intranet_agent" jdbcType="VARCHAR"/>
         <result property="cameraExtranetAgent" column="camera_extranet_agent" jdbcType="VARCHAR"/>
+        <result property="ipIdentify" column="ip_identify" jdbcType="VARCHAR"/>
         <result property="mqttIntranetUrl" column="mqtt_intranet_url" jdbcType="VARCHAR"/>
         <result property="mqttIntranetUser" column="mqtt_intranet_user" jdbcType="VARCHAR"/>
         <result property="mqttIntranetPassword" column="mqtt_intranet_password" jdbcType="VARCHAR"/>
@@ -36,6 +37,7 @@
                camera_extranet_url,
                camera_intranet_agent,
                camera_extranet_agent,
+               ip_identify,
                mqtt_intranet_url,
                mqtt_intranet_user,
                mqtt_intranet_password,
@@ -59,7 +61,7 @@
     <select id="queryAll" resultMap="SysUrlConfigMap">
         select
         id, file_intranet_url, file_extranet_url, camera_intranet_url, camera_extranet_url, camera_intranet_agent,
-        camera_extranet_agent, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password, mqtt_extranet_url,
+        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,
         user_id, create_by, update_time, update_by, remark
         from sys_url_config
@@ -210,12 +212,12 @@
     <!--新增所有列-->
     <insert id="insert" 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, mqtt_intranet_url, mqtt_intranet_user,
+                                   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, user_id, create_by, update_time, update_by, remark)
         values (#{fileIntranetUrl}, #{fileExtranetUrl}, #{cameraIntranetUrl}, #{cameraExtranetUrl},
-                #{cameraIntranetAgent}, #{cameraExtranetAgent}, #{mqttIntranetUrl}, #{mqttIntranetUser},
+                #{cameraIntranetAgent}, #{cameraExtranetAgent}, #{ipIdentify}, #{mqttIntranetUrl}, #{mqttIntranetUser},
                 #{mqttIntranetPassword}, #{mqttExtranetUrl}, #{mqttExtranetUser}, #{mqttExtranetPassword},
                 #{screenIntranetUrl}, #{screenExtranetUrl}, #{deptId}, #{createTime}, #{userId}, #{createBy},
                 #{updateTime}, #{updateBy}, #{remark})
@@ -223,13 +225,13 @@
 
     <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, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password,
+        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, user_id, create_by, update_time, update_by, remark)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.fileIntranetUrl}, #{entity.fileExtranetUrl}, #{entity.cameraIntranetUrl},
-            #{entity.cameraExtranetUrl}, #{entity.cameraIntranetAgent}, #{entity.cameraExtranetAgent},
+            #{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},
@@ -239,13 +241,13 @@
 
     <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, mqtt_intranet_url, mqtt_intranet_user, mqtt_intranet_password,
+        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, user_id, create_by, update_time, update_by, remark)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.fileIntranetUrl}, #{entity.fileExtranetUrl}, #{entity.cameraIntranetUrl},
-            #{entity.cameraExtranetUrl}, #{entity.cameraIntranetAgent}, #{entity.cameraExtranetAgent},
+            #{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},
@@ -258,6 +260,7 @@
         camera_extranet_url = values(camera_extranet_url),
         camera_intranet_agent = values(camera_intranet_agent),
         camera_extranet_agent = values(camera_extranet_agent),
+        ip_identify = values(ip_identify),
         mqtt_intranet_url = values(mqtt_intranet_url),
         mqtt_intranet_user = values(mqtt_intranet_user),
         mqtt_intranet_password = values(mqtt_intranet_password),
@@ -297,6 +300,9 @@
             <if test="cameraExtranetAgent != null and cameraExtranetAgent != ''">
                 camera_extranet_agent = #{cameraExtranetAgent},
             </if>
+            <if test="ipIdentify != null and ipIdentify != ''">
+                ip_identify = #{ipIdentify},
+            </if>
             <if test="mqttIntranetUrl != null and mqttIntranetUrl != ''">
                 mqtt_intranet_url = #{mqttIntranetUrl},
             </if>