Merge remote-tracking branch 'origin/master'

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -122,7 +122,7 @@ public class BusJcbGlkgController extends BaseController {
         WordUtils wordUtil = new WordUtils();
         //填充变量
         Map<String, Object> params = new HashMap<>();
-        params.put("${kgh}", info.getKgh());
+        params.put("${kgh}", info.getKgbh());
         params.put("${qj}", info.getStationName());
         params.put("${wd}", info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -54,7 +54,7 @@ public class BusJcbGlkg extends BaseEntity{
 
     @ApiModelProperty(value = "开关号")
     @Length(min = 1, max = 100, message = "【开关号】长度必须介于 {min} 和 {max} 之间")
-    private String kgh;
+    private String kgbh;
 
     @ApiModelProperty(value = "温度")
     @Length(min = 1, max = 10, message = "【温度】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -13,7 +13,7 @@
     <result column="xingbie" property="xingbie"/>
     <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_code" property="pillarCode"/>
-    <result column="kgh" property="kgh"/>
+    <result column="kgbh" property="kgbh"/>
     <result column="temperature" property="temperature"/>
     <result column="check_date" property="checkDate"/>
     <result column="jgx_a" property="jgxA"/>
@@ -89,7 +89,7 @@
     t.dept_station_id,
     t.xingbie,
     t.pillar_code,
-    t.kgh,
+    t.kgbh,
     t.temperature,
     t.check_date,
     t.jgx_a,
@@ -171,8 +171,8 @@
       <if test='null != pillarCode'>
         pillar_code,
       </if>
-      <if test='null != kgh'>
-        kgh,
+      <if test='null != kgbh'>
+        kgbh,
       </if>
       <if test='null != temperature'>
         temperature,
@@ -377,8 +377,8 @@
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
-      <if test='null != kgh'>
-        #{kgh},
+      <if test='null != kgbh'>
+        #{kgbh},
       </if>
       <if test='null != temperature'>
         #{temperature},
@@ -587,7 +587,7 @@
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
-      <if test='null != kgh'>kgh = #{kgh},</if>
+      <if test='null != kgbh'>kgbh = #{kgbh},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
       <if test='null != jgxA'>jgx_a = #{jgxA},</if>
@@ -699,8 +699,8 @@
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>
-      <if test="kgh!=null and kgh!=''">
-        and t.kgh=#{kgh}
+      <if test="kgbh!=null and kgbh!=''">
+        and t.kgbh=#{kgbh}
       </if>
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}
@@ -922,8 +922,8 @@
     <if test="pillarCode!=null and pillarCode!=''">
       and t.pillar_code=#{pillarCode}
     </if>
-    <if test="kgh!=null and kgh!=''">
-      and t.kgh=#{kgh}
+    <if test="kgbh!=null and kgbh!=''">
+      and t.kgbh=#{kgbh}
     </if>
     ORDER BY
         t.update_time DESC