Merge remote-tracking branch 'origin/master'

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<List<AlarmFile>> files(Integer alarmId) {
+        return Result.success(notificationService.files(alarmId));
+    }
+
+    /**
+     * 查看详情
+     * @param alarmId 线索id
+     * @return 提醒信息
+     */
     @GetMapping("/details")
-    public Result<List<AlarmFile>> details(Integer alarmId) {
+    public Result<AlarmNotification> details(Integer alarmId) {
-        return Result.success(notificationService.details(alarmId));
+        AlarmNotification notification = notificationService.getOne(new LambdaQueryWrapper<AlarmNotification>()
+                .eq(AlarmNotification::getId, alarmId));
+        if(notification==null) {
+            return Result.failed(500, "未找到数据");
+        }
+        notification.setFiles(notificationService.files(alarmId));
+        return Result.success(notification);
     }
 }

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<AlarmFile> files;
+
 }

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;
 
-}
+}

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;
 
 }

src/main/java/com/biutag/supervision/service/AlarmNotificationService.java

@@ -58,7 +58,7 @@ public class AlarmNotificationService extends ServiceImpl<AlarmNotificationMappe
      * @param alarmId 提醒id
      * @return 文件列表
      */
-    public List<AlarmFile> details(Integer alarmId) {
+    public List<AlarmFile> files(Integer alarmId) {
         return fileService.list(new LambdaQueryWrapper<AlarmFile>()
                 .select(AlarmFile::getId, AlarmFile::getFileName, AlarmFile::getPath)
                 .eq(AlarmFile::getAlarmId, alarmId));