Merge remote-tracking branch 'origin/master'

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

@@ -88,7 +88,35 @@ public class BusJcebController extends BaseController {
   @GetMapping(value = "listAll")
   public TableDataInfo listAll(JcebQueryVo query) {
     startPage();
-    List<JcebRecordVo> list = new ArrayList<>(); //qmjcjlService.getList(query);
+    List<JcebRecordVo> list = new ArrayList<>();
+    for(JcebTypeEnum jcebTypeEnum : JcebTypeEnum.values()){
+      JcebRecordVo jcebRecordVo = null;
+      switch (jcebTypeEnum){
+        case Jddz:
+          jcebRecordVo = jddzService.getCountByType(query);
+          break;
+        case Gjsfx:
+          jcebRecordVo = gjsfxService.getCountByType(query);
+          break;
+        case Qmjcjl:
+          jcebRecordVo = qmjcjlService.getCountByType(query);
+          break;
+        case Xsjcjl:
+          jcebRecordVo = xsjcjlService.getCountByType(query);
+          break;
+        case Jyzqsjl:
+          jcebRecordVo = jyzqsjlService.getCountByType(query);
+          break;
+        case Lbjghjl:
+          jcebRecordVo = lbjghjlService.getCountByType(query);
+          break;
+        default:
+          break;
+      }
+      if(null != jcebRecordVo) {
+        list.add(jcebRecordVo);
+      }
+    }
     return getDataTable(list);
   }
 

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusDmcgyq.java

@@ -49,15 +49,15 @@ public class BusDmcgyq extends BaseEntity{
     private String pillarArea;
 
     @ApiModelProperty(value = "股道")
-    @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
     private String stationTrack;
 
     @ApiModelProperty(value = "管辖模式")
-    @Length(min = 1, max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
     private String gxms;
 
     @ApiModelProperty(value = "分相处所")
-    @Length(min = 1, max = 100, message = "【分相处所】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 100, message = "【分相处所】长度必须介于 {min} 和 {max} 之间")
     private String fxcs;
 
     @ApiModelProperty(value = "分相名称")
@@ -65,7 +65,7 @@ public class BusDmcgyq extends BaseEntity{
     private String fxmc;
 
     @ApiModelProperty(value = "锚段号")
-    @Length(min = 1, max = 50, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 50, message = "【锚段号】长度必须介于 {min} 和 {max} 之间")
     private String mdh;
 
     @ApiModelProperty(value = "设备编号")
@@ -73,7 +73,7 @@ public class BusDmcgyq extends BaseEntity{
     private String sbbh;
 
     @ApiModelProperty(value = "轨枕类型")
-    @Length(min = 1, max = 50, message = "【轨枕类型】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 50, message = "【轨枕类型】长度必须介于 {min} 和 {max} 之间")
     private String gzlx;
 
     @ApiModelProperty(value = "磁枕里程")
@@ -83,19 +83,19 @@ public class BusDmcgyq extends BaseEntity{
     private Double fxzxlc;
 
     @ApiModelProperty(value = "生产厂家")
-    @Length(min = 1, max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 100, message = "【生产厂家】长度必须介于 {min} 和 {max} 之间")
     private String sccj;
 
     @ApiModelProperty(value = "型号")
-    @Length(min = 1, max = 100, message = "【型号】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 100, message = "【型号】长度必须介于 {min} 和 {max} 之间")
     private String xh;
 
     @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
     @ApiModelProperty(value = "数据编号")
-    @Length(min = 1, max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+    @Length(max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
     private String sjbh;
 
 }

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusJcxc.java

@@ -49,11 +49,11 @@ public class BusJcxc extends BaseEntity{
     private String pillarArea;
 
     @ApiModelProperty(value = "股道")
-    @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
     private String stationTrack;
 
     @ApiModelProperty(value = "管辖模式")
-    @Length(min = 1, max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
     private String gxms;
 
     @ApiModelProperty(value = "公里标")
@@ -61,7 +61,7 @@ public class BusJcxc extends BaseEntity{
     private String marker;
 
     @ApiModelProperty(value = "德式/国产")
-    @Length(min = 1, max = 10, message = "【德式/国产】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 10, message = "【德式/国产】长度必须介于 {min} 和 {max} 之间")
     private String dsgc;
 
     @ApiModelProperty(value = "线岔号")
@@ -69,19 +69,19 @@ public class BusJcxc extends BaseEntity{
     private String xch;
 
     @ApiModelProperty(value = "线岔类型")
-    @Length(min = 1, max = 20, message = "【线岔类型】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 20, message = "【线岔类型】长度必须介于 {min} 和 {max} 之间")
     private String xclx;
 
     @ApiModelProperty(value = "标准定位/非标准定位")
-    @Length(min = 1, max = 10, message = "【标准定位/非标准定位】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 10, message = "【标准定位/非标准定位】长度必须介于 {min} 和 {max} 之间")
     private String bzdw;
 
     @ApiModelProperty(value = "数据编号")
-    @Length(min = 1, max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
     private String sjbh;
 
     @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
 }

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusWjcxc.java

@@ -49,15 +49,15 @@ public class BusWjcxc extends BaseEntity{
     private String pillarArea;
 
     @ApiModelProperty(value = "股道")
-    @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")
     private String stationTrack;
 
     @ApiModelProperty(value = "管辖模式")
-    @Length(min = 1, max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【管辖模式】长度必须介于 {min} 和 {max} 之间")
     private String gxms;
 
     @ApiModelProperty(value = "道岔编号")
-    @Length(min = 1, max = 50, message = "【道岔编号】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【道岔编号】长度必须介于 {min} 和 {max} 之间")
     private String dcbh;
 
     @ApiModelProperty(value = "线岔号")
@@ -65,15 +65,15 @@ public class BusWjcxc extends BaseEntity{
     private String xch;
 
     @ApiModelProperty(value = "无交叉线岔类型")
-    @Length(min = 1, max = 50, message = "【无交叉线岔类型】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【无交叉线岔类型】长度必须介于 {min} 和 {max} 之间")
     private String wjcxclx;
 
     @ApiModelProperty(value = "数据编号")
-    @Length(min = 1, max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 50, message = "【数据编号】长度必须介于 {min} 和 {max} 之间")
     private String sjbh;
 
     @ApiModelProperty(value = "del_flag")
-    @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
+    @Length( max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
 }

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

@@ -26,6 +26,9 @@ public class JcebRecordVo implements Serializable {
     @ApiModelProperty(value = "记录人/操作人")
     private String operator;
 
+    @ApiModelProperty(value = "记录数")
+    private int count;
+
     @ApiModelProperty(value = "记录日期/操作日期")
     private Date operationDate;
 }

railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebMapper.java

@@ -32,6 +32,11 @@ public interface BusJcebMapper<T extends BusJceb> {
    */
   Page<JcebRecordVo> getListByType(JcebQueryVo query);
 
+  /**
+   * 查询列表
+   */
+  JcebRecordVo getCountByType(JcebQueryVo query);
+
   /**
    * 新增
    */

railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebService.java

@@ -36,6 +36,11 @@ public interface IBusJcebService<T extends BusJceb> {
      */
     Page<JcebRecordVo> getListByType(JcebQueryVo query);
 
+    /**
+     * 查询列表
+     */
+    JcebRecordVo getCountByType(JcebQueryVo query);
+
     /**
      * 查询列表
      */

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

@@ -49,6 +49,14 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 		return busJcebMapper.getListByType(query);
 	}
 
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public JcebRecordVo getCountByType(JcebQueryVo query) {
+		return busJcebMapper.getCountByType(query);
+	}
+
 	/**
 	 * 提交
 	 */

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

@@ -681,19 +681,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_blq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_blq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -232,20 +232,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -445,20 +445,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_fdfxjyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_fdfxjyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -157,19 +157,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_glkg t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_glkg t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -202,20 +202,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_jcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_jcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -239,22 +239,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_line t
     left join sys_dept d on t.dept_id = d.dept_id
     left join sys_dept d1 on d.parent_id = d1.dept_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.line_id = #{lineId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_line t
     left join sys_dept d on t.dept_id = d.dept_id
     left join sys_dept d1 on d.parent_id = d1.dept_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -178,18 +178,18 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_station t
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE del_flag='0' and station_id = #{stationId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_station t
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -175,20 +175,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_wjcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_wjcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -684,20 +684,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_pillar t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_pillar t
     left join v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

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

@@ -314,10 +314,10 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
@@ -338,10 +338,10 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

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

@@ -694,11 +694,11 @@
     SELECT
     distinct
     s.station_name,
-    a.*, d.dict_label as xingbie_text
+    a.*, dict.dict_label as xingbie_text
     FROM
     bus_jcb_glkg a
     LEFT JOIN base_station s ON a.station_id = s.station_id
-    LEFT JOIN sys_dict_data d ON (a.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE
     a.del_flag = '0'
     AND s.del_flag = '0'
@@ -708,11 +708,11 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     s.station_name,
-    a.*, d.dict_label as xingbie_text
+    a.*, dict.dict_label as xingbie_text
     FROM
     bus_jcb_glkg a
     LEFT JOIN base_station s ON a.station_id = s.station_id
-    LEFT JOIN sys_dict_data d ON (a.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_datadict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       a.del_flag = '0'
       AND s.del_flag = '0'

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

@@ -383,4 +383,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_gjsfx t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -301,4 +301,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_jddz t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -270,4 +270,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_jyzqsjl t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -305,4 +305,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_lbjghjl t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -348,4 +348,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_qmjcjl t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -331,4 +331,27 @@
     </where>
   </select>
 
+  <resultMap id="JcebCountResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">
+    <result column="c" property="count"/>
+    <result column="operation_date" property="operationDate"/>
+  </resultMap>
+
+  <select id="getCountByType" resultMap="JcebCountResultMap">
+    SELECT count(*) c, max(t.operation_date) as operation_date
+    FROM bus_jceb_xsjcjl t
+    LEFT JOIN v_station v on t.station_id = v.station_id
+    <where>
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
+      </if>
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_start=#{pillarCode}
+      </if>
+      <if test="operator!=null and operator!=''">
+        and t.operator=#{operator}
+      </if>
+    </where>
+  </select>
+
 </mapper>