Merge remote-tracking branch 'origin/master'

railway-admin/src/main/java/com/railway/web/core/config/SwaggerConfig.java

@@ -148,7 +148,6 @@ public class SwaggerConfig {
         "/business/catenary/bus/sdtz/.*",
         "/business/catenary/bus/wjcxc/.*",
         "/business/catenary/bus/zzdzxx/.*",
-        "/business/catenary/bus/prevent/.*",
     });
   }
 
@@ -178,6 +177,20 @@ public class SwaggerConfig {
     });
   }
 
+  /**
+   * 九防台账分组接口
+   *
+   * @return Docket
+   */
+  @Bean
+  public Docket preventDocket(Environment environment) {
+    return getDocket(environment, "005.九防台账", "九防台账", "九防台账", new String[]{
+        "/login",
+        "/business/catenary/bus/prevent/.*",
+        "/business/baseinfo/base/prevent/.*",
+    });
+  }
+
   /**
    * 创建API
    */
@@ -275,11 +288,12 @@ public class SwaggerConfig {
    * @return ApiInfo
    */
   private ApiInfo apiInfo(String title, String description) {
+    String url = "http://railway-web.iamsee.com/";
+    String email = "railway@railway.com";
     return new ApiInfoBuilder()
         .title(title)
         .description(description)
-        .contact(
-            new Contact(railwayConfig.getName(), "railway-web.iamsee.com", "railway@railway.com"))
+        .contact(new Contact(railwayConfig.getName(), url, email))
         .version("版本号:" + railwayConfig.getVersion())
         .build();
   }

railway-business/src/main/resources/mapper/baseinfo/BusLineMapper.xml

@@ -18,6 +18,10 @@
     <result column="line_yylc" property="lineYylc"/>
     <result column="line_start_marker" property="lineStartMarker"/>
     <result column="line_end_marker" property="lineEndMarker"/>
+    <result column="up_start_marker" property="upStartMarker"/>
+    <result column="up_end_marker" property="upEndMarker"/>
+    <result column="down_start_marker" property="downStartMarker"/>
+    <result column="ldown_end_marker" property="downEndMarker"/>
     <result column="line_gdfs" property="lineGdfs"/>
     <result column="line_xglx" property="lineXglx"/>
     <result column="line_qt" property="lineQt"/>
@@ -45,6 +49,10 @@
     t.line_yylc,
     t.line_start_marker,
     t.line_end_marker,
+    t.up_start_marker,
+    t.up_end_marker,
+    t.down_start_marker,
+    t.down_end_marker,
     t.line_gdfs,
     t.line_xglx,
     t.line_qt,
@@ -97,6 +105,18 @@
       <if test='null != lineEndMarker'>
         line_end_marker,
       </if>
+      <if test='null != upStartMarker'>
+        up_start_marker,
+      </if>
+      <if test='null != upEndMarker'>
+        up_end_marker,
+      </if>
+      <if test='null != downStartMarker'>
+        down_start_marker,
+      </if>
+      <if test='null != downEndMarker'>
+        down_end_marker,
+      </if>
       <if test='null != lineGdfs'>
         line_gdfs,
       </if>
@@ -165,6 +185,18 @@
       <if test='null != lineEndMarker'>
         #{lineEndMarker},
       </if>
+      <if test='null != upStartMarker'>
+        #{upStartMarker},
+      </if>
+      <if test='null != upEndMarker'>
+        #{upEndMarker},
+      </if>
+      <if test='null != downStartMarker'>
+        #{downStartMarker},
+      </if>
+      <if test='null != downEndMarker'>
+        #{downEndMarker},
+      </if>
       <if test='null != lineGdfs'>
         #{lineGdfs},
       </if>
@@ -221,6 +253,10 @@
       <if test='null != lineYylc'>line_yylc = #{lineYylc},</if>
       <if test='null != lineStartMarker'>line_start_marker = #{lineStartMarker},</if>
       <if test='null != lineEndMarker'>line_end_marker = #{lineEndMarker},</if>
+      <if test='null != upStartMarker'>up_start_marker = #{upStartMarker},</if>
+      <if test='null != upEndMarker'>up_end_marker = #{upEndMarker},</if>
+      <if test='null != downStartMarker'>down_start_marker = #{downStartMarker},</if>
+      <if test='null != downEndMarker'>down_end_marker = #{downEndMarker},</if>
       <if test='null != lineGdfs'>line_gdfs = #{lineGdfs},</if>
       <if test='null != lineXglx'>line_xglx = #{lineXglx},</if>
       <if test='null != lineQt'>line_qt = #{lineQt},</if>
@@ -281,12 +317,6 @@
       <if test="lineYylc!=null and lineYylc!=''">
         and t.line_yylc=#{lineYylc}
       </if>
-      <if test="lineStartMarker!=null and lineStartMarker!=''">
-        and t.line_start_marker=#{lineStartMarker}
-      </if>
-      <if test="lineEndMarker!=null and lineEndMarker!=''">
-        and t.line_end_marker=#{lineEndMarker}
-      </if>
       <if test="lineGdfs!=null and lineGdfs!=''">
         and t.line_gdfs=#{lineGdfs}
       </if>