Merge branch 'master' into huangchb

src/main/java/com/esv/datacenter/iot/module/dashboard/controller/DashboardController.java

 package com.esv.datacenter.iot.module.dashboard.controller;
 
+import com.esv.datacenter.iot.common.response.EResponse;
 import com.esv.datacenter.iot.module.dashboard.req.DashboardReq;
 import com.esv.datacenter.iot.module.dashboard.service.DashboardService;
 import lombok.extern.slf4j.Slf4j;
@@ -34,8 +35,9 @@ public class DashboardController {
     }
 
     @PostMapping("modelData")
-    public List<Map<String, Object>> modelData(@RequestBody DashboardReq dashboardReq) {
-        return dashboardService.modelData(dashboardReq);
+    public EResponse modelData(@RequestBody DashboardReq dashboardReq) {
+        List<Map<String, Object>> list = dashboardService.modelData(dashboardReq);
+        return EResponse.ok(list);
     }
 
 }

src/main/java/com/esv/datacenter/iot/module/dashboard/service/impl/DashboardServiceImpl.java

@@ -4,6 +4,7 @@ import com.esv.datacenter.iot.common.component.TimescaleComponent;
 import com.esv.datacenter.iot.module.dashboard.req.DashboardReq;
 import com.esv.datacenter.iot.module.dashboard.service.DashboardService;
 import com.zaxxer.hikari.HikariDataSource;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
@@ -21,11 +22,14 @@ import java.util.Map;
  * @createTime: 2020/8/3 20:24
  * @version: 1.0
  */
+@Slf4j
 @Service("dashboardService")
 public class DashboardServiceImpl implements DashboardService {
 
     private TimescaleComponent timescaleComponent;
 
+    private JdbcTemplate jdbcTemplate = null;
+
     @Autowired
     public DashboardServiceImpl(TimescaleComponent timescaleComponent) {
         this.timescaleComponent = timescaleComponent;
@@ -37,10 +41,15 @@ public class DashboardServiceImpl implements DashboardService {
         String sql = "select time"
                 + getSqlParams(dashboardReq.getPropertyCodeList(), false)
                 + " from "
-                + tableName;
+                + tableName
+                + " where instance_id = ?"
+                + " order by time desc limit 100";
+        log.info("select modelData sql: {}", sql);
+        if (jdbcTemplate == null) {
             HikariDataSource dataSource = timescaleComponent.getHikariDataSource();
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        return jdbcTemplate.queryForList(sql);
+            jdbcTemplate = new JdbcTemplate(dataSource);
+        }
+        return jdbcTemplate.queryForList(sql, dashboardReq.getInstanceId());
     }
 
     private String getSqlParams(Collection collection, boolean isString) {