diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java index a06ec68..7576234 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/LineController.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.BaseController; import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; +import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel; import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.model.DyLineTreeListModel; import com.shxy.xymanager_common.vo.*; @@ -86,8 +87,8 @@ public class LineController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getLineAndGt") @Log(title = "线路杆塔通道查询", type = "查询") - public ResponseReult getLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) { - ServiceBody serviceBody = lineService.getLineAndGt(vo); + public ResponseReult getLineAndGt(@RequestBody @Validated LineAndGtAndChannelVo vo) { + ServiceBody serviceBody = lineService.getLineAndGt(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java new file mode 100644 index 0000000..c0cd755 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/LineAndGtAndChannelListModel.java @@ -0,0 +1,29 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 线路杆塔通道电压列表 + */ +@Data +@ApiModel(value = "线路杆塔通道电压列表", description = "线路杆塔通道电压列表") +public class LineAndGtAndChannelListModel implements Serializable { + @ApiModelProperty(value = "线路杆塔通道电压列表", example = "[]") + private List list; + + @Data + public static class Bean { + + @ApiModelProperty(value = "编号", example = "123456") + private Integer id; + + @ApiModelProperty(value = "名称", example = "AAAA") + private String name; + + } +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java index 26241cf..66c797b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LineServiceImpl.java @@ -9,6 +9,7 @@ import com.shxy.xymanager_common.dto.LineAndDyNameDto; import com.shxy.xymanager_common.entity.Lines; import com.shxy.xymanager_common.enums.CommonStatus; import com.shxy.xymanager_common.exception.Asserts; +import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel; import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.page.PageUtils; import com.shxy.xymanager_common.vo.*; @@ -131,7 +132,7 @@ public class LineServiceImpl implements LineService { * @return */ @Override - public ServiceBody getLineAndGt(LineAndGtAndChannelVo vo) { + public ServiceBody getLineAndGt(LineAndGtAndChannelVo vo) { Integer dyid = vo.getDyid(); Integer lineid = vo.getLineid(); Integer towerid = vo.getTowerid(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java index c22eabc..aa9e34b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LineService.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_service.service; import com.shxy.xymanager_common.bean.ServiceBody; +import com.shxy.xymanager_common.model.LineAndGtAndChannelListModel; import com.shxy.xymanager_common.model.LineListModel; import com.shxy.xymanager_common.model.DyLineTreeListModel; import com.shxy.xymanager_common.vo.*; @@ -48,5 +49,5 @@ public interface LineService { * @param vo * @return */ - ServiceBody getLineAndGt(LineAndGtAndChannelVo vo); + ServiceBody getLineAndGt(LineAndGtAndChannelVo vo); }