diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordAlarmDataController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordAlarmDataController.java index f5fd610..4dbddf5 100644 --- a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordAlarmDataController.java +++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordAlarmDataController.java @@ -115,4 +115,13 @@ public class EmsRecordAlarmDataController extends BaseController return toAjax(emsRecordAlarmDataService.handleExceptionsAlarmData(objIds)); } + /** + * 获取数据表总数(alarm_type = 0) + */ + @GetMapping("/getAlarmDataTotalCount") + public int getAlarmDataTotalCount() + { + return emsRecordAlarmDataService.getAlarmDataTotalCount(); + } + } diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java index 6cc36c2..9e74793 100644 --- a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java +++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordAlarmDataMapper.java @@ -82,4 +82,9 @@ public interface EmsRecordAlarmDataMapper @Param("cause") String cause, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + + /** + * 获取数据表总数(alarm_type = 0 + */ + Integer getAlarmDataTotalCount(); } diff --git a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordAlarmDataService.java b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordAlarmDataService.java index 345cbf9..7f76bce 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordAlarmDataService.java +++ b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordAlarmDataService.java @@ -70,4 +70,9 @@ public interface IEmsRecordAlarmDataService * 物联网数据阈值检查定时任务 */ void checkIotenvThresholdAlarms(); + + /** + * 获取数据表总数(alarm_type = 0) + */ + public int getAlarmDataTotalCount(); } diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java index cb4afd3..46335b5 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordAlarmDataServiceImpl.java @@ -435,4 +435,12 @@ public class EmsRecordAlarmDataServiceImpl implements IEmsRecordAlarmDataService Integer count = recordIotenvInstantMapper.checkTableExists(params); return count != null && count > 0; } + + /** + * 获取数据表总数(alarm_type = 0 + */ + @Override + public int getAlarmDataTotalCount() { + return emsRecordAlarmDataMapper.getAlarmDataTotalCount(); + } } diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml index d7e4e83..6e7ada2 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordAlarmDataMapper.xml @@ -173,4 +173,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND alarm_status = 1 AND collect_time BETWEEN #{startTime} AND #{endTime} + + + +