src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java

@@ -1,11 +1,9 @@
 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;
@@ -16,11 +14,9 @@ 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;
 
 /**
  * 预警提醒
@@ -100,24 +96,8 @@ 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<AlarmNotification> details(Integer alarmId) {
+    public Result<List<AlarmFile>> details(Integer alarmId) {
-        AlarmNotification notification = notificationService.getOne(new LambdaQueryWrapper<AlarmNotification>()
+        return Result.success(notificationService.details(alarmId));
-                .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,7 +10,6 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 预警通知
@@ -148,7 +147,4 @@ public class AlarmNotification implements Serializable {
 
     Integer del;
 
-    @TableField(exist = false)
-    List<AlarmFile> files;
-
 }

src/main/java/com/biutag/supervision/pojo/entity/ModelClue.java

@@ -59,8 +59,6 @@ public class ModelClue {
     // 问题ID
     @TableField("negative_id")
     private String negativeId;
-    @TableField("notification_id")
-    private String notificationId;
 
     // 问题ID
     @TableField("negative_id_ex")

src/main/java/com/biutag/supervision/pojo/model/ModelClueModel.java

@@ -46,8 +46,6 @@ 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> files(Integer alarmId) {
+    public List<AlarmFile> details(Integer alarmId) {
         return fileService.list(new LambdaQueryWrapper<AlarmFile>()
                 .select(AlarmFile::getId, AlarmFile::getFileName, AlarmFile::getPath)
                 .eq(AlarmFile::getAlarmId, alarmId));