From e2bbfb5e08a53f9b168e2764d4af7d79e16580b1 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 11 Mar 2025 19:10:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/device/pq/controller/CommTerminalController.java | 2 +- .../njcn/device/pq/service/impl/CommTerminalServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 3f4166415..7f82730de 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 @@ -179,7 +179,7 @@ public class CommTerminalController extends BaseController { public HttpResult> deptGetDevice(@RequestBody @Validated DeptGetLineParam deptGetLineParam) { TimeInterval timer = new TimeInterval(); String methodDescribe = getMethodDescribe("deptGetDevice"); - List result = commTerminalService.deptGetDevice(deptGetLineParam,0); + List result = commTerminalService.deptGetDevice(deptGetLineParam,3); log.info("运行时长" + timer.intervalSecond()); 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/impl/CommTerminalServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java index 8b00cc8c1..a92a4f0d8 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 @@ -186,7 +186,7 @@ public class CommTerminalServiceImpl implements CommTerminalService { public List deptGetDevice(DeptGetLineParam deptGetLineParam,Integer type) { List result = new ArrayList<>(); List temDept = getDeptChildrenByParent(deptGetLineParam); - Map> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),3,deptGetLineParam.getLineRunFlag()); + Map> map = deptLineService.lineDevGet(filterDataTypeNew(deptGetLineParam.getServerName()),type,deptGetLineParam.getLineRunFlag()); temDept.forEach(item -> { DeptGetDeviceDTO deptGetDeviceDTO = new DeptGetDeviceDTO(); deptGetDeviceDTO.setUnitId(item.getUnitId());