diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java index 26b2984..01f3893 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/mapper/DataCenterMapper.java @@ -111,6 +111,11 @@ public interface DataCenterMapper { */ List getPitDevAttributeWarnRecord(@Param("proId") Integer proId); + /** + * 查询室外环境报警记录 -- 最新20条 + */ + List getPowerDevAttributeRecordByWarn(@Param("proId") Integer proId); + /** * 更新设备采集数据值 * @param devId diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java index 1a1b860..9e38569 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/controller/ProjectDetailsViewController.java @@ -55,6 +55,15 @@ public class ProjectDetailsViewController extends BaseController { return projectDetailsViewService.getDevAttributeRecordByDevId(devId); } + /** + * 查询室外感知设备预警数据 -- 预警数据(最新20条) + * @param proId 工程id + */ + @GetMapping("/getPowerDevAttributeRecordByWarn") + public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) { + return projectDetailsViewService.getPowerDevAttributeRecordByWarn(proId); + } + /** * 查询有限空间监测设备历史数据 / 每监测项各10条数据 * @param devId 设备id @@ -77,8 +86,8 @@ public class ProjectDetailsViewController extends BaseController { * 查询组塔监测设备 -- 预警数据(最新10条) * @param proId 工程id */ - @GetMapping("/getPowerDevAttributeRecordByWarn") - public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) { + @GetMapping("/getTowerDevAttributeRecordByWarn") + public AjaxResult getTowerDevAttributeRecordByWarn(Integer proId) { return projectDetailsViewService.getTowerDevAttributeWarnRecord(proId); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java index 67e464d..733a8b2 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/service/impl/ProjectDetailsViewServiceImpl.java @@ -69,4 +69,8 @@ public class ProjectDetailsViewServiceImpl { return AjaxResult.success(records); } + public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) { + return AjaxResult.success(dataCenterMapper.getPowerDevAttributeRecordByWarn(proId)); + } + } diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml index 8373c9e..01fd888 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/data/DataCenterMapper.xml @@ -195,4 +195,20 @@ tddr.create_time DESC limit 10 + + \ No newline at end of file