From bcadefa9407e3b4a7051b428cb600c7d36f05aff Mon Sep 17 00:00:00 2001 From: kami <605128600@qq.com> Date: Thu, 21 Nov 2024 15:37:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=AD=A6=E6=8F=90?= =?UTF-8?q?=E9=86=92=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../work/AlarmNotificationController.java | 18 +++- .../supervision/mapper/AlarmFileMapper.java | 14 +++ .../supervision/pojo/entity/AlarmFile.java | 90 +++++++++++++++++++ .../pojo/entity/AlarmNotification.java | 2 + .../supervision/service/AlarmFileService.java | 15 ++++ .../service/AlarmNotificationService.java | 24 +++++ src/main/resources/mapper/AlarmFileMapper.xml | 7 ++ 8 files changed, 167 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/biutag/supervision/mapper/AlarmFileMapper.java create mode 100644 src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java create mode 100644 src/main/java/com/biutag/supervision/service/AlarmFileService.java create mode 100644 src/main/resources/mapper/AlarmFileMapper.xml diff --git a/pom.xml b/pom.xml index 1429e95..9c1863c 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ src/main/resources - false + true 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 45d2f3d..cdcaf04 100644 --- a/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java +++ b/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> details(Integer alarmId) { + return Result.success(notificationService.details(alarmId)); + } } diff --git a/src/main/java/com/biutag/supervision/mapper/AlarmFileMapper.java b/src/main/java/com/biutag/supervision/mapper/AlarmFileMapper.java new file mode 100644 index 0000000..af159b2 --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java b/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java new file mode 100644 index 0000000..8079f0d --- /dev/null +++ b/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; +} 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 8d4ddc6..869de76 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java +++ b/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; + } diff --git a/src/main/java/com/biutag/supervision/service/AlarmFileService.java b/src/main/java/com/biutag/supervision/service/AlarmFileService.java new file mode 100644 index 0000000..afa90ff --- /dev/null +++ b/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 { +} diff --git a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java b/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java index 60f9493..61f7cdf 100644 --- a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java +++ b/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 { + private final AlarmFileService fileService; + + /** + * 分页查询提醒列表 + * @param param 查询参数 + * @return 提醒列表 + */ public Page pages(AlarmParam param) { LambdaQueryWrapper query = new LambdaQueryWrapper(); if(param.getAlarmTypeId() != null && param.getAlarmTypeId() != -1) { @@ -39,4 +52,15 @@ public class AlarmNotificationService extends ServiceImpl details(Integer alarmId) { + return fileService.list(new LambdaQueryWrapper() + .select(AlarmFile::getId, AlarmFile::getFileName, AlarmFile::getPath) + .eq(AlarmFile::getAlarmId, alarmId)); + } } diff --git a/src/main/resources/mapper/AlarmFileMapper.xml b/src/main/resources/mapper/AlarmFileMapper.xml new file mode 100644 index 0000000..3bc9a5c --- /dev/null +++ b/src/main/resources/mapper/AlarmFileMapper.xml @@ -0,0 +1,7 @@ + + + + +