【CHG】改进历史故障通过id查询，多一个lineId参数。

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

@@ -55,9 +55,9 @@ public class BusJlgzController extends BaseController {
     }
 
     @ApiOperation(value = "单个")
-    @GetMapping(value = {"/", "/{id}"})
-    public AjaxResult getInfo(@PathVariable(value = "id") Long id) {
-        BusJlgz info = budJlgzService.getInfo(id);
+    @GetMapping(value = {"/", "/{id}/{lineId}"})
+    public AjaxResult getInfo(@PathVariable(value = "id") Long id, @PathVariable(value = "lineId") Long lineId) {
+        BusJlgz info = budJlgzService.getInfo(id, lineId);
         AjaxResult ajax = AjaxResult.success();
         ajax.put("info",info);
         return ajax;

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

@@ -37,7 +37,7 @@ public interface BusJlgzMapper {
     /**
     * 获取单个
     */
-    BusJlgz getInfo(@Param("id") Long id);
+    BusJlgz getInfo(@Param("id") Long id, @Param("lineId") Long lineId);
 
     /**
     * 查询列表

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

@@ -30,7 +30,7 @@ public interface IBusJlgzService {
     /**
     * 获取单个
     */
-    BusJlgz getInfo(Long id);
+    BusJlgz getInfo(Long id, Long lineId);
 
     /**
     * 查询列表

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

@@ -101,8 +101,8 @@ public class BusJlgzServiceImpl implements IBusJlgzService {
 	* 获取单个
 	*/
 	@Override
-	public BusJlgz getInfo(Long id) {
-		BusJlgz busJlgz = busJlgzMapper.getInfo(id);
+	public BusJlgz getInfo(Long id, Long lineId) {
+		BusJlgz busJlgz = busJlgzMapper.getInfo(id, lineId);
 		if (busJlgz != null) {
 			BusJlgzPic busJlgzPic = new BusJlgzPic();
 			busJlgzPic.setJlgzId(id);

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

@@ -152,9 +152,15 @@
     LEFT JOIN v_substation v ON t.substation_id = v.substation_id
     LEFT JOIN sys_dict_data dict1 ON (t.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
     LEFT JOIN sys_dict_data dict2 ON (t.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
-    WHERE
-    t.del_flag = '0'
-    AND t.id = #{id}
+    <where>
+        t.del_flag = '0'
+      <if test="id!=null and id!=''">
+        and t.id = #{id}
+      </if>
+      <if test="lineId!=null and lineId!=''">
+        AND v.line_id = #{lineId}
+      </if>
+    </where>
   </select>
 
   <select id="getList" resultMap="BaseResultMap">