diff --git a/src/main/java/com/biutag/supervision/controller/PoliceAvatarController.java b/src/main/java/com/biutag/supervision/controller/PoliceAvatarController.java index 249178e..68447d0 100644 --- a/src/main/java/com/biutag/supervision/controller/PoliceAvatarController.java +++ b/src/main/java/com/biutag/supervision/controller/PoliceAvatarController.java @@ -1,6 +1,7 @@ package com.biutag.supervision.controller; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.biutag.supervision.mapper.SupPoliceMapper; import com.biutag.supervision.pojo.Result; @@ -37,10 +38,12 @@ public class PoliceAvatarController { for (File file : files) { try { String img = file.getPath().replace("/work/POLICE", ""); - + log.info(img); + String idCode = policeMapper.getIdCodeByPoliceAvatar(img); + if (StrUtil.isBlank(idCode) || !policeMapper.exists(new LambdaUpdateWrapper().eq(SupPolice::getIdCode, idCode))) { + continue; + } String filePath = fileService.upload(new FileInputStream(file), FileUtil.size(file), FileUtil.extName(file.getName())); - - String idCode = ""; policeMapper.update(new LambdaUpdateWrapper().eq(SupPolice::getIdCode, "idCode").set(SupPolice::getAvatarUrl, filePath)); log.info("{} 更新头像 {}", idCode, file.getName()); } catch (Exception e) { 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 109be98..fe44344 100644 --- a/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java +++ b/src/main/java/com/biutag/supervision/controller/work/AlarmNotificationController.java @@ -1,5 +1,6 @@ package com.biutag.supervision.controller.work; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,8 +10,10 @@ import com.biutag.supervision.pojo.entity.AlarmNotification; import com.biutag.supervision.pojo.entity.SupDepart; import com.biutag.supervision.pojo.enums.NotificationType; import com.biutag.supervision.pojo.param.AlarmParam; +import com.biutag.supervision.service.AlarmFileService; import com.biutag.supervision.service.AlarmNotificationService; import com.biutag.supervision.service.SupDepartService; +import com.biutag.supervision.util.JSON; import jakarta.validation.Valid; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,6 +38,8 @@ public class AlarmNotificationController { private final AlarmNotificationService notificationService; + private final AlarmFileService alarmFileService; + private final SupDepartService departService; /** @@ -72,6 +77,17 @@ public class AlarmNotificationController { if(!res) { return Result.failed(5000, "回复失败"); } + if (CollectionUtil.isNotEmpty(data.getReplyFiles())) { + List files = data.getReplyFiles().stream().map(item -> { + AlarmFile alarmFile = new AlarmFile(); + alarmFile.setAlarmId(data.getId()); + alarmFile.setFileName(item.getFileName()); + alarmFile.setPath(item.getFilePath()); + alarmFile.setCrtTime(LocalDateTime.now()); + return alarmFile; + }).toList(); + alarmFileService.saveBatch(files); + } return Result.success(); } diff --git a/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java b/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java index d315fab..3225453 100644 --- a/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java +++ b/src/main/java/com/biutag/supervision/mapper/SupPoliceMapper.java @@ -17,6 +17,6 @@ public interface SupPoliceMapper extends BaseMapper { Page queryPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); @Select("select id_code from sup_police_avatar where img = #{img}") - String getPoliceAvatar(String img); + String getIdCodeByPoliceAvatar(String img); } \ No newline at end of file diff --git a/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java b/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java index 8079f0d..f6452fc 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/AlarmFile.java @@ -31,7 +31,7 @@ public class AlarmFile { String path; - String alarmId; + Integer alarmId; /** * 创建时间 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 5c8716d..01a2418 100644 --- a/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java +++ b/src/main/java/com/biutag/supervision/pojo/entity/AlarmNotification.java @@ -4,6 +4,7 @@ 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 com.biutag.supervision.pojo.vo.FileVo; import com.fasterxml.jackson.annotation.JsonFormat; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -153,10 +154,15 @@ public class AlarmNotification implements Serializable { // 是否要求回复 private Boolean requestReply; + @TableField(exist = false) List files; + @TableField(exist = false) + List replyFiles; + // 通知回复时限 private Integer replyLimit; + } diff --git a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java b/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java index 71616a9..45b036b 100644 --- a/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java +++ b/src/main/java/com/biutag/supervision/service/AlarmNotificationService.java @@ -10,9 +10,7 @@ import com.biutag.supervision.constants.enums.RoleCodeEnum; 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.UserAuth; -import com.biutag.supervision.pojo.model.UserModel; import com.biutag.supervision.pojo.param.AlarmParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -39,7 +37,7 @@ public class AlarmNotificationService extends ServiceImpl pages(AlarmParam param) { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); if(param.getAlarmTypeId() != null && param.getAlarmTypeId() != -1) { query.eq(AlarmNotification::getAlarmTypeId, param.getAlarmTypeId()); } @@ -54,7 +52,7 @@ public class AlarmNotificationService extends ServiceImpl