소스 검색

【CHG】修改检测表PC端查询接口

xczzmn 4 년 전
부모
커밋
04c8ef12b6
15개의 변경된 파일193개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 6
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java
  2. 1 1
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcebMapper.java
  3. 6 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebService.java
  4. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java
  5. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java
  6. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java
  7. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java
  8. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java
  9. 11 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java
  10. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml
  11. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml
  12. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml
  13. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml
  14. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml
  15. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

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

@@ -59,22 +59,22 @@ public class BusJcebController extends BaseController {
     List<JcebRecordVo> list = null;
     switch (jcebTypeEnum){
       case Jddz:
-        list = jddzService.getList(query);
+        list = jddzService.getListByType(query);
         break;
       case Gjsfx:
-        list = gjsfxService.getList(query);
+        list = gjsfxService.getListByType(query);
         break;
       case Qmjcjl:
-        list = qmjcjlService.getList(query);
+        list = qmjcjlService.getListByType(query);
         break;
       case Xsjcjl:
-        list = xsjcjlService.getList(query);
+        list = xsjcjlService.getListByType(query);
         break;
       case Jyzqsjl:
-        list = jyzqsjlService.getList(query);
+        list = jyzqsjlService.getListByType(query);
         break;
       case Lbjghjl:
-        list = lbjghjlService.getList(query);
+        list = lbjghjlService.getListByType(query);
         break;
       default:
         break;

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

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

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

@@ -1,5 +1,6 @@
 package com.railway.business.catenary.service;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJceb;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
@@ -35,6 +36,11 @@ public interface IBusJcebService<T extends BusJceb> {
      */
     T getInfo(String id);
 
+    /**
+     * 查询列表
+     */
+    Page<JcebRecordVo> getListByType(JcebQueryVo query);
+
     /**
      * 查询列表
      */

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebGjsfxServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebGjsfx;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.mapper.BusJcebGjsfxMapper;
 import com.railway.business.catenary.service.IBusJcebGjsfxService;
 import com.railway.common.utils.SecurityUtils;
@@ -70,6 +73,14 @@ public class BusJcebGjsfxServiceImpl extends BusJcebServiceImpl<BusJcebGjsfx>
 		return busJcebGjsfxMapper.getInfo(id);
 	}
 
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+		return busJcebGjsfxMapper.getListByType(query);
+	}
+
 	/**
 	* 查询列表
 	*/

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJddzServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebJddz;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.mapper.BusJcebJddzMapper;
 import com.railway.business.catenary.service.IBusJcebJddzService;
 import com.railway.common.utils.SecurityUtils;
@@ -71,6 +74,14 @@ public class BusJcebJddzServiceImpl extends BusJcebServiceImpl<BusJcebJddz>
     return busJcebJddzMapper.getInfo(id);
   }
 
+  /**
+   * 查询列表
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    return busJcebJddzMapper.getListByType(query);
+  }
+
   /**
    * 查询列表
    */

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebJyzqsjlServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebJyzqsjl;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.mapper.BusJcebJyzqsjlMapper;
 import com.railway.business.catenary.service.IBusJcebJyzqsjlService;
 import com.railway.common.utils.SecurityUtils;
@@ -70,6 +73,14 @@ public class BusJcebJyzqsjlServiceImpl extends BusJcebServiceImpl<BusJcebJyzqsjl
 		return busJcebJyzqsjlMapper.getInfo(id);
 	}
 
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+		return busJcebJyzqsjlMapper.getListByType(query);
+	}
+
 	/**
 	* 查询列表
 	*/

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebLbjghjlServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebLbjghjl;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebLbjghjlMapper;
 import com.railway.business.catenary.service.IBusJcebLbjghjlService;
@@ -76,6 +79,14 @@ public class BusJcebLbjghjlServiceImpl extends BusJcebServiceImpl<BusJcebLbjghjl
 		return busJcebLbjghjlMapper.getInfo(id);
 	}
 
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+		return busJcebLbjghjlMapper.getListByType(query);
+	}
+
 	/**
 	* 查询列表
 	*/

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebQmjcjlServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebQmjcjl;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebQmjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebQmjcjlService;
@@ -76,6 +79,14 @@ public class BusJcebQmjcjlServiceImpl extends BusJcebServiceImpl<BusJcebQmjcjl>
 		return busJcebQmjcjlMapper.getInfo(id);
 	}
 
+	/**
+	 * 查询列表
+	 */
+	@Override
+	public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+		return busJcebQmjcjlMapper.getListByType(query);
+	}
+
 	/**
 	* 查询列表
 	*/

+ 11 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebXsjcjlServiceImpl.java

@@ -1,6 +1,9 @@
 package com.railway.business.catenary.service.impl;
 
+import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJcebXsjcjl;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.mapper.BusJcebXsjcjlMapper;
 import com.railway.business.catenary.service.IBusJcebXsjcjlService;
 import com.railway.common.utils.SecurityUtils;
@@ -71,6 +74,14 @@ public class BusJcebXsjcjlServiceImpl extends BusJcebServiceImpl<BusJcebXsjcjl>
     return busJcebXsjcjlMapper.getInfo(id);
   }
 
+  /**
+   * 查询列表
+   */
+  @Override
+  public Page<JcebRecordVo> getListByType(JcebQueryVo query) {
+    return busJcebXsjcjlMapper.getListByType(query);
+  }
+
   /**
    * 查询列表
    */

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

@@ -357,4 +357,23 @@
     </where>
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>

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

@@ -275,4 +275,23 @@
     </where>
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>

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

@@ -244,4 +244,23 @@
     </where>
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>

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

@@ -279,4 +279,23 @@
     order by str_to_date(a.ghsj,'%Y-%m-%d') desc
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>

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

@@ -322,4 +322,23 @@
     order by str_to_date(t.operation_date,'%Y-%m-%d') desc
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>

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

@@ -305,4 +305,23 @@
     </where>
   </select>
 
+  <select id="getListByType" resultMap="BaseResultMap">
+    SELECT
+    <include refid="Base_Column_List"/>
+    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>