From e294ea312fe1994c3ddfe26595ee414e6612eb0c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 04 Dec 2020 11:37:36 +0800
Subject: [PATCH] 大屏report_avg_datas接口24点无数据处理
---
src/main/java/com/moral/controller/WebController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index d346ece..ee8cdb8 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -222,7 +222,7 @@
String accountId = WebTokenUtils.getIdBytoken(token);
Account account = accountService.getAccountById(Integer.parseInt(accountId));
parameters.put("organizationId", account.getOrganizationId());
- List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsByRegionAndOrgId(parameters);
+ List<MonitorPoint> monitorPoints = monitorPointService.getMonitorPointsAndDevicesByRegionNew(parameters);
if (ObjectUtils.isEmpty(monitorPoints))
return ResultBean.fail("������������������������������");
--
Gitblit v1.8.0