diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
index af4c369f1..5b8c10576 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
@@ -145,10 +145,10 @@ public class CommTerminalController extends BaseController {
     @PostMapping("substationGetLine")
     @ApiOperation("根据电站获取所有监测点")
     @ApiImplicitParam(name = "substationId", value = "请求体", required = true)
-    public HttpResult<List<LineDevGetDTO>> substationGetLine(@RequestParam("substationId")String substationId) {
+    public HttpResult<LineDevGetBandDTO> substationGetLine(@RequestParam("substationId")String substationId) {
         TimeInterval timer = new TimeInterval();
         String methodDescribe = getMethodDescribe("substationGetLine");
-        List<LineDevGetDTO> result = commTerminalService.substationGetLine(substationId);
+        LineDevGetBandDTO result = commTerminalService.substationGetLine(substationId);
         log.info("运行时长" + timer.intervalRestart());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
@@ -162,10 +162,10 @@ public class CommTerminalController extends BaseController {
     @PostMapping("busBarGetLine")
     @ApiOperation("根据母线id获取监测点信息")
     @ApiImplicitParam(name = "busBarId", value = "请求体", required = true)
-    public HttpResult<List<LineDevGetDTO>> busBarGetLine(@RequestParam("busBarId")String busBarId) {
+    public HttpResult<LineDevGetBandDTO> busBarGetLine(@RequestParam("busBarId")String busBarId) {
         TimeInterval timer = new TimeInterval();
         String methodDescribe = getMethodDescribe("busBarGetLine");
-        List<LineDevGetDTO> result = commTerminalService.busBarGetLine(busBarId);
+        LineDevGetBandDTO result = commTerminalService.substationGetLine(busBarId);
         log.info("运行时长" + timer.intervalRestart());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
index 2b80502bb..4d03994c6 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
@@ -60,19 +60,13 @@ public interface CommTerminalService {
     List<DeptGetDeviceDTO> deptGetDevice(DeptGetLineParam deptGetLineParam);
 
     /**
-     * 根据单位获取所有装置
+     * 根据电站和母线id获取监测点信息
      * @author cdf
      * @date 2023/5/10
      */
-    List<LineDevGetDTO> substationGetLine(String substationId);
+    LineDevGetBandDTO substationGetLine(String substationId);
 
 
-    /**
-     * 根据母线获取监测点信息
-     * @author cdf
-     * @date 2023/5/10
-     */
-    List<LineDevGetDTO> busBarGetLine(String busBarId);
 
 
 
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
index e297fcc77..96d939158 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
@@ -178,27 +178,15 @@ public class CommTerminalServiceImpl implements CommTerminalService {
     }
 
     @Override
-    public List<LineDevGetDTO> substationGetLine(String substationId) {
-        return lineMapper.getLineBySubStation(substationId);
-    }
-
-    @Override
-    public List<LineDevGetDTO> busBarGetLine(String busBarId) {
-        return lineMapper.getLineBySubStation(busBarId);
+    public LineDevGetBandDTO substationGetLine(String substationId) {
+        LineDevGetBandDTO lineDevGetBandDTO = new LineDevGetBandDTO();
+        List<LineDevGetDTO> subList = lineMapper.getLineBySubStation(substationId);
+        lineDevGetBandDTO.setZwList(subList);
+        return lineDevGetBandDTO;
     }
 
 
-    private void getChildrenByParent(List<DeptDTO> deptAllList, List<DeptGetChildrenMoreDTO> res) {
-        deptAllList.forEach(it -> {
-            DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO();
-            deptGetChildrenMoreDTO.setUnitId(it.getId());
-            deptGetChildrenMoreDTO.setUnitName(it.getName());
-            List<String> deptChildren = deptAllList.stream().filter(deptDTO -> deptDTO.getPids().contains(it.getId())).map(DeptDTO::getId).collect(Collectors.toList());
-            deptChildren.add(it.getId());
-            deptGetChildrenMoreDTO.setUnitChildrenList(deptChildren);
-            res.add(deptGetChildrenMoreDTO);
-        });
-    }
+
 
 
     private List<Integer> filterDataTypeNew(String serverName) {