增加告警查询模块

src/main/java/com/esv/datacenter/iot/module/alarm/controller/DeviceDataAlarmController.java

+package com.esv.datacenter.iot.module.alarm.controller;
+
+import com.esv.datacenter.iot.common.response.EResponse;
+import com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO;
+import com.esv.datacenter.iot.module.alarm.form.AlarmListForm;
+import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.controller.DeviceDataAlarmController
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:21
+ * @version: 1.0
+ */
+@RequestMapping("alarm/show")
+public class DeviceDataAlarmController {
+
+    private DeviceDataAlarmService deviceDataAlarmService;
+
+    public DeviceDataAlarmController(DeviceDataAlarmService deviceDataAlarmService) {
+        this.deviceDataAlarmService = deviceDataAlarmService;
+    }
+
+    @PostMapping("list")
+    public EResponse<List<DeviceDataAlarmDTO>> list(@RequestBody AlarmListForm alarmListForm) {
+
+
+        return EResponse.ok();
+    }
+
+}

src/main/java/com/esv/datacenter/iot/module/alarm/dao/DeviceDataAlarmDao.java

+package com.esv.datacenter.iot.module.alarm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 设备数据模型映射表
+ * 
+ * @author 黄朝斌
+ * @email huangchaobin@esvtek.com
+ * @date 2020-08-06 10:23:24
+ */
+@Mapper
+public interface DeviceDataAlarmDao extends BaseMapper<DeviceDataAlarmEntity> {
+	
+}

src/main/java/com/esv/datacenter/iot/module/alarm/dto/DeviceDataAlarmDTO.java

+package com.esv.datacenter.iot.module.alarm.dto;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.dto.DeviceDataAlarmDTO
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:19
+ * @version: 1.0
+ */
+@Data
+public class DeviceDataAlarmDTO {
+}

src/main/java/com/esv/datacenter/iot/module/alarm/entity/DeviceDataAlarmEntity.java

+package com.esv.datacenter.iot.module.alarm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:12
+ * @version: 1.0
+ */
+@Data
+@TableName("device_data_alarm")
+public class DeviceDataAlarmEntity {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * description 设备id
+     * author chenfm
+     * createTime 2020/8/7 14:14
+     **/
+    private Long deviceId;
+    /**
+     * description 告警规则id
+     * author chenfm
+     * createTime 2020/8/7 14:14
+     **/
+    private Long alarmRuleId;
+    /**
+     * description 数据上报时间
+     * author chenfm
+     * createTime 2020/8/7 14:14
+     **/
+    private Date reportTime;
+    /**
+     * description 告警时间
+     * author chenfm
+     * createTime 2020/8/7 14:14
+     **/
+    private Date alarmTime;
+
+}

src/main/java/com/esv/datacenter/iot/module/alarm/form/AlarmListForm.java

+package com.esv.datacenter.iot.module.alarm.form;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.form.AlarmListForm
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:25
+ * @version: 1.0
+ */
+@Data
+public class AlarmListForm {
+}

src/main/java/com/esv/datacenter/iot/module/alarm/service/DeviceDataAlarmService.java

+package com.esv.datacenter.iot.module.alarm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:17
+ * @version: 1.0
+ */
+public interface DeviceDataAlarmService extends IService<DeviceDataAlarmEntity> {
+}

src/main/java/com/esv/datacenter/iot/module/alarm/service/impl/DeviceDataAlarmServiceImpl.java

+package com.esv.datacenter.iot.module.alarm.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.esv.datacenter.iot.module.alarm.dao.DeviceDataAlarmDao;
+import com.esv.datacenter.iot.module.alarm.entity.DeviceDataAlarmEntity;
+import com.esv.datacenter.iot.module.alarm.service.DeviceDataAlarmService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description:
+ * @project: datacenter-iot-service
+ * @name: com.esv.datacenter.iot.module.alarm.service.impl.DeviceDataAlarmServiceImpl
+ * @author: chenfm
+ * @email: chenfengman@esvtek.com
+ * @createTime: 2020/8/7 14:17
+ * @version: 1.0
+ */
+@Service("deviceDataAlarmService")
+public class DeviceDataAlarmServiceImpl extends ServiceImpl<DeviceDataAlarmDao, DeviceDataAlarmEntity> implements DeviceDataAlarmService {
+}

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

@@ -26,13 +26,12 @@ import java.util.Map;
 @Service("dashboardService")
 public class DashboardServiceImpl implements DashboardService {
 
-    private TimescaleComponent timescaleComponent;
-
-    private JdbcTemplate jdbcTemplate = null;
+    private JdbcTemplate jdbcTemplate;
 
     @Autowired
     public DashboardServiceImpl(TimescaleComponent timescaleComponent) {
-        this.timescaleComponent = timescaleComponent;
+        HikariDataSource dataSource = timescaleComponent.getHikariDataSource();
+        jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
     @Override
@@ -45,10 +44,6 @@ public class DashboardServiceImpl implements DashboardService {
                 + " where instance_id = ?"
                 + " order by time desc limit 100";
         log.info("select modelData sql: {}", sql);
-        if (jdbcTemplate == null) {
-            HikariDataSource dataSource = timescaleComponent.getHikariDataSource();
-            jdbcTemplate = new JdbcTemplate(dataSource);
-        }
         return jdbcTemplate.queryForList(sql, dashboardReq.getInstanceId());
     }
 

src/main/resources/application-local.yml

@@ -80,8 +80,8 @@ timescale:
     username: iot
     password: 123456
     connection-timeout: 10000
-    minimum-idle: 1
-    maximum-pool-size: 1
+    minimum-idle: 5
+    maximum-pool-size: 10
     max-lifetime: 0
   table-field:
     map: string-text,number-numeric,boolean-bit(1)