设备告警记录

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<List<DeviceAlarmVo>> getAlarmRecord(@PathVariable Long deviceId) {
+        List<DeviceAlarmVo> device = deviceService.getAlarmRecord(deviceId);
+        return R.ok(device);
+    }
+
+
+
 }
 
 

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<Device> {
      * @return
      */
     List<DeviceLog> getOperationRecord(Long deviceId);
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    List<DeviceAlarmVo> getAlarmRecord(Long deviceId);
 }

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<DeviceMapper, Device> 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<DeviceMapper, Device> impl
     }
 
 
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public List<DeviceAlarmVo> getAlarmRecord(Long deviceId) {
+        List<DeviceAlarm> alarmList = deviceAlarmMapper.selectList (
+                new QueryWrapper<DeviceAlarm>().eq("device_id", deviceId)
+                        .orderByDesc("create_time"));
+        List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class);
+        return deviceAlarmVoList;
+    }
+
+
 }

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