Commit 20917c7c authored by huangcb's avatar huangcb

Merge branch 'master' into huangchb

parents 921c9e6c 2f3b3f4c
...@@ -38,7 +38,7 @@ public class DashboardServiceImpl implements DashboardService { ...@@ -38,7 +38,7 @@ public class DashboardServiceImpl implements DashboardService {
List<ModelDataVO> modelDataVOList = new ArrayList<>(); List<ModelDataVO> modelDataVOList = new ArrayList<>();
for (DashboardReq dashboardReq : dashboardReqList) { for (DashboardReq dashboardReq : dashboardReqList) {
Long modelId = dashboardReq.getModelId(); Long modelId = dashboardReq.getModelId();
String tableName = "iot_model_" + modelId; String tableName = "iot_data_model_" + modelId;
String sql = "select time" String sql = "select time"
+ getSqlParams(dashboardReq.getPropertyCodeList(), false) + getSqlParams(dashboardReq.getPropertyCodeList(), false)
+ " from " + " from "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment