diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java index ac51d19e8..38b7bf38c 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalTreeController.java @@ -6,6 +6,7 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.vo.DeptLineTreeVO; import com.njcn.device.pq.pojo.vo.TerminalTree; @@ -59,9 +60,9 @@ public class TerminalTreeController extends BaseController { @ApiOperation("获取终端树") @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) @GetMapping("getTerminalSelectTree") - public HttpResult> getTerminalSelectTree(Integer level){ + public HttpResult> getTerminalSelectTree(Integer level){ String methodDescribe = getMethodDescribe("getTerminalSelectTree"); - List tree = terminalTreeService.getTerminalSelectTree(level); + List tree = terminalTreeService.getTerminalSelectTree(level); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, tree, methodDescribe); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java index 7baba6e99..1a1fbebbe 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalTreeService.java @@ -1,6 +1,7 @@ package com.njcn.device.pq.service; +import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.vo.DeptLineTreeVO; import com.njcn.device.pq.pojo.vo.TerminalTree; @@ -41,5 +42,5 @@ public interface TerminalTreeService { */ List getDeptBindDeptLineTree(String deptId, Integer deptType, String id, Integer type); - List getTerminalSelectTree(Integer level); + List getTerminalSelectTree(Integer level); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java index b3c6b6090..343ae21fc 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.device.pq.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.response.HttpResult; +import com.njcn.device.biz.pojo.vo.TerminalSelectTreeVO; import com.njcn.device.pq.enums.LineBaseEnum; import com.njcn.device.pq.mapper.DeptLineMapper; import com.njcn.device.pq.mapper.LineMapper; @@ -220,7 +221,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService { * 返回的是 2-3-(5+6) */ @Override - public List getTerminalSelectTree(Integer level) { + public List getTerminalSelectTree(Integer level) { return null; }