diff --git a/os-admin/src/main/java/com/os/RuoYiApplication.java b/os-admin/src/main/java/com/os/RuoYiApplication.java index 3c55a0c..c38613a 100644 --- a/os-admin/src/main/java/com/os/RuoYiApplication.java +++ b/os-admin/src/main/java/com/os/RuoYiApplication.java @@ -3,6 +3,7 @@ package com.os; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableScheduling; /** * 启动程序 @@ -10,6 +11,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@EnableScheduling public class RuoYiApplication { public static void main(String[] args) diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/RecordIotenvInstantMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/RecordIotenvInstantMapper.java index 0976cb1..74c3be3 100644 --- a/os-ems/src/main/java/com/os/ems/record/mapper/RecordIotenvInstantMapper.java +++ b/os-ems/src/main/java/com/os/ems/record/mapper/RecordIotenvInstantMapper.java @@ -115,4 +115,13 @@ public interface RecordIotenvInstantMapper */ int countFromTables(@Param("tableNames") List tableNames, @Param("recordIotenvInstant") RecordIotenvInstant recordIotenvInstant); + /** + * 从指定表查询最新的N条记录 + * + * @param tableName 表名 + * @param limit 限制条数 + * @return 记录列表 + */ + public List selectLatestRecordsFromTable(@Param("tableName") String tableName, + @Param("limit") int limit); } diff --git a/os-ems/src/main/resources/mapper/ems/record/RecordIotenvInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/RecordIotenvInstantMapper.xml index c6a9404..c4ee1d5 100644 --- a/os-ems/src/main/resources/mapper/ems/record/RecordIotenvInstantMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/RecordIotenvInstantMapper.xml @@ -296,4 +296,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) AS total_count + + + \ No newline at end of file diff --git a/os-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/os-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 52e2207..bf0bf48 100644 --- a/os-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/os-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -58,9 +58,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"