Merge remote-tracking branch 'origin/master'

pom.xml

@@ -187,7 +187,7 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
 <!--                本地跑时改成true，打包时改成false-->
             </resource>
             <resource>

src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java

@@ -66,16 +66,6 @@ public class DataGobalController {
         return Result.success(data);
     }
 
-    public void updateProList(List<CommonVo> proList, List<GobalMapIconVo> gobalMapVoList, BiConsumer<GobalMapIconVo, Integer> setter) {
-        for (GobalMapIconVo gobalMapIconVo : gobalMapVoList) {
-            for (CommonVo commonVo : proList) {
-                if (gobalMapIconVo.getName().equals(commonVo.getName())) {
-                    Integer temp = Integer.parseInt(commonVo.getValue());
-                    setter.accept(gobalMapIconVo, Integer.parseInt(commonVo.getValue()) + temp);
-                }
-            }
-        }
-    }
 
 
     /**

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

@@ -2,6 +2,7 @@ package com.biutag.supervision.controller.work;
 
 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.enums.NotificationType;
 import com.biutag.supervision.pojo.param.AlarmParam;
@@ -10,16 +11,15 @@ import com.biutag.supervision.service.ProblemSourceService;
 import com.biutag.supervision.util.CompletableUtils.CompletableFutureUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
 /**
+ * 预警提醒
  * @author kami on 2024-11-16 11:30:34
  * @version 0.0.1
  * @since 1.8
@@ -90,4 +90,14 @@ public class AlarmNotificationController {
         }
         return Result.success();
     }
+
+    /**
+     * 根据提醒id查询文件列表
+     * @param alarmId 提醒id
+     * @return 文件列表
+     */
+    @GetMapping("/details")
+    public Result<List<AlarmFile>> details(Integer alarmId) {
+        return Result.success(notificationService.details(alarmId));
+    }
 }

src/main/java/com/biutag/supervision/mapper/AlarmFileMapper.java

@@ -0,0 +1,14 @@
+package com.biutag.supervision.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.biutag.supervision.pojo.entity.AlarmFile;
+
+/**
+ * @author kami on 2024-11-21 15:30:04
+ * @version 0.0.1
+ * @since 1.8
+ */
+@DS("master")
+public interface AlarmFileMapper extends BaseMapper<AlarmFile> {
+}

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

@@ -0,0 +1,90 @@
+package com.biutag.supervision.pojo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * @author kami on 2024-11-21 15:27:42
+ * @version 0.0.1
+ * @since 1.8
+ */
+@Data
+@TableName("`alarm_file`")
+public class AlarmFile {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    String fileName;
+
+    String path;
+
+    String alarmId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("`crt_time`")
+    LocalDateTime crtTime;
+    /**
+     * 创建用户
+     */
+    @TableField("`crt_user`")
+    String crtUser;
+    /**
+     * 创建单位
+     */
+    @TableField("`crt_depart_id`")
+    String crtDepartId;
+    /**
+     * 创建人名称
+     */
+    @TableField("`crt_name`")
+    String crtName;
+    /**
+     * 创建ip
+     */
+    @TableField("`crt_host`")
+    String crtHost;
+
+    /**
+     * 创建用户
+     */
+    @TableField("`upd_user`")
+    String updUser;
+    /**
+     * 创建单位
+     */
+    @TableField("`upd_depart_id`")
+    String updDepartId;
+    /**
+     * 创建人名称
+     */
+    @TableField("`upd_name`")
+    String updName;
+    /**
+     * 创建ip
+     */
+    @TableField("`upd_host`")
+    String updHost;
+
+    /**
+     * 修改时间
+     */
+    @TableField("`upd_time`")
+    LocalDateTime updTime;
+
+    Integer del;
+}

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

@@ -145,4 +145,6 @@ public class AlarmNotification implements Serializable {
     @TableField("`upd_time`")
     LocalDateTime updTime;
 
+    Integer del;
+
 }

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

@@ -0,0 +1,15 @@
+package com.biutag.supervision.service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.mapper.AlarmFileMapper;
+import com.biutag.supervision.pojo.entity.AlarmFile;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author kami on 2024-11-21 15:31:57
+ * @version 0.0.1
+ * @since 1.8
+ */
+@Service
+public class AlarmFileService extends ServiceImpl<AlarmFileMapper, AlarmFile> {
+}

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

@@ -4,22 +4,35 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.biutag.supervision.mapper.AlarmNotificationMapper;
+import com.biutag.supervision.pojo.entity.AlarmFile;
 import com.biutag.supervision.pojo.entity.AlarmNotification;
 import com.biutag.supervision.pojo.entity.BaseUser;
 import com.biutag.supervision.pojo.model.UserModel;
 import com.biutag.supervision.pojo.param.AlarmParam;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author kami on 2024-11-16 11:07:43
  * @version 0.0.1
  * @since 1.8
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class AlarmNotificationService extends ServiceImpl<AlarmNotificationMapper, AlarmNotification> {
 
+    private final AlarmFileService fileService;
+
+    /**
+     * 分页查询提醒列表
+     * @param param 查询参数
+     * @return 提醒列表
+     */
     public Page<AlarmNotification> pages(AlarmParam param) {
         LambdaQueryWrapper<AlarmNotification> query = new LambdaQueryWrapper<AlarmNotification>();
         if(param.getAlarmTypeId() != null && param.getAlarmTypeId() != -1) {
@@ -39,4 +52,15 @@ public class AlarmNotificationService extends ServiceImpl<AlarmNotificationMappe
         }
         return page(Page.of(param.getCurrent(), param.getSize()), query.orderByDesc(AlarmNotification::getAlarmTime));
     }
+
+    /**
+     * 查看提醒问题文件详情
+     * @param alarmId 提醒id
+     * @return 文件列表
+     */
+    public List<AlarmFile> details(Integer alarmId) {
+        return fileService.list(new LambdaQueryWrapper<AlarmFile>()
+                .select(AlarmFile::getId, AlarmFile::getFileName, AlarmFile::getPath)
+                .eq(AlarmFile::getAlarmId, alarmId));
+    }
 }

src/main/resources/mapper/AlarmFileMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.biutag.supervision.mapper.AlarmFileMapper">
+
+</mapper>