From a2a202797dd385c0e1303df3334f7fe89930f442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 18 Apr 2025 14:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E9=99=90=E7=A9=BA=E9=97=B4=E6=B0=94?= =?UTF-8?q?=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfinedSpaceGasController.java | 54 ++++++++++++++++++ .../ExcavationDetectionController.java | 1 - .../screen/mapper/ConfinedSpaceGasMapper.java | 14 +++++ .../service/ConfinedSpaceGasService.java | 25 +++++++++ .../service/ExcavationDetectionService.java | 15 +++++ .../impl/ConfinedSpaceGasServiceImpl.java | 55 +++++++++++++++++++ .../impl/ExcavationDetectionServiceImpl.java | 15 +++++ .../screen.basic/ConfinedSpaceGasMapper.xml | 23 ++++++++ .../ExcavationDetectionMapper.xml | 2 +- 9 files changed, 202 insertions(+), 2 deletions(-) create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ConfinedSpaceGasController.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ConfinedSpaceGasMapper.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ConfinedSpaceGasService.java create mode 100644 bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ConfinedSpaceGasServiceImpl.java create mode 100644 bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ConfinedSpaceGasMapper.xml diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ConfinedSpaceGasController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ConfinedSpaceGasController.java new file mode 100644 index 0000000..504ae34 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ConfinedSpaceGasController.java @@ -0,0 +1,54 @@ +package com.bonus.base.screen.controller; + +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.service.ConfinedSpaceGasService; +import com.bonus.common.core.web.controller.BaseController; +import com.bonus.common.core.web.domain.AjaxResult; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +/** + * 有限空间气体 + * @author 马三炮 + * @date 2025/4/18 + */ +@Slf4j +@RestController +@RequestMapping("/confinedSpaceGas") +public class ConfinedSpaceGasController extends BaseController { + + @Resource + private ConfinedSpaceGasService confinedSpaceGasService; + + @ApiOperation(value = "实时数据变化") + @PostMapping("/realData") + public AjaxResult realData(@RequestBody CollectDeviceHisVo collectDeviceHisVo) { + try { + Map map = confinedSpaceGasService.realData(collectDeviceHisVo); + return success(map); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } + + @ApiOperation(value = "获取曲线图") + @PostMapping("/getCurveGraph") + public AjaxResult getCurveGraph(@RequestBody CollectDeviceHisVo collectDeviceHisVo) { + try { + List collectDeviceHisVoList = confinedSpaceGasService.getCurveGraph(collectDeviceHisVo); + return success(collectDeviceHisVoList); + }catch (Exception e){ + log.error("查询区域列表失败",e.getMessage()); + return error("查询区域列表失败"); + } + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java index 3b53b48..0ba3aa4 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/controller/ExcavationDetectionController.java @@ -2,7 +2,6 @@ package com.bonus.base.screen.controller; import com.bonus.base.basic.domain.CollectDevVo; import com.bonus.base.basic.domain.ConstInfoVo; -import com.bonus.base.screen.domain.CollectDeviceHisVo; import com.bonus.base.screen.domain.DeviceAlarmVo; import com.bonus.base.screen.domain.ProjectOverviewVo; import com.bonus.base.screen.service.ExcavationDetectionService; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ConfinedSpaceGasMapper.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ConfinedSpaceGasMapper.java new file mode 100644 index 0000000..d30c4b9 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/mapper/ConfinedSpaceGasMapper.java @@ -0,0 +1,14 @@ +package com.bonus.base.screen.mapper; + +import com.bonus.base.basic.domain.CollectDevAttrVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; + +import java.util.List; + +public interface ConfinedSpaceGasMapper { + List realData(CollectDeviceHisVo collectDeviceHisVo); + + CollectDeviceHisVo getData(CollectDevAttrVo collectDevAttrVo); + + List getCurveGraph(CollectDeviceHisVo collectDeviceHisVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ConfinedSpaceGasService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ConfinedSpaceGasService.java new file mode 100644 index 0000000..5eabfb8 --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ConfinedSpaceGasService.java @@ -0,0 +1,25 @@ +package com.bonus.base.screen.service; + + +import com.bonus.base.screen.domain.CollectDeviceHisVo; + + +import java.util.List; +import java.util.Map; + +public interface ConfinedSpaceGasService { + + /** + * 实时数据变化 + * @param collectDeviceHisVo + * @return + */ + Map realData(CollectDeviceHisVo collectDeviceHisVo); + + /** + * 获取曲线图 + * @param collectDeviceHisVo + * @return + */ + List getCurveGraph(CollectDeviceHisVo collectDeviceHisVo); +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java index 62b2dc0..bfe22fe 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/ExcavationDetectionService.java @@ -9,10 +9,25 @@ import com.bonus.base.screen.domain.ProjectOverviewVo; import java.util.List; public interface ExcavationDetectionService { + /** + * 查询设备列表 + * @param constInfoVo + * @return + */ List getCollectDeviceList(ConstInfoVo constInfoVo); + /** + * 设备统计 + * @param constInfoVo + * @return + */ ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo); + /** + * 报警信息 + * @param constInfoVo + * @return + */ List concreteAlarmList(ConstInfoVo constInfoVo); } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ConfinedSpaceGasServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ConfinedSpaceGasServiceImpl.java new file mode 100644 index 0000000..3956e1f --- /dev/null +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ConfinedSpaceGasServiceImpl.java @@ -0,0 +1,55 @@ +package com.bonus.base.screen.service.impl; + +import com.bonus.base.basic.domain.CollectDevAttrVo; +import com.bonus.base.screen.domain.CollectDeviceHisVo; +import com.bonus.base.screen.mapper.ConfinedSpaceGasMapper; +import com.bonus.base.screen.service.ConfinedSpaceGasService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author 马三炮 + * @date 2025/4/18 + */ +@Slf4j +@Service +public class ConfinedSpaceGasServiceImpl implements ConfinedSpaceGasService { + + @Resource + private ConfinedSpaceGasMapper confinedSpaceGasMapper; + + + /** + * 实时数据变化 + * @param collectDeviceHisVo + * @return + */ + @Override + public Map realData(CollectDeviceHisVo collectDeviceHisVo) { + Map map = new HashMap<>(); + //获取设备所有的属性 + List collectDevAttrVoList = confinedSpaceGasMapper.realData(collectDeviceHisVo); + for (CollectDevAttrVo collectDevAttrVo : collectDevAttrVoList) { + //获取每种属性的最新数据 + CollectDeviceHisVo collectDeviceHis = confinedSpaceGasMapper.getData(collectDevAttrVo); + map.put(collectDevAttrVo.getAttrName(),collectDeviceHis.getAttrVal()); + } + return map; + } + + /** + * 获取曲线图 + * @param collectDeviceHisVo + * @return + */ + @Override + public List getCurveGraph(CollectDeviceHisVo collectDeviceHisVo) { + List collectDeviceHisVoList = confinedSpaceGasMapper.getCurveGraph(collectDeviceHisVo); + return collectDeviceHisVoList; + } +} diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java index 283f0f4..99839c7 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/ExcavationDetectionServiceImpl.java @@ -24,6 +24,11 @@ public class ExcavationDetectionServiceImpl implements ExcavationDetectionServic @Resource private ExcavationDetectionMapper excavationDetectionMapper; + /** + * 查询设备列表 + * @param constInfoVo + * @return + */ @Override public List getCollectDeviceList(ConstInfoVo constInfoVo) { @@ -31,6 +36,11 @@ public class ExcavationDetectionServiceImpl implements ExcavationDetectionServic return collectDevVoList; } + /** + * 设备统计 + * @param constInfoVo + * @return + */ @Override public ProjectOverviewVo getDevStatistics(ConstInfoVo constInfoVo) { //获取在线和离线的信息 @@ -47,6 +57,11 @@ public class ExcavationDetectionServiceImpl implements ExcavationDetectionServic return projectOverviewVo; } + /** + * 报警信息 + * @param constInfoVo + * @return + */ @Override public List concreteAlarmList(ConstInfoVo constInfoVo) { List deviceAlarmVoList = excavationDetectionMapper.concreteAlarmList(constInfoVo); diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ConfinedSpaceGasMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ConfinedSpaceGasMapper.xml new file mode 100644 index 0000000..636e17d --- /dev/null +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ConfinedSpaceGasMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml index df432af..d69e955 100644 --- a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml +++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/ExcavationDetectionMapper.xml @@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"