From 6922c0d0535f1725b0568f7eea654cffb757c07e Mon Sep 17 00:00:00 2001 From: wyw <373811525@qq.com> Date: Wed, 14 Aug 2024 15:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85=E5=AE=89?= =?UTF-8?q?=E9=98=B2=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicedetail/DeviceDetailController.java | 15 +++++++++- .../fastbee/data/domain/vo/AnfangInfoVo.java | 14 ++++++++++ .../devicedetail/IDeviceDetailService.java | 3 ++ .../impl/DeviceDetailServiceImpl.java | 28 +++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 fastbee-open-api/src/main/java/com/fastbee/data/domain/vo/AnfangInfoVo.java diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java index b6f2cc5..1eb289d 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/devicedetail/DeviceDetailController.java @@ -112,7 +112,20 @@ public class DeviceDetailController extends BaseController { return AjaxResult.success(list); } - + /** + * 获取安防信息 + * @param deviceId 传参 + * @return com.fastbee.common.core.domain.AjaxResult + */ + @ApiOperation("获取安防信息") + @GetMapping("/anfangInfo") + public AjaxResult anfangInfo(Long deviceId) + { + if (null == deviceId || deviceId == 0L) { + return AjaxResult.error("请传入设备号"); + } + return AjaxResult.success(deviceDetailService.anfangInfo(deviceId)); + } } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/domain/vo/AnfangInfoVo.java b/fastbee-open-api/src/main/java/com/fastbee/data/domain/vo/AnfangInfoVo.java new file mode 100644 index 0000000..ba7982b --- /dev/null +++ b/fastbee-open-api/src/main/java/com/fastbee/data/domain/vo/AnfangInfoVo.java @@ -0,0 +1,14 @@ +package com.fastbee.data.domain.vo; + +import com.fastbee.iot.domain.Device; +import lombok.Data; + +/** + * 安防信息 + */ +@Data +public class AnfangInfoVo { + + private Device jiankongDevice; + +} diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java index e0d7b35..e77564a 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/IDeviceDetailService.java @@ -1,6 +1,7 @@ package com.fastbee.data.service.devicedetail; import com.fastbee.common.model.vo.iot.QueryLogVo; +import com.fastbee.data.domain.vo.AnfangInfoVo; import com.fastbee.iot.domain.Device; import com.fastbee.waterele.domain.MaWatereleRecord; import com.fastbee.waterele.domain.dto.MaGuangaiRecordDto; @@ -27,4 +28,6 @@ public interface IDeviceDetailService { ArrayList gongdianChart(QueryLogVo queryLogVo); List xunjianRecord(QueryLogVo queryLogVo); + + AnfangInfoVo anfangInfo(Long deviceId); } diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java index 10ed663..2fd3b40 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/service/devicedetail/impl/DeviceDetailServiceImpl.java @@ -2,6 +2,8 @@ package com.fastbee.data.service.devicedetail.impl; import com.fastbee.common.model.vo.iot.QueryLogVo; import com.fastbee.common.utils.DevParamsUtils; +import com.fastbee.common.utils.StringUtils; +import com.fastbee.data.domain.vo.AnfangInfoVo; import com.fastbee.data.service.devicedetail.IDeviceDetailService; import com.fastbee.iot.domain.Device; import com.fastbee.iot.domain.ThingsModel; @@ -110,6 +112,32 @@ public class DeviceDetailServiceImpl implements IDeviceDetailService { return new ArrayList<>(); } + @Override + public AnfangInfoVo anfangInfo(Long deviceId) { + //获取监控设备信息 + Device device = iDeviceService.selectDeviceByDeviceId(deviceId); + if (device == null) { + throw new RuntimeException("未查到该设备"); + } + AnfangInfoVo anfangInfoVo = new AnfangInfoVo(); + //获取设备参数 + Map devParams = DevParamsUtils.getDevParams(device.getDevParams()); + //安防设备 + String jiankongIds = devParams.get("jiankongIds").toString(); + if(StringUtils.isNotEmpty(jiankongIds)){ + Device jiankongDevice = iDeviceService.selectDeviceByDeviceId(Long.parseLong(jiankongIds)); + anfangInfoVo.setJiankongDevice(jiankongDevice); + } + //安防设备 + String anfangIds = devParams.get("anfangIds").toString(); + //获取设备安防状态 + if(StringUtils.isNotEmpty(anfangIds)){ + Device anfangDevice = iDeviceService.selectDeviceByDeviceId(Long.parseLong(anfangIds)); + //获取当前安防告警状态 + } + //获取安防历史记录 + return null; + } }