From e5332d81abbc037bbb8a571cf80b7862d5cf1282 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Wed, 25 Sep 2024 10:34:32 +0800 Subject: [PATCH] =?UTF-8?q?mapper=E6=8A=BD=E7=A6=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/controller/DataCenterController.java | 4 + .../bonus/data/mapper/DataCenterMapper.java | 44 ------- .../screen/mapper/TbDeviceDataRecord.java | 46 +++++++ .../impl/ProjectDetailsViewServiceImpl.java | 20 +-- .../mapper/data/DataCenterMapper.xml | 124 ------------------ .../screen/TbDeviceDataRecordMapper.xml | 124 ++++++++++++++++++ 6 files changed, 184 insertions(+), 178 deletions(-) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java index 782e2bc..21f6303 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/data/controller/DataCenterController.java @@ -103,6 +103,10 @@ public class DataCenterController extends BaseController { return service.uploadZnshData(obj); } + /** + * 安全帽数据上报 + * @param obj 设备数据 + */ @PostMapping("/uploadSafetyHatData") public AjaxResult uploadSafetyHatData(@RequestBody String obj){ return service.uploadSafetyHatData(obj); 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 195559f..b9c9202 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 @@ -77,50 +77,6 @@ public interface DataCenterMapper { */ void insertRecordData(DevAttributeVo vo); - /** - * 查询室外感知设备最新的各项监测数据 - * @param devId 设备id - */ - List getDevAttributeLatestInfoById(@Param("devId") Integer devId); - - /** - * 查询室外感知设备历史各项10条记录 - * @param devId 设备id - */ - List getDevAttributeRecordByDevId(@Param("devId") Integer devId); - - /** - * 查询组塔监测设备当日记录 - * @param proId 工程id - */ - List getTowerDevAttributeRecordByDay(@Param("proId") Integer proId); - - /** - * 查询基坑/有限空间 监测设备当日记录 - */ - List getPitDevAttributeRecordByDay(@Param("proId") Integer proId); - - /** - * 查询组塔监测设备报警记录 -- 最新10条 - */ - List getTowerDevAttributeWarnRecord(@Param("proId") Integer proId); - - /** - * 查询基坑/有限空间 监测设备历史各项监测数据(每监测项10条记录) - */ - List getPitDevAttributeRecordByDeviceId(@Param("devId") Integer devId); - - /** - * 查询(有限空间/基坑)设备报警记录 -- 最新10条 - * @param proId 工程id - */ - 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/mapper/TbDeviceDataRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java index d9660a7..3fe5c7b 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/screen/mapper/TbDeviceDataRecord.java @@ -1,7 +1,9 @@ package com.bonus.screen.mapper; +import com.bonus.data.entity.DevAttributeVo; import com.bonus.screen.vo.DeviceWarnRecordVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -17,4 +19,48 @@ public interface TbDeviceDataRecord { List getDeviceWarnRecord(DeviceWarnRecordVo deviceWarnRecordVo); + /** + * 查询室外感知设备最新的各项监测数据 + * @param devId 设备id + */ + List getDevAttributeLatestInfoById(@Param("devId") Integer devId); + + /** + * 查询室外感知设备历史各项10条记录 + * @param devId 设备id + */ + List getDevAttributeRecordByDevId(@Param("devId") Integer devId); + + /** + * 查询组塔监测设备当日记录 + * @param proId 工程id + */ + List getTowerDevAttributeRecordByDay(@Param("proId") Integer proId); + + /** + * 查询基坑/有限空间 监测设备当日记录 + */ + List getPitDevAttributeRecordByDay(@Param("proId") Integer proId); + + /** + * 查询组塔监测设备报警记录 -- 最新10条 + */ + List getTowerDevAttributeWarnRecord(@Param("proId") Integer proId); + + /** + * 查询基坑/有限空间 监测设备历史各项监测数据(每监测项10条记录) + */ + List getPitDevAttributeRecordByDeviceId(@Param("devId") Integer devId); + + /** + * 查询(有限空间/基坑)设备报警记录 -- 最新10条 + * @param proId 工程id + */ + List getPitDevAttributeWarnRecord(@Param("proId") Integer proId); + + /** + * 查询室外环境报警记录 -- 最新20条 + */ + List getPowerDevAttributeRecordByWarn(@Param("proId") Integer 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 d0ce6f2..6ac16f2 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 @@ -2,7 +2,7 @@ package com.bonus.screen.service.impl; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.data.entity.DevAttributeVo; -import com.bonus.data.mapper.DataCenterMapper; +import com.bonus.screen.mapper.TbDeviceDataRecord; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,15 +21,15 @@ import java.util.stream.Collectors; public class ProjectDetailsViewServiceImpl { @Autowired - private DataCenterMapper dataCenterMapper; + private TbDeviceDataRecord tbDeviceDataRecordMapper; public AjaxResult getDevAttributeLatestInfoById(Integer proId) { - return AjaxResult.success(dataCenterMapper.getDevAttributeLatestInfoById(proId)); + return AjaxResult.success(tbDeviceDataRecordMapper.getDevAttributeLatestInfoById(proId)); } public AjaxResult getDevAttributeRecordByDevId(Integer devId) { - List records = dataCenterMapper.getDevAttributeRecordByDevId(devId); + List records = tbDeviceDataRecordMapper.getDevAttributeRecordByDevId(devId); if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } @@ -38,7 +38,7 @@ public class ProjectDetailsViewServiceImpl { } public AjaxResult getPitDevAttributeRecordByDeviceId(Integer devId) { - List records = dataCenterMapper.getPitDevAttributeRecordByDeviceId(devId); + List records = tbDeviceDataRecordMapper.getPitDevAttributeRecordByDeviceId(devId); if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } @@ -46,7 +46,7 @@ public class ProjectDetailsViewServiceImpl { } public AjaxResult getTowerDevAttributeRecordByDay(Integer proId) { - List records = dataCenterMapper.getTowerDevAttributeRecordByDay(proId); + List records = tbDeviceDataRecordMapper.getTowerDevAttributeRecordByDay(proId); if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } @@ -54,11 +54,11 @@ public class ProjectDetailsViewServiceImpl { } public AjaxResult getPitDevAttributeRecordByDay(Integer proId) { - return AjaxResult.success(dataCenterMapper.getPitDevAttributeRecordByDay(proId)); + return AjaxResult.success(tbDeviceDataRecordMapper.getPitDevAttributeRecordByDay(proId)); } public AjaxResult getTowerDevAttributeWarnRecord(Integer proId) { - List records = dataCenterMapper.getTowerDevAttributeWarnRecord(proId); + List records = tbDeviceDataRecordMapper.getTowerDevAttributeWarnRecord(proId); if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } @@ -66,7 +66,7 @@ public class ProjectDetailsViewServiceImpl { } public AjaxResult getPitDevAttributeWarnRecord(Integer proId) { - List records = dataCenterMapper.getPitDevAttributeWarnRecord(proId); + List records = tbDeviceDataRecordMapper.getPitDevAttributeWarnRecord(proId); if (records.isEmpty()) { return AjaxResult.error("暂无数据"); } @@ -74,7 +74,7 @@ public class ProjectDetailsViewServiceImpl { } public AjaxResult getPowerDevAttributeRecordByWarn(Integer proId) { - return AjaxResult.success(dataCenterMapper.getPowerDevAttributeRecordByWarn(proId)); + return AjaxResult.success(tbDeviceDataRecordMapper.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 f73548c..971dee8 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 @@ -101,128 +101,4 @@ and status=0 and dict_value LIKE CONCAT("%",#{relType},',',"%") - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml index 70cccba..410cd36 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen/TbDeviceDataRecordMapper.xml @@ -25,4 +25,128 @@ GROUP BY tddr.id + + + + + + + + + + + + + + + + \ No newline at end of file