From c0a3b75295604d4cd57cf1e775a279a6ecd04ee6 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Tue, 4 Apr 2023 10:35:07 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/pq/controller/OperationContrController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java index 84564f56e..292e198cb 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/OperationContrController.java @@ -98,7 +98,6 @@ public class OperationContrController extends BaseController { DeviceInfoParam param = new DeviceInfoParam(RequestUtil.getDeptIndex(),null); deviceInfoParam.setDeptIndex(param.getDeptIndex()); LogUtil.njcnDebug(log, "{}，参数集合：{}", methodDescribe, deviceInfoParam); -// deviceInfoParam.setDeptIndex("db2ba5e64d77f8e94ea5e6bb267407a2"); List result = lineService.getDeviceRunStatistics(deviceInfoParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -110,10 +109,10 @@ public class OperationContrController extends BaseController { @ApiImplicitParam(name = "deviceInfoParam", value = "实体", required = true) public HttpResult> getNewDeviceRunStatistics(@RequestBody PqsParam deviceInfoParam){ String methodDescribe = getMethodDescribe("getDeviceRunStatistics"); -// DeviceInfoParam param = new DeviceInfoParam(RequestUtil.getDeptIndex(),null); -// deviceInfoParam.setDeptIndex(param.getDeptIndex()); - // 本地测试 - deviceInfoParam.setDeptIndex("9b8f910f3c3ad4b049b6abda59d66419"); + if (deviceInfoParam.getDeptIndex() == null) { + DeviceInfoParam param = new DeviceInfoParam(RequestUtil.getDeptIndex(),null); + deviceInfoParam.setDeptIndex(param.getDeptIndex()); + } LogUtil.njcnDebug(log, "{}，参数集合：{}", methodDescribe, deviceInfoParam); Page result = lineService.getNewDeviceRunStatistics(deviceInfoParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);