Ver Fonte

增加统一的筛选区间接口

ZhaoMn há 4 anos atrás
pai
commit
6aed98c963
31 ficheiros alterados com 409 adições e 5 exclusões
  1. 40 1
      railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java
  2. 10 0
      railway-business/src/main/java/com/railway/business/baseinfo/mapper/BaseStationMapper.java
  3. 9 0
      railway-business/src/main/java/com/railway/business/baseinfo/service/IBaseStationService.java
  4. 13 0
      railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseStationServiceImpl.java
  5. 22 0
      railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebStationVo.java
  6. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbBlqMapper.java
  7. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbDmcgyqMapper.java
  8. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbFdfxjyqMapper.java
  9. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbGlkgMapper.java
  10. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbJcxcMapper.java
  11. 9 0
      railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbWjcxcMapper.java
  12. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java
  13. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbDmcgyqService.java
  14. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbFdfxjyqService.java
  15. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java
  16. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbJcxcService.java
  17. 8 0
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbWjcxcService.java
  18. 0 1
      railway-business/src/main/java/com/railway/business/catenary/service/IBusJcebService.java
  19. 13 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java
  20. 13 3
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java
  21. 13 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java
  22. 12 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java
  23. 13 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java
  24. 13 0
      railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java
  25. 20 0
      railway-business/src/main/resources/mapper/baseinfo/BaseStationMapper.xml
  26. 20 0
      railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml
  27. 20 0
      railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml
  28. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml
  29. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml
  30. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml
  31. 19 0
      railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

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

@@ -1,8 +1,10 @@
 package com.railway.web.controller.business.catenary;
 
+import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebTypeEnum;
 import com.railway.business.catenary.enums.SortTypeEnum;
 import com.railway.business.catenary.service.IBusJcbBlqService;
@@ -58,6 +60,8 @@ public class BusJcebController extends BaseController {
   private final IBusJcbJcxcService jcxcService;
   private final IBusJcbWjcxcService wjcxcService;
 
+  private final IBaseStationService stationService;
+
   private final ISysFileService fileService;
 
   public BusJcebController(
@@ -72,7 +76,9 @@ public class BusJcebController extends BaseController {
       IBusJcbFdfxjyqService fdfxjyqService,
       IBusJcbGlkgService glkgService,
       IBusJcbJcxcService jcxcService,
-      IBusJcbWjcxcService wjcxcService, ISysFileService fileService) {
+      IBusJcbWjcxcService wjcxcService,
+      IBaseStationService stationService,
+      ISysFileService fileService) {
     this.xsjcjlService = xsjcjlService;
     this.qmjcjlService = qmjcjlService;
     this.lbjghjlService = lbjghjlService;
@@ -85,14 +91,47 @@ public class BusJcebController extends BaseController {
     this.glkgService = glkgService;
     this.jcxcService = jcxcService;
     this.wjcxcService = wjcxcService;
+    this.stationService = stationService;
     this.fileService = fileService;
   }
 
+  @ApiOperation(value = "筛选车间列表")
+  @GetMapping(value = "listStation")
+  public TableDataInfo listStation(JcebQueryVo query) {
+    JcebQueryUtil.setBusJcebQuery(query);
+    JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
+    List<JcebStationVo> list;
+    switch (jcebTypeEnum) {
+      case Blq:
+        list = blqService.listStation(query);
+        break;
+      case Dmcgyq:
+        list = dmcgyqService.listStation(query);
+        break;
+      case Fdfxjyq:
+        list = fdfxjyqService.listStation(query);
+        break;
+      case Glkg:
+        list = glkgService.listStation(query);
+        break;
+      case Jcxc:
+        list = jcxcService.listStation(query);
+        break;
+      case Wjcxc:
+        list = wjcxcService.listStation(query);
+        break;
+      default:
+        list = stationService.listStation(query);
+        break;
+    }
+    return getDataTable(list);
+  }
 
   @ApiOperation(value = "列表")
   @GetMapping(value = "listByType")
   public TableDataInfo listByType(JcebQueryVo query) {
     startPage();
+    JcebQueryUtil.setBusJcebQuery(query);
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
     List<JcebRecordVo> list = null;
     switch (jcebTypeEnum) {

+ 10 - 0
railway-business/src/main/java/com/railway/business/baseinfo/mapper/BaseStationMapper.java

@@ -4,6 +4,9 @@ import com.github.pagehelper.Page;
 import com.railway.business.baseinfo.domain.BaseStation;
 import com.railway.business.baseinfo.domain.vo.BaseStationQuery;
 import com.railway.business.baseinfo.domain.vo.BaseStationVo;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -48,4 +51,11 @@ public interface BaseStationMapper {
    */
   Page<BaseStation> getStationList(BaseStationQuery query);
 
+  /**
+   * 查询筛选车间列表
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/baseinfo/service/IBaseStationService.java

@@ -4,6 +4,8 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.domain.BaseStation;
 import com.railway.business.baseinfo.domain.vo.BaseStationQuery;
 import com.railway.business.baseinfo.domain.vo.BaseStationVo;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 
 /**
@@ -53,4 +55,11 @@ public interface IBaseStationService {
    */
   List<BaseStation> getListByDeptId(BaseStationQuery query);
 
+  /**
+   * 查询筛选车间列表
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 13 - 0
railway-business/src/main/java/com/railway/business/baseinfo/service/impl/BaseStationServiceImpl.java

@@ -7,6 +7,8 @@ import com.railway.business.baseinfo.domain.vo.BaseStationVo;
 import com.railway.business.baseinfo.mapper.BaseDeptStationMapper;
 import com.railway.business.baseinfo.mapper.BaseStationMapper;
 import com.railway.business.baseinfo.service.IBaseStationService;
+import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.common.enums.DelFlagEnum;
 import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.bean.BeanUtils;
@@ -151,4 +153,15 @@ public class BaseStationServiceImpl implements IBaseStationService {
     return baseStationMapper.getStationList(query);
   }
 
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return baseStationMapper.listStation(query);
+  }
+
 }

+ 22 - 0
railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebStationVo.java

@@ -0,0 +1,22 @@
+package com.railway.business.catenary.domain.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * 检测表筛选车间列表
+ *
+ * @author zhaomn
+ */
+@Data
+public class JcebStationVo implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @ApiModelProperty(value = "记录数")
+  private Long stationId;
+
+  @ApiModelProperty(value = "记录日期/操作日期")
+  private String stationName;
+}

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbBlqMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbBlq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -67,4 +69,11 @@ public interface BusJcbBlqMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbDmcgyqMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbDmcgyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -72,4 +74,11 @@ public interface BusJcbDmcgyqMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbFdfxjyqMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -67,4 +69,11 @@ public interface BusJcbFdfxjyqMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbGlkgMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -69,4 +71,11 @@ public interface BusJcbGlkgMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbJcxcMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbJcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -67,4 +69,11 @@ public interface BusJcbJcxcMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 9 - 0
railway-business/src/main/java/com/railway/business/catenary/mapper/BusJcbWjcxcMapper.java

@@ -5,6 +5,8 @@ import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
+import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -67,4 +69,11 @@ public interface BusJcbWjcxcMapper {
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbBlqService.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbBlq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * 检查表-避雷器
@@ -85,4 +86,11 @@ public interface IBusJcbBlqService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbDmcgyqService.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbDmcgyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * 检查表-地面磁感应器
@@ -91,4 +92,11 @@ public interface IBusJcbDmcgyqService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbFdfxjyqService.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * dxf分选绝缘器检查表 
@@ -85,4 +86,11 @@ public interface IBusJcbFdfxjyqService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbGlkgService.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * 隔离开关检查表
@@ -94,4 +95,11 @@ public interface IBusJcbGlkgService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbJcxcService.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbJcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * 检查表-交叉线岔
@@ -80,4 +81,11 @@ public interface IBusJcbJcxcService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

+ 8 - 0
railway-business/src/main/java/com/railway/business/catenary/service/IBusJcbWjcxcService.java

@@ -5,6 +5,7 @@ import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import java.util.List;
 /**
 * 检查表-无交叉线岔
@@ -79,4 +80,11 @@ public interface IBusJcbWjcxcService{
      */
     JcebCountVo getCountByType(JcebQueryVo query);
 
+    /**
+     * 查询筛选车间列表
+     * @param query 查询条件
+     * @return 车间列表
+     */
+    List<JcebStationVo> listStation(JcebQueryVo query);
+
 }

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

@@ -2,7 +2,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.BusJcebLbjghjl;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;

+ 13 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbBlqServiceImpl.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbBlq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbBlqMapper;
 import com.railway.business.catenary.service.IBusJcbBlqService;
@@ -168,4 +169,16 @@ public class BusJcbBlqServiceImpl extends BusJcabServiceImpl implements IBusJcbB
     setJcebQuery(query);
     return busJcbBlqMapper.getCountByType(query);
   }
+
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return busJcbBlqMapper.listStation(query);
+  }
+
 }

+ 13 - 3
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbDmcgyqServiceImpl.java

@@ -8,6 +8,7 @@ import com.railway.business.catenary.domain.BusJcbDmcgyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbDmcgyqMapper;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
@@ -17,13 +18,10 @@ import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.bean.BeanUtils;
 import com.railway.common.utils.poi.EasyExcelUtil;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -166,6 +164,7 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
    * @param query
    * @return
    */
+  @Override
   public List<BusJcbDmcgyq> getJcebList(JcebQueryVo query) {
       List<BusJcbDmcgyq> list = busJcbDmcgyqMapper.getJcebList(query);
       List<BusJcbDmcgyq> resultList = new ArrayList<>();
@@ -295,4 +294,15 @@ public class BusJcbDmcgyqServiceImpl extends BusJcabServiceImpl implements IBusJ
     return busJcbDmcgyqMapper.getCountByType(query);
   }
 
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return busJcbDmcgyqMapper.listStation(query);
+  }
+
 }

+ 13 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbFdfxjyqServiceImpl.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbFdfxjyq;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbFdfxjyqMapper;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
@@ -181,4 +182,16 @@ public class BusJcbFdfxjyqServiceImpl extends BusJcabServiceImpl implements IBus
     setJcebQuery(query);
     return busJcbFdfxjyqMapper.getCountByType(query);
   }
+
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return busJcbFdfxjyqMapper.listStation(query);
+  }
+
 }

+ 12 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbGlkgServiceImpl.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbGlkg;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbGlkgMapper;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
@@ -200,4 +201,15 @@ public class BusJcbGlkgServiceImpl extends BusJcabServiceImpl implements IBusJcb
 			return busJcbGlkg;
 	}
 
+	/**
+	 * 查询筛选车间列表
+	 *
+	 * @param query 查询条件
+	 * @return 车间列表
+	 */
+	@Override
+	public List<JcebStationVo> listStation(JcebQueryVo query) {
+		return busJcbGlkgMapper.listStation(query);
+	}
+
 }

+ 13 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbJcxcServiceImpl.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbJcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbJcxcMapper;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
@@ -207,4 +208,16 @@ public class BusJcbJcxcServiceImpl extends BusJcabServiceImpl implements IBusJcb
     setJcebQuery(query);
     return busJcbJcxcMapper.getCountByType(query);
   }
+
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return busJcbJcxcMapper.listStation(query);
+  }
+
 }

+ 13 - 0
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -6,6 +6,7 @@ import com.railway.business.catenary.domain.BusJcbWjcxc;
 import com.railway.business.catenary.domain.vo.JcebCountVo;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.domain.vo.JcebStationVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcbWjcxcMapper;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
@@ -185,4 +186,16 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
     setJcebQuery(query);
     return busJcbWjcxcMapper.getCountByType(query);
   }
+
+  /**
+   * 查询筛选车间列表
+   *
+   * @param query 查询条件
+   * @return 车间列表
+   */
+  @Override
+  public List<JcebStationVo> listStation(JcebQueryVo query) {
+    return busJcbWjcxcMapper.listStation(query);
+  }
+
 }

+ 20 - 0
railway-business/src/main/resources/mapper/baseinfo/BaseStationMapper.xml

@@ -203,4 +203,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_blq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -639,4 +639,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_blq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -602,4 +602,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_dmcgyq t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.xclx = 'wjcxc'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
+
 </mapper>

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

@@ -804,5 +804,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_fjxgmd t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.xclx = 'wjcxc'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
 
 </mapper>

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

@@ -1094,5 +1094,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_glkg t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
 
 </mapper>

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

@@ -772,5 +772,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_jcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.xclx = 'jcxc'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
 
 </mapper>

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

@@ -749,5 +749,24 @@
     </where>
   </select>
 
+  <resultMap id="JcabStationMap" type="com.railway.business.catenary.domain.vo.JcebStationVo">
+    <result column="station_name" property="stationName"/>
+    <result column="station_id" property="stationId"/>
+  </resultMap>
+
+  <select id="listStation" resultMap="JcabStationMap">
+    SELECT distinct v.station_id, v.station_name
+    FROM base_jcxc t
+    LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
+    <where>
+      t.del_flag='0' and t.xclx = 'wjcxc'
+      <if test="deptId!=null and deptId!=''">
+        and v.dept_id=#{deptId}
+      </if>
+      <if test="createBy!=null and createBy!=''">
+        and t.create_by=#{createBy}
+      </if>
+    </where>
+  </select>
 
 </mapper>