diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java index cfcd7be..4480e35 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/DyLevelController.java @@ -38,7 +38,21 @@ public class DyLevelController extends BaseController { @RequestMapping("/getdyTreeList") @Log(title = "获取电压等级树状列表接口", type = "查询") public ResponseReult getdyTreeList(@Param("type") Integer type) { - ServiceBody serviceBody = dyLevelService.getdyTreeList(type); + ServiceBody serviceBody = dyLevelService.getdyTreeList(type,-1); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + +//143 + @ApiOperation(value = "郑州测试获取电压等级树状列表接口", notes = "郑州测试获取电压等级树状列表接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getzzdyTreeList") + @Log(title = "获取电压等级树状列表接口", type = "查询") + public ResponseReult getzzdyTreeList(@Param("type") Integer type) { + ServiceBody serviceBody = dyLevelService.getdyTreeList(type,143); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java index 47ae45b..25308ef 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/DyLevelDao.java @@ -25,7 +25,7 @@ public interface DyLevelDao { List selectAll(@Param("status") Integer status); - List selectTreeList( @Param("status") Integer status); + List selectTreeList( @Param("status") Integer status,@Param("lineid") Integer lineid); List selectTreeListByChannelId(@Param("channelid") Integer channelid, @Param("status") Integer status); diff --git a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml index 9fc2f08..08f6136 100644 --- a/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml +++ b/xymanager_dao/src/main/resources/mappers/DyLevelDao.xml @@ -201,6 +201,9 @@ left join terminals d on c.id = d.tower_id ) left join terminal_status e on e.term_id = d.id) where b.status = #{status} and a.status = #{status} and c.status = #{status} and d.status = #{status} + + and b.id = #{lineid} +