From 760738bcdd6f109be55689ac5da3563798445e21 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 28 Aug 2025 13:30:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/WEBDeviceController.java | 16 +++++++++++++++ .../web/service/WEBDeviceService.java | 10 ++++++++++ .../service/impl/WEBDeviceServiceImpl.java | 20 +++++++++++++++++++ .../equipment/domain/bo/DeviceAlarmBo.java | 7 ++++--- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java index 5908c27f..b1e34d1d 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java @@ -5,6 +5,7 @@ import com.fuyuanshen.app.domain.AppPersonnelInfoRecords; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.equipment.domain.DeviceLog; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import com.fuyuanshen.web.service.WEBDeviceService; import io.swagger.v3.oas.annotations.Operation; @@ -86,6 +87,21 @@ public class WEBDeviceController extends BaseController { } + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + @Operation(summary = "设备告警记录") + @GetMapping(value = "/getAlarmRecord/{deviceId}") + public R> getAlarmRecord(@PathVariable Long deviceId) { + List device = deviceService.getAlarmRecord(deviceId); + return R.ok(device); + } + + + } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java index 5c19beab..7066a519 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java @@ -12,6 +12,7 @@ import com.fuyuanshen.equipment.domain.form.DeviceForm; import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria; import com.fuyuanshen.equipment.domain.vo.AppDeviceVo; import com.fuyuanshen.equipment.domain.vo.CustomerVo; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import java.io.IOException; @@ -55,4 +56,13 @@ public interface WEBDeviceService extends IService { * @return */ List getOperationRecord(Long deviceId); + + + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + List getAlarmRecord(Long deviceId); } diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java index d4882c3d..cc6ae262 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java @@ -12,10 +12,13 @@ import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper; import com.fuyuanshen.app.mapper.AppDeviceShareMapper; import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper; import com.fuyuanshen.equipment.domain.Device; +import com.fuyuanshen.equipment.domain.DeviceAlarm; import com.fuyuanshen.equipment.domain.DeviceAssignments; import com.fuyuanshen.equipment.domain.DeviceLog; +import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo; import com.fuyuanshen.equipment.domain.vo.WebDeviceVo; import com.fuyuanshen.equipment.enums.BindingStatusEnum; +import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper; import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper; import com.fuyuanshen.equipment.mapper.DeviceLogMapper; import com.fuyuanshen.equipment.mapper.DeviceMapper; @@ -43,6 +46,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl private final AppDeviceBindRecordMapper appDeviceBindRecordMapper; private final AppPersonnelInfoRecordsMapper infoRecordsMapper; private final DeviceLogMapper deviceLogMapper; + private final DeviceAlarmMapper deviceAlarmMapper; private final DeviceMapper deviceMapper; private final AppDeviceShareMapper appDeviceShareMapper; @@ -133,4 +137,20 @@ public class WEBDeviceServiceImpl extends ServiceImpl impl } + /** + * 设备告警记录 + * + * @param deviceId + * @return + */ + @Override + public List getAlarmRecord(Long deviceId) { + List alarmList = deviceAlarmMapper.selectList ( + new QueryWrapper().eq("device_id", deviceId) + .orderByDesc("create_time")); + List deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class); + return deviceAlarmVoList; + } + + } diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java index 7102adb0..e0df7d66 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceAlarmBo.java @@ -1,13 +1,14 @@ package com.fuyuanshen.equipment.domain.bo; -import com.fuyuanshen.equipment.domain.DeviceAlarm; +import com.fuyuanshen.common.core.validate.EditGroup; import com.fuyuanshen.common.mybatis.core.domain.BaseEntity; +import com.fuyuanshen.equipment.domain.DeviceAlarm; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; + import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; /** * 设备告警业务对象 device_alarm