diff --git a/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java b/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java index cdcaf04..e81ad46 100644 --- a/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java +++ b/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java @@ -1,9 +1,11 @@ package com.biutag.supervision.controller.work; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.biutag.supervision.pojo.Result; import com.biutag.supervision.pojo.entity.AlarmFile; import com.biutag.supervision.pojo.entity.AlarmNotification; +import com.biutag.supervision.pojo.entity.Negative; import com.biutag.supervision.pojo.enums.NotificationType; import com.biutag.supervision.pojo.param.AlarmParam; import com.biutag.supervision.service.AlarmNotificationService; @@ -14,9 +16,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.concurrent.CompletableFuture; /** * 预警提醒 @@ -96,8 +100,24 @@ public class AlarmNotificationController { * @param alarmId 提醒id * @return 文件列表 */ + @GetMapping("/files") + public Result> files(Integer alarmId) { + return Result.success(notificationService.files(alarmId)); + } + + /** + * 查看详情 + * @param alarmId 线索id + * @return 提醒信息 + */ @GetMapping("/details") - public Result> details(Integer alarmId) { - return Result.success(notificationService.details(alarmId)); + public Result details(Integer alarmId) { + AlarmNotification notification = notificationService.getOne(new LambdaQueryWrapper() + .eq(AlarmNotification::getId, alarmId)); + if(notification==null) { + return Result.failed(500, "未找到数据"); + } + notification.setFiles(notificationService.files(alarmId)); + return Result.success(notification); } } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java b/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java index 869de76..a1a2733 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java @@ -10,6 +10,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.List; /** * 预警通知 @@ -147,4 +148,7 @@ public class AlarmNotification implements Serializable { Integer del; + @TableField(exist = false) + List files; + } diff --git a/src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java b/src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java index 01ad479..857d94c 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java @@ -14,11 +14,11 @@ import java.time.LocalDateTime; @Getter public class ModelClue { - // + // @TableId(value = "id", type = IdType.AUTO) private Integer id; - // + // @TableField("model_id") private Integer modelId; @@ -59,6 +59,8 @@ public class ModelClue { // 问题ID @TableField("negative_id") private String negativeId; + @TableField("notification_id") + private String notificationId; // 问题ID @TableField("negative_id_ex") @@ -97,4 +99,4 @@ public class ModelClue { @TableField(exist = false) private Integer departLevel; -} \ No newline at end of file +} diff --git a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java index 7b3b13d..8b1c81c 100644 --- a/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java +++ b/src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java @@ -46,6 +46,8 @@ public class ModelClueModel { private String negativeId; + private String notificationId; + private String status; } diff --git a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java b/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java index 61f7cdf..2752428 100644 --- a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java +++ b/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java @@ -58,7 +58,7 @@ public class AlarmNotificationService extends ServiceImpl details(Integer alarmId) { + public List files(Integer alarmId) { return fileService.list(new LambdaQueryWrapper() .select(AlarmFile::getId, AlarmFile::getFileName, AlarmFile::getPath) .eq(AlarmFile::getAlarmId, alarmId));