diff --git a/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java b/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java index b20bbe2..20d5025 100644 --- a/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java +++ b/src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java @@ -17,9 +17,6 @@ import com.youlai.boot.mini.model.vo.StrayAnimalDetailsVO; import com.youlai.boot.mini.model.vo.StrayAnimalShortVO; import com.youlai.boot.mini.service.StrayAnimalService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -42,7 +39,7 @@ public class StrayAnimalController { private final StrayAnimalService strayAnimalService; - @Operation(summary = "添加动物信息时先保存文件") + @Operation(summary = "添加动物信息时先保存文件", operationId = "AnimalSaveFile") @PostMapping(value = "save/file", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @RepeatSubmit @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.INSERT) diff --git a/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java b/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java index a4404d8..a808c00 100644 --- a/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java +++ b/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java @@ -203,8 +203,9 @@ public class StrayAnimalServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); wrapper.in(MiniStrayAnimalNoteMedia::getSourceUrl, formData.getMediaUrlList()) + .isNull(MiniStrayAnimalNoteMedia::getNoteId) // 关键条件,只更新笔记为空的记录 .set(MiniStrayAnimalNoteMedia::getNoteId, note.getId()); - miniStrayAnimalNoteMediaMapper.update(wrapper); + miniStrayAnimalNoteMediaMapper.update(null, wrapper); } } @@ -372,8 +373,15 @@ public class StrayAnimalServiceImpl extends ServiceImpl() + .eq(MiniStrayAnimalNote::getStrayAnimalId, animal.getId())); + + // 2. 更新笔记信息` + updateNoteInfo(miniStrayAnimalNote, formData, currentTimestamp); + // 3. 处理并保存媒体文件 + saveMediaFiles(miniStrayAnimalNote, formData); // 4. 提交审核 } @@ -398,10 +406,8 @@ public class StrayAnimalServiceImpl extends ServiceImpl() - .eq(MiniStrayAnimalNote::getStrayAnimalId, animalId)); if (null != miniStrayAnimalNote){ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(MiniStrayAnimalNote::getId, miniStrayAnimalNote.getId())