【CHG】统一部分常见字段和表名

railway-business/src/main/java/com/railway/business/catenary/domain/vo/BusJlgzQueryVo.java

@@ -27,5 +27,5 @@ public class BusJlgzQueryVo implements Serializable {
     private String marker;
 
     @ApiModelProperty(value = "支柱范围")
-    private String zzfw;
+    private String pillarArea;
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJlgzServiceImpl.java

@@ -112,8 +112,8 @@ private BusJlgzPicMapper busJlgzPicMapper;
 
 	@Override
 	public List<BusJlgzListByZzVo> getListByZz(BusJlgzQueryVo busJlgzQueryVo) {
-		if (busJlgzQueryVo.getZzfw() == null) {
-			busJlgzQueryVo.setZzfw("500");
+		if (busJlgzQueryVo.getPillarArea() == null) {
+			busJlgzQueryVo.setPillarArea("500");
 		}
 		return busJlgzMapper.getListByZz(busJlgzQueryVo);
 	}

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

@@ -201,9 +201,6 @@
       <if test='null != stationId'>
         #{stationId},
       </if>
-      <if test='null != deptId'>
-        #{deptId},
-      </if>
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>

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

@@ -91,8 +91,8 @@
       <if test='null != xingbie'>
         xingbie,
       </if>
-      <if test='null != zzhfw'>
-        zzhfw,
+      <if test='null != pillarArea'>
+        pillar_area,
       </if>
       <if test='null != tianqi'>
         tianqi,
@@ -183,8 +183,8 @@
       <if test='null != xingbie'>
         #{xingbie},
       </if>
-      <if test='null != zzhfw'>
-        #{zzhfw},
+      <if test='null != pillarArea'>
+        #{pillarArea},
       </if>
       <if test='null != tianqi'>
         #{tianqi},
@@ -279,7 +279,7 @@
       <if test='null != stationId'>station_id = #{stationId},</if>
       <if test='null != fenxiang'>fenxiang = #{fenxiang},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != zzhfw'>zzhfw = #{zzhfw},</if>
+      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != tianqi'>tianqi = #{tianqi},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
@@ -337,98 +337,99 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM bus_jcb_dmcgyq
+    FROM bus_jcb_dmcgyq t
+    LEFT JOIN v_station v on t.station_id = v.station_id
     <where>
-      del_flag='0'
+      t.del_flag='0'
       <if test="stationId!=null and stationId!=''">
-        and station_id=#{stationId}
+        and t.station_id=#{stationId}
       </if>
       <if test="fenxiang!=null and fenxiang!=''">
-        and fenxiang=#{fenxiang}
+        and t.fenxiang=#{fenxiang}
       </if>
       <if test="xingbie!=null and xingbie!=''">
-        and xingbie=#{xingbie}
+        and t.xingbie=#{xingbie}
       </if>
-      <if test="zzhfw!=null and zzhfw!=''">
-        and zzhfw=#{zzhfw}
+      <if test="pillarArea!=null and pillarArea!=''">
+        and t.pillar_area=#{pillarArea}
       </if>
       <if test="tianqi!=null and tianqi!=''">
-        and tianqi=#{tianqi}
+        and t.tianqi=#{tianqi}
       </if>
       <if test="temperature!=null and temperature!=''">
-        and temperature=#{temperature}
+        and t.temperature=#{temperature}
       </if>
       <if test="checkDate!=null and checkDate!=''">
-        and check_date=#{checkDate}
+        and t.check_date=#{checkDate}
       </if>
       <if test="dgqwgAzlg!=null and dgqwgAzlg!=''">
-        and dgqwg_azlg=#{dgqwgAzlg}
+        and t.dgqwg_azlg=#{dgqwgAzlg}
       </if>
       <if test="dgqwgWzws!=null and dgqwgWzws!=''">
-        and dgqwg_wzws=#{dgqwgWzws}
+        and t.dgqwg_wzws=#{dgqwgWzws}
       </if>
       <if test="dgqwgBmqj!=null and dgqwgBmqj!=''">
-        and dgqwg_bmqj=#{dgqwgBmqj}
+        and t.dgqwg_bmqj=#{dgqwgBmqj}
       </if>
       <if test="dgqwgAzlgGzms!=null and dgqwgAzlgGzms!=''">
-        and dgqwg_azlg_gzms=#{dgqwgAzlgGzms}
+        and t.dgqwg_azlg_gzms=#{dgqwgAzlgGzms}
       </if>
       <if test="dgqwgWzwsGzms!=null and dgqwgWzwsGzms!=''">
-        and dgqwg_wzws_gzms=#{dgqwgWzwsGzms}
+        and t.dgqwg_wzws_gzms=#{dgqwgWzwsGzms}
       </if>
       <if test="dgqwgBmqjGzms!=null and dgqwgBmqjGzms!=''">
-        and dgqwg_bmqj_gzms=#{dgqwgBmqjGzms}
+        and t.dgqwg_bmqj_gzms=#{dgqwgBmqjGzms}
       </if>
       <if test="bspwgBsqx!=null and bspwgBsqx!=''">
-        and bspwg_bsqx=#{bspwgBsqx}
+        and t.bspwg_bsqx=#{bspwgBsqx}
       </if>
       <if test="bspwgBsqxGzms!=null and bspwgBsqxGzms!=''">
-        and bspwg_bsqx_gzms=#{bspwgBsqxGzms}
+        and t.bspwg_bsqx_gzms=#{bspwgBsqxGzms}
       </if>
       <if test="bspwgAzlg!=null and bspwgAzlg!=''">
-        and bspwg_azlg=#{bspwgAzlg}
+        and t.bspwg_azlg=#{bspwgAzlg}
       </if>
       <if test="bspwgAzlgGzms!=null and bspwgAzlgGzms!=''">
-        and bspwg_azlg_gzms=#{bspwgAzlgGzms}
+        and t.bspwg_azlg_gzms=#{bspwgAzlgGzms}
       </if>
       <if test="dgqclG1!=null and dgqclG1!=''">
-        and dgqcl_g1=#{dgqclG1}
+        and t.dgqcl_g1=#{dgqclG1}
       </if>
       <if test="dgqclG2!=null and dgqclG2!=''">
-        and dgqcl_g2=#{dgqclG2}
+        and t.dgqcl_g2=#{dgqclG2}
       </if>
       <if test="dgqclG3!=null and dgqclG3!=''">
-        and dgqcl_g3=#{dgqclG3}
+        and t.dgqcl_g3=#{dgqclG3}
       </if>
       <if test="dgqclG4!=null and dgqclG4!=''">
-        and dgqcl_g4=#{dgqclG4}
+        and t.dgqcl_g4=#{dgqclG4}
       </if>
       <if test="sbzt!=null and sbzt!=''">
-        and sbzt=#{sbzt}
+        and t.sbzt=#{sbzt}
       </if>
       <if test="checkUser!=null and checkUser!=''">
-        and check_user=#{checkUser}
+        and t.check_user=#{checkUser}
       </if>
       <if test="czwt!=null and czwt!=''">
-        and czwt=#{czwt}
+        and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and submit_state=#{submitState}
+        and t.submit_state=#{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
+        and t.create_by=#{createBy}
       </if>
       <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
+        and t.create_time=#{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
+        and t.update_by=#{updateBy}
       </if>
       <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
+        and t.update_time=#{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
-        and user_id=#{userId}
+        and t.user_id=#{userId}
       </if>
     </where>
   </select>

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

@@ -119,20 +119,20 @@
       <if test='null != fdfxjyqId'>
         fdfxjyq_id,
       </if>
-      <if test='null != qj'>
-        qj,
+      <if test='null != stationId'>
+        station_id,
       </if>
-      <if test='null != zzh'>
-        zzh,
+      <if test='null != pillarCode'>
+        pillar_code,
       </if>
       <if test='null != fdh'>
         fdh,
       </if>
-      <if test='null != wd'>
-        wd,
+      <if test='null != temperature'>
+        temperature,
       </if>
-      <if test='null != jcrq'>
-        jcrq,
+      <if test='null != checkDate'>
+        check_date,
       </if>
       <if test='null != picUrl'>
         pic_url,
@@ -215,8 +215,8 @@
       <if test='null != sbztDesc'>
         sbzt_desc,
       </if>
-      <if test='null != jcr'>
-        jcr,
+      <if test='null != checkUser'>
+        check_user,
       </if>
       <if test='null != confirmUser'>
         confirm_user,
@@ -265,20 +265,20 @@
       <if test='null != fdfxjyqId'>
         #{fdfxjyqId},
       </if>
-      <if test='null != qj'>
-        #{qj},
+      <if test='null != stationId'>
+        #{stationId},
       </if>
-      <if test='null != zzh'>
-        #{zzh},
+      <if test='null != pillarCode'>
+        #{pillarCode},
       </if>
       <if test='null != fdh'>
         #{fdh},
       </if>
-      <if test='null != wd'>
-        #{wd},
+      <if test='null != temperature'>
+        #{temperature},
       </if>
-      <if test='null != jcrq'>
-        #{jcrq},
+      <if test='null != checkDate'>
+        #{checkDate},
       </if>
       <if test='null != picUrl'>
         #{picUrl},
@@ -361,8 +361,8 @@
       <if test='null != sbztDesc'>
         #{sbztDesc},
       </if>
-      <if test='null != jcr'>
-        #{jcr},
+      <if test='null != checkUser'>
+        #{checkUser},
       </if>
       <if test='null != confirmUser'>
         #{confirmUser},
@@ -420,10 +420,10 @@
     <set>
       <if test='null != fdfxjyqId'>fdfxjyq_id = #{fdfxjyqId},</if>
       <if test='null != stationId'>station_id = #{stationId},</if>
-      <if test='null != zzh'>zzh = #{zzh},</if>
+      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != fdh'>fdh = #{fdh},</if>
-      <if test='null != wd'>wd = #{wd},</if>
-      <if test='null != jcrq'>jcrq = #{jcrq},</if>
+      <if test='null != temperature'>temperature = #{temperature},</if>
+      <if test='null != checkDate'>check_date = #{checkDate},</if>
       <if test='null != picUrl'>pic_url = #{picUrl},</if>
       <if test='null != pointA'>point_a = #{pointA},</if>
       <if test='null != pointB'>point_b = #{pointB},</if>
@@ -451,7 +451,7 @@
       <if test='null != lbjztXhjDesc'>lbjzt_xhj_desc = #{lbjztXhjDesc},</if>
       <if test='null != sbzt'>sbzt = #{sbzt},</if>
       <if test='null != sbztDesc'>sbzt_desc = #{sbztDesc},</if>
-      <if test='null != jcr'>jcr = #{jcr},</if>
+      <if test='null != checkUser'>check_user = #{checkUser},</if>
       <if test='null != confirmUser'>confirm_user = #{confirmUser},</if>
       <if test='null != czwt'>czwt = #{czwt},</if>
       <if test='null != createBy'>create_by = #{createBy},</if>
@@ -488,10 +488,10 @@
     a.id,
     a.fdfxjyq_id,
     c.station_name,
-    a.zzh,
+    a.pillar_code,
     a.fdh,
-    a.wd,
-    a.jcrq,
+    a.temperature,
+    a.check_date,
     a.pic_url,
     a.point_a,
     a.point_b,
@@ -519,7 +519,7 @@
     a.lbjzt_xhj_desc,
     a.sbzt,
     a.sbzt_desc,
-    a.jcr,
+    a.check_user,
     a.confirm_user,
     a.czwt,
     a.create_by,
@@ -550,10 +550,10 @@
     a.id,
     a.fdfxjyq_id,
     c.station_name,
-    a.zzh,
+    a.pillar_code,
     a.fdh,
-    a.wd,
-    a.jcrq,
+    a.temperature,
+    a.check_date,
     a.pic_url,
     a.point_a,
     a.point_b,
@@ -581,7 +581,7 @@
     a.lbjzt_xhj_desc,
     a.sbzt,
     a.sbzt_desc,
-    a.jcr,
+    a.check_user,
     a.confirm_user,
     a.czwt,
     a.create_by,
@@ -610,17 +610,17 @@
       <if test="stationId!=null and stationId!=''">
         and a.station_id=#{stationId}
       </if>
-      <if test="zzh!=null and zzh!=''">
-        and a.zzh=#{zzh}
+      <if test="pillarCode!=null and pillarCode!=''">
+        and a.pillar_code=#{pillarCode}
       </if>
       <if test="fdh!=null and fdh!=''">
         and a.fdh=#{fdh}
       </if>
-      <if test="wd!=null and wd!=''">
-        and a.wd=#{wd}
+      <if test="temperature!=null and temperature!=''">
+        and a.temperature=#{temperature}
       </if>
-      <if test="jcrq!=null and jcrq!=''">
-        and a.jcrq=#{jcrq}
+      <if test="checkDate!=null and checkDate!=''">
+        and a.check_date=#{checkDate}
       </if>
       <if test="picUrl!=null and picUrl!=''">
         and a.pic_url=#{picUrl}
@@ -703,8 +703,8 @@
       <if test="sbztDesc!=null and sbztDesc!=''">
         and a.sbzt_desc=#{sbztDesc}
       </if>
-      <if test="jcr!=null and jcr!=''">
-        and a.jcr=#{jcr}
+      <if test="checkUser!=null and checkUser!=''">
+        and a.check_user=#{checkUser}
       </if>
       <if test="confirmUser!=null and confirmUser!=''">
         and a.confirm_user=#{confirmUser}
@@ -754,21 +754,21 @@
   <select id="getLastOne" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM
-    bus_jcb_fdfxjyq
+    FROM bus_jcb_fdfxjyq t
+    LEFT JOIN v_station v on t.station_id = v.station_id
     WHERE
-    submit_state = '1'and del_flag = '0'
+    t.submit_state = '1'and t.del_flag = '0'
     <if test="stationId!=null and stationId!=''">
-      and station_id=#{stationId}
+      and t.station_id=#{stationId}
     </if>
-    <if test="zzh!=null and zzh!=''">
-      and zzh=#{zzh}
+    <if test="pillarCode!=null and pillarCode!=''">
+      and t.pillar_code=#{pillarCode}
     </if>
     <if test="fdh!=null and fdh!=''">
-      and fdh=#{fdh}
+      and t.fdh=#{fdh}
     </if>
     <if test="fdfxjyqId!=null and fdfxjyqId!=''">
-      and fdfxjyq_id=#{fdfxjyqId}
+      and t.fdfxjyq_id=#{fdfxjyqId}
     </if>
 
     ORDER BY

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

@@ -472,143 +472,144 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM bus_jcb_jcxc
+    FROM bus_jcb_jcxc t
+    LEFT JOIN v_station v on t.station_id = v.station_id
     <where>
-      del_flag='0'
-      <if test="zhanqujian!=null and zhanqujian!=''">
-        and zhanqujian=#{zhanqujian}
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
       </if>
-      <if test="zhizhuhao!=null and zhizhuhao!=''">
-        and zhizhuhao=#{zhizhuhao}
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
       </if>
       <if test="xianchahao!=null and xianchahao!=''">
-        and xianchahao=#{xianchahao}
+        and t.xianchahao=#{xianchahao}
       </if>
       <if test="temperature!=null and temperature!=''">
-        and temperature=#{temperature}
+        and t.temperature=#{temperature}
       </if>
       <if test="checkDate!=null and checkDate!=''">
-        and check_date=#{checkDate}
+        and t.check_date=#{checkDate}
       </if>
       <if test="gz1lcz!=null and gz1lcz!=''">
-        and gz1lcz=#{gz1lcz}
+        and t.gz1lcz=#{gz1lcz}
       </if>
       <if test="gz2lcz!=null and gz2lcz!=''">
-        and gz2lcz=#{gz2lcz}
+        and t.gz2lcz=#{gz2lcz}
       </if>
       <if test="zglcz!=null and zglcz!=''">
-        and zglcz=#{zglcz}
+        and t.zglcz=#{zglcz}
       </if>
       <if test="qglcz!=null and qglcz!=''">
-        and qglcz=#{qglcz}
+        and t.qglcz=#{qglcz}
       </if>
       <if test="ngj!=null and ngj!=''">
-        and ngj=#{ngj}
+        and t.ngj=#{ngj}
       </if>
       <if test="plz!=null and plz!=''">
-        and plz=#{plz}
+        and t.plz=#{plz}
       </if>
       <if test="xcxzgazlg!=null and xcxzgazlg!=''">
-        and xcxzgazlg=#{xcxzgazlg}
+        and t.xcxzgazlg=#{xcxzgazlg}
       </if>
       <if test="xcxzgazlgGzms!=null and xcxzgazlgGzms!=''">
-        and xcxzgazlg_gzms=#{xcxzgazlgGzms}
+        and t.xcxzgazlg_gzms=#{xcxzgazlgGzms}
       </if>
       <if test="hdjx!=null and hdjx!=''">
-        and hdjx=#{hdjx}
+        and t.hdjx=#{hdjx}
       </if>
       <if test="hdjxGzms!=null and hdjxGzms!=''">
-        and hdjx_gzms=#{hdjxGzms}
+        and t.hdjx_gzms=#{hdjxGzms}
       </if>
       <if test="fhzzsq!=null and fhzzsq!=''">
-        and fhzzsq=#{fhzzsq}
+        and t.fhzzsq=#{fhzzsq}
       </if>
       <if test="fhzzsqGzms!=null and fhzzsqGzms!=''">
-        and fhzzsq_gzms=#{fhzzsqGzms}
+        and t.fhzzsq_gzms=#{fhzzsqGzms}
       </if>
       <if test="dqssxx!=null and dqssxx!=''">
-        and dqssxx=#{dqssxx}
+        and t.dqssxx=#{dqssxx}
       </if>
       <if test="dqssxxGzms!=null and dqssxxGzms!=''">
-        and dqssxx_gzms=#{dqssxxGzms}
+        and t.dqssxx_gzms=#{dqssxxGzms}
       </if>
       <if test="lswst!=null and lswst!=''">
-        and lswst=#{lswst}
+        and t.lswst=#{lswst}
       </if>
       <if test="lswstGzms!=null and lswstGzms!=''">
-        and lswst_gzms=#{lswstGzms}
+        and t.lswst_gzms=#{lswstGzms}
       </if>
       <if test="xzgldydx!=null and xzgldydx!=''">
-        and xzgldydx=#{xzgldydx}
+        and t.xzgldydx=#{xzgldydx}
       </if>
       <if test="xzgldydxGzms!=null and xzgldydxGzms!=''">
-        and xzgldydx_gzms=#{xzgldydxGzms}
+        and t.xzgldydx_gzms=#{xzgldydxGzms}
       </if>
       <if test="dxztlh!=null and dxztlh!=''">
-        and dxztlh=#{dxztlh}
+        and t.dxztlh=#{dxztlh}
       </if>
       <if test="dxztlhGzms!=null and dxztlhGzms!=''">
-        and dxztlh_gzms=#{dxztlhGzms}
+        and t.dxztlh_gzms=#{dxztlhGzms}
       </if>
       <if test="czjj!=null and czjj!=''">
-        and czjj=#{czjj}
+        and t.czjj=#{czjj}
       </if>
       <if test="lgzzgc!=null and lgzzgc!=''">
-        and lgzzgc=#{lgzzgc}
+        and t.lgzzgc=#{lgzzgc}
       </if>
       <if test="gzyfzgc!=null and gzyfzgc!=''">
-        and gzyfzgc=#{gzyfzgc}
+        and t.gzyfzgc=#{gzyfzgc}
       </if>
       <if test="wxj!=null and wxj!=''">
-        and wxj=#{wxj}
+        and t.wxj=#{wxj}
       </if>
       <if test="wxjGzms!=null and wxjGzms!=''">
-        and wxj_gzms=#{wxjGzms}
+        and t.wxj_gzms=#{wxjGzms}
       </if>
       <if test="hddxxjzt!=null and hddxxjzt!=''">
-        and hddxxjzt=#{hddxxjzt}
+        and t.hddxxjzt=#{hddxxjzt}
       </if>
       <if test="hddxxjztGzms!=null and hddxxjztGzms!=''">
-        and hddxxjzt_gzms=#{hddxxjztGzms}
+        and t.hddxxjzt_gzms=#{hddxxjztGzms}
       </if>
       <if test="jcdxzt!=null and jcdxzt!=''">
-        and jcdxzt=#{jcdxzt}
+        and t.jcdxzt=#{jcdxzt}
       </if>
       <if test="jcdxztGzms!=null and jcdxztGzms!=''">
-        and jcdxzt_gzms=#{jcdxztGzms}
+        and t.jcdxzt_gzms=#{jcdxztGzms}
       </if>
       <if test="dljxzt!=null and dljxzt!=''">
-        and dljxzt=#{dljxzt}
+        and t.dljxzt=#{dljxzt}
       </if>
       <if test="dljxztGzms!=null and dljxztGzms!=''">
-        and dljxzt_gzms=#{dljxztGzms}
+        and t.dljxzt_gzms=#{dljxztGzms}
       </if>
       <if test="sbzt!=null and sbzt!=''">
-        and sbzt=#{sbzt}
+        and t.sbzt=#{sbzt}
       </if>
       <if test="checkUser!=null and checkUser!=''">
-        and check_user=#{checkUser}
+        and t.check_user=#{checkUser}
       </if>
       <if test="czwt!=null and czwt!=''">
-        and czwt=#{czwt}
+        and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and submit_state=#{submitState}
+        and t.submit_state=#{submitState}
       </if>
       <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
+        and t.create_by=#{createBy}
       </if>
       <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
+        and t.create_time=#{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
+        and t.update_by=#{updateBy}
       </if>
       <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
+        and t.update_time=#{updateTime}
       </if>
       <if test="userId!=null and userId!=''">
-        and user_id=#{userId}
+        and t.user_id=#{userId}
       </if>
     </where>
   </select>

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

@@ -45,7 +45,7 @@
     <selectKey keyProperty="id" order="AFTER" resultType="String">
       select @@IDENTITY as id
     </selectKey>
-    INSERT INTO bus_jlgz
+    INSERT INTO base_jlgz
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test='null != lineId'>
         line_id,
@@ -125,13 +125,13 @@
   </insert>
 
   <delete id="delete">
-    UPDATE bus_jlgz
+    UPDATE base_jlgz
     set del_flag='1'
     WHERE id = #{id}
   </delete>
 
   <update id="update" parameterType="com.railway.business.catenary.domain.BusJlgz">
-    UPDATE bus_jlgz
+    UPDATE base_jlgz
     <set>
       <if test='null != lineId'>line_id = #{lineId},</if>
       <if test='null != substationId'>substation_id = #{substationId},</if>
@@ -159,9 +159,9 @@
     dict2.dict_label as yylx_text,
     a.*
     FROM
-    bus_jlgz a
-    LEFT JOIN bus_line line ON a.line_id = line.line_id
-    LEFT JOIN bus_substation sub ON a.substation_id = sub.substation_id
+    base_jlgz a
+    LEFT JOIN base_line line ON a.line_id = line.line_id
+    LEFT JOIN base_substation sub ON a.substation_id = sub.substation_id
     LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
     WHERE
@@ -179,9 +179,9 @@
     dict2.dict_label as yylx_text,
     a.*
     FROM
-    bus_jlgz a
-    LEFT JOIN bus_line line ON a.line_id = line.line_id
-    LEFT JOIN bus_substation sub ON a.substation_id = sub.substation_id
+    base_jlgz a
+    LEFT JOIN base_line line ON a.line_id = line.line_id
+    LEFT JOIN base_substation sub ON a.substation_id = sub.substation_id
     LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
     <where>
@@ -225,7 +225,7 @@
         and a.del_flag=#{delFlag}
       </if>
     </where>
-    <if test="orderBy!=null and orderBy!=''">
+<!--    <if test="orderBy!=null and orderBy!=''">
       order by a.${orderBy}
     </if>
     <if test="isAsc!=null and isAsc!=''">
@@ -236,7 +236,7 @@
         desc
       </if>
     </if>
-
+-->
   </select>
 
   <select id="getListByZz" resultType="com.railway.business.catenary.domain.vo.BusJlgzListByZzVo">
@@ -249,9 +249,9 @@
     dict1.dict_label as xingbie_text,
     dict2.dict_label as yylx_text,
     a.*
-    FROM bus_jlgz a
-    LEFT JOIN bus_line line ON a.line_id = line.line_id
-    LEFT JOIN bus_substation sub ON a.substation_id = sub.substation_id
+    FROM base_jlgz a
+    LEFT JOIN base_line line ON a.line_id = line.line_id
+    LEFT JOIN base_substation sub ON a.substation_id = sub.substation_id
     LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (a.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
     WHERE a.del_flag = '0'
@@ -260,12 +260,12 @@
     ) D,
     (
     SELECT distinct zzdzxx.marker
-    FROM bus_zzdzxx zzdzxx,
+    FROM base_zzdzxx zzdzxx,
     (
     SELECT zz.id,
-    zz.zzh,
+    zz.pillar_code,
     zz.marker
-    FROM bus_zzdzxx zz
+    FROM base_zzdzxx zz
     WHERE 1 = 1
     <if test="query.lineId != null and query.lineId != ''">
       AND zz.line_id = #{query.lineId}
@@ -273,15 +273,15 @@
     <if test="query.xingbie != null and query.xingbie != ''">
       AND zz.xingbie = #{query.xingbie}
     </if>
-    <if test="query.zzh != null and query.zzh != ''">
-      AND zz.zzh = #{query.zzh}
+    <if test="query.pillarCode != null and query.pillarCode != ''">
+      AND zz.pillar_code = #{query.pillarCode}
     </if>
     <if test="query.marker != null and query.marker != ''">
       AND zz.marker = #{query.marker}
     </if>
     ) B
-    WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.zzfw} + 0.0) AND (B.marker + 0.0) +
-    (#{query.zzfw} + 0.0)
+    WHERE (zzdzxx.marker + 0.0) BETWEEN (B.marker + 0.0) - (#{query.pillarArea} + 0.0) AND (B.marker + 0.0) +
+    (#{query.pillarArea} + 0.0)
     ) H
     WHERE D.marker = H.marker
     ) jlgz