【BUG】【APP-记录故障】记录故障所选线路应关联所亭表,#137。增加获取记录故障线别getJlgzLine，获取记录故障所别getJlgzSubstation的方法

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

@@ -1,16 +1,17 @@
 package com.railway.web.controller.business.catenary;
 
+import com.railway.business.baseinfo.domain.BaseSubstation;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
 import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
+import com.railway.business.catenary.domain.vo.JlgzLineVo;
+import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import com.railway.business.catenary.service.IBusJlgzService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import javax.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -21,6 +22,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * @author fenghao
  */
@@ -80,4 +84,20 @@ public class BusJlgzController extends BaseController {
         return ajax;
     }
 
+    @ApiOperation(value = "获取记录故障线别")
+    @GetMapping("/getJlgzLine")
+    public TableDataInfo getJlgzLine() {
+        startPage();
+        List<JlgzLineVo> list = budJlgzService.getJlgzLine();
+        return getDataTable(list);
+    }
+
+    @ApiOperation(value = "获取记录故障所别")
+    @GetMapping("/getJlgzSubstation")
+    public TableDataInfo getJlgzSubstation(BaseSubstation baseSubstation) {
+        startPage();
+        List<JlgzSubstationVo> list = budJlgzService.getJlgzSubstation(baseSubstation.getLineId());
+        return getDataTable(list);
+    }
+
 }

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

@@ -0,0 +1,11 @@
+package com.railway.business.catenary.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class JlgzLineVo {
+
+  private Long lineId;
+  private String lineName;
+
+}

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

@@ -0,0 +1,13 @@
+package com.railway.business.catenary.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class JlgzSubstationVo {
+
+  private Long substationId;
+  private String substationName;
+  private Long lineId;
+  private String lineName;
+
+}

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

@@ -4,6 +4,8 @@ import com.github.pagehelper.Page;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
 import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
+import com.railway.business.catenary.domain.vo.JlgzLineVo;
+import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -46,4 +48,7 @@ public interface BusJlgzMapper {
 
     List<BusJlgzListByZzVo> getListByZz(@Param("query") BusJlgzQueryVo busJlgzQueryVo);
 
+    List<JlgzLineVo> getJlgzLine();
+
+    List<JlgzSubstationVo> getJlgzSubstation(Long lineId);
 }

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

@@ -3,6 +3,8 @@ package com.railway.business.catenary.service;
 import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
 import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
+import com.railway.business.catenary.domain.vo.JlgzLineVo;
+import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 
 import java.util.List;
 /**
@@ -44,4 +46,15 @@ public interface IBusJlgzService {
      */
     List<BusJlgzListByZzVo> getListByZz(BusJlgzQueryVo busJlgzQueryVo);
 
+    /**
+     * 获取记录故障的线别
+     * @return
+     */
+    List<JlgzLineVo> getJlgzLine();
+
+    /**
+     * 获取记录故障的所别
+     * @param lineId
+     */
+    List<JlgzSubstationVo> getJlgzSubstation(Long lineId);
 }

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

@@ -7,6 +7,8 @@ import com.railway.business.catenary.domain.BusJlgz;
 import com.railway.business.catenary.domain.BusJlgzPic;
 import com.railway.business.catenary.domain.vo.BusJlgzListByZzVo;
 import com.railway.business.catenary.domain.vo.BusJlgzQueryVo;
+import com.railway.business.catenary.domain.vo.JlgzLineVo;
+import com.railway.business.catenary.domain.vo.JlgzSubstationVo;
 import com.railway.business.catenary.mapper.BusJlgzMapper;
 import com.railway.business.catenary.mapper.BusJlgzPicMapper;
 import com.railway.business.catenary.service.IBusJlgzService;
@@ -170,4 +172,14 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 		}
 		return busJlgzMapper.getListByZz(busJlgzQueryVo);
 	}
+
+	@Override
+	public List<JlgzLineVo> getJlgzLine() {
+		return busJlgzMapper.getJlgzLine();
+	}
+
+	@Override
+	public List<JlgzSubstationVo> getJlgzSubstation(Long lineId) {
+		return busJlgzMapper.getJlgzSubstation(lineId);
+	}
 }

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

@@ -267,4 +267,30 @@
     where dictYylx.dict_type = 'gzyy'
     order by ifnull(res.total,0) desc, dictYylx.dict_sort
   </select>
+
+  <select id="getJlgzLine" resultType="com.railway.business.catenary.domain.vo.JlgzLineVo">
+    SELECT
+      line_id AS lineId,
+      line_name AS lineName
+    FROM
+      v_substation
+    GROUP BY line_id
+    ORDER BY line_id
+  </select>
+
+  <select id="getJlgzSubstation" resultType="com.railway.business.catenary.domain.vo.JlgzSubstationVo">
+    SELECT
+      line_id AS lineId,
+      line_name AS lineName,
+      substation_id AS substationId,
+      substation_name AS substationName
+    FROM
+      v_substation
+    <where>
+      <if test="lineId!=null and lineId!=''">
+        line_id = #{lineId}
+      </if>
+    </where>
+    ORDER BY line_id
+  </select>
 </mapper>