编辑动物信息（不包含图片/视频媒体资源）

src/main/java/com/youlai/boot/file/service/FileService.java

@@ -29,7 +29,4 @@ public interface FileService {
     boolean deleteFile(String filePath);
 
 
-    String uploadFile(String objectName, InputStream inputStream);
-
-
 }

src/main/java/com/youlai/boot/file/service/impl/LocalFileService.java

@@ -90,8 +90,4 @@ public class LocalFileService implements FileService {
         return FileUtil.del(storagePath + filePath);
     }
 
-    @Override
-    public String uploadFile(String objectName, InputStream inputStream) {
-        return "";
-    }
 }

src/main/java/com/youlai/boot/file/service/impl/MinioFileService.java

@@ -165,11 +165,6 @@ public class MinioFileService implements FileService {
         }
     }
 
-    @Override
-    public String uploadFile(String objectName, InputStream inputStream) {
-        return "";
-    }
-
 
     /**
      * PUBLIC桶策略

src/main/java/com/youlai/boot/mini/controller/StrayAnimalController.java

@@ -10,11 +10,14 @@ import com.youlai.boot.mini.model.form.StrayAnimalForm;
 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;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -44,4 +47,16 @@ public class StrayAnimalController {
         return Result.success(uuid);
     }
 
+
+    @Operation(summary = "编辑动物信息（不包含图片/视频媒体资源）")
+    @PutMapping(value = "/{uuid}")
+    @Log(module = LogModuleEnum.STRAY_ANIMAL_INFO, value = ActionTypeEnum.UPDATE)
+    public Result<?> updateStrayAnimal(
+        @PathVariable String uuid,
+        @Validated @RequestBody StrayAnimalForm formData
+    ) {
+        strayAnimalService.updateStrayAnimal(uuid, formData);
+        return Result.success();
+    }
+
 }

src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java

@@ -13,4 +13,6 @@ public interface MiniStrayAnimalMapper extends BaseMapper<MiniStrayAnimal> {
 
     boolean insertStrayAnimal(MiniStrayAnimal entity);
 
+    void updateStrayAnimal(MiniStrayAnimal miniStrayAnimal);
+
 }

src/main/java/com/youlai/boot/mini/service/StrayAnimalService.java

@@ -12,4 +12,5 @@ public interface StrayAnimalService extends IService<MiniStrayAnimal> {
 
     String saveStrayAnimal(@Valid StrayAnimalForm formData, List<MultipartFile> images, List<MultipartFile> videos);
 
+    void updateStrayAnimal(String uuid, StrayAnimalForm formData);
 }

src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java

@@ -3,6 +3,8 @@ package com.youlai.boot.mini.service.impl;
 import ch.hsr.geohash.GeoHash;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.common.constant.CommonConstants;
 import com.youlai.boot.common.util.CoordinateTransformUtils;
@@ -10,6 +12,7 @@ import com.youlai.boot.common.util.FileUtils;
 import com.youlai.boot.common.util.JavaVCUtils;
 import com.youlai.boot.common.util.RandomNumberUtils;
 import com.youlai.boot.file.service.FileService;
+import com.youlai.boot.file.service.impl.AliyunFileService;
 import com.youlai.boot.framework.security.util.SecurityUtils;
 import com.youlai.boot.mini.converter.MiniStrayAnimalConverter;
 import com.youlai.boot.mini.mapper.MiniStrayAnimalMapper;
@@ -46,7 +49,7 @@ import java.util.UUID;
 @Slf4j
 public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, MiniStrayAnimal> implements StrayAnimalService {
 
-    private final FileService fileService;
+    private final AliyunFileService aliyunFileService;
 
     private final MiniStrayAnimalNoteMapper miniStrayAnimalNoteMapper;
     private final MiniStrayAnimalNoteMediaMapper miniStrayAnimalNoteMediaMapper;
@@ -84,7 +87,7 @@ public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, M
                         + note.getCreateTimestamp() + RandomNumberUtils.createRandomLowerLetterAndNumber(8)
                         + "."
                         + FilenameUtils.getExtension(image.getOriginalFilename());
-                    String url = fileService.uploadFile(objectName, image.getInputStream());
+                    String url = aliyunFileService.uploadFile(objectName, image.getInputStream());
                     MiniStrayAnimalNoteMedia miniStrayAnimalNoteMedia = new MiniStrayAnimalNoteMedia();
                     miniStrayAnimalNoteMedia.setUuid(UUID.randomUUID().toString());
                     miniStrayAnimalNoteMedia.setNoteId(note.getId());
@@ -117,7 +120,7 @@ public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, M
                         + fileName
                         + "."
                         + FilenameUtils.getExtension(video.getOriginalFilename());
-                    String url = fileService.uploadFile(objectName, video.getInputStream());
+                    String url = aliyunFileService.uploadFile(objectName, video.getInputStream());
                     MiniStrayAnimalNoteMedia miniStrayAnimalNoteMedia = new MiniStrayAnimalNoteMedia();
                     miniStrayAnimalNoteMedia.setUuid(UUID.randomUUID().toString());
                     miniStrayAnimalNoteMedia.setNoteId(note.getId());
@@ -140,7 +143,7 @@ public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, M
                         + note.getId() + "/"
                         + thumbnailFileName
                         + ".png";
-                    String thumbnailUrl = fileService.uploadFile(thumbnailObjectName,
+                    String thumbnailUrl = aliyunFileService.uploadFile(thumbnailObjectName,
                         FileUtils.bufferedImageToInputStream(thumbnail, "png"));
                     miniStrayAnimalNoteMedia.setThumbnailUrl(thumbnailUrl);
 
@@ -174,22 +177,13 @@ public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, M
     private MiniStrayAnimal saveAnimalInfo(StrayAnimalForm formData) {
 
         long currentTimeUnix = System.currentTimeMillis();
-        MiniStrayAnimal entity = new MiniStrayAnimal();
+        MiniStrayAnimal entity = miniStrayAnimalConverter.toEntity(formData);
+
         entity.setMiniUserId(SecurityUtils.getUserId());
         entity.setUuid(UUID.randomUUID().toString());
-        entity.setAnimalType(formData.getAnimalType().toLowerCase());
-        entity.setColor(formData.getColor());
-        if (formData.getSize() != null) {
-            entity.setSize(formData.getSize().toLowerCase());
-        }
-        entity.setStatus(formData.getStatus().toLowerCase());
         entity.setCreateTimestamp(currentTimeUnix);
         entity.setCreateTime(new Date(currentTimeUnix));
         entity.setCreateBy(SecurityUtils.getUserId());
-        entity.setProvince(formData.getProvince());
-        entity.setCity(formData.getCity());
-        entity.setDistrict(formData.getDistrict());
-        entity.setAddress(formData.getAddress());
 
         handleLngLat(entity, formData.getLng(), formData.getLat());
 
@@ -224,4 +218,55 @@ public class StrayAnimalServiceImpl extends ServiceImpl<MiniStrayAnimalMapper, M
             "最多只能上传" + CommonConstants.STRAY_ANIMAL_VIDEO_NUM_LIMIT + "个视频");
     }
 
+
+    @Override
+    public void updateStrayAnimal(String uuid, StrayAnimalForm formData) {
+        // 校验动物是否存在
+        MiniStrayAnimal animal = miniStrayAnimalMapper.selectOne(
+            new LambdaQueryWrapper<MiniStrayAnimal>()
+                .eq(MiniStrayAnimal::getUuid, uuid)
+                .eq(MiniStrayAnimal::getDeleted, 0)
+        );
+        Assert.notNull(animal, "动物不存在");
+
+        long currentTimestamp = System.currentTimeMillis();
+
+        // 1. 更新流浪动物基本信息
+        updateAnimalInfo(animal.getId(), formData, currentTimestamp);
+        // 3. 更新笔记信息`
+        updateNoteInfo(animal.getId(), formData, currentTimestamp);
+
+    }
+
+    private void updateNoteInfo(Long animalId, StrayAnimalForm formData, long currentTimestamp) {
+        //处理笔记
+        MiniStrayAnimalNote miniStrayAnimalNote = miniStrayAnimalNoteMapper.selectOne(new LambdaQueryWrapper<MiniStrayAnimalNote>()
+            .eq(MiniStrayAnimalNote::getStrayAnimalId, animalId));
+        if (null != miniStrayAnimalNote){
+            LambdaUpdateWrapper<MiniStrayAnimalNote> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(MiniStrayAnimalNote::getId, miniStrayAnimalNote.getId())
+                .set(MiniStrayAnimalNote::getTitle, formData.getTitle())
+                .set(MiniStrayAnimalNote::getContent, formData.getContent())
+                .set(MiniStrayAnimalNote::getVisibility, formData.getVisibility())
+                .set(MiniStrayAnimalNote::getUpdateTimestamp, currentTimestamp)
+                .set(MiniStrayAnimalNote::getUpdateBy, SecurityUtils.getUserId())
+                .set(MiniStrayAnimalNote::getUpdateTime, new Date(currentTimestamp));
+
+            miniStrayAnimalNoteMapper.update(null, updateWrapper);
+
+        }
+    }
+
+    private void updateAnimalInfo(Long animalId, StrayAnimalForm formData, long currentTimestamp) {
+        MiniStrayAnimal miniStrayAnimal = miniStrayAnimalConverter.toEntity(formData);
+
+        miniStrayAnimal.setId(animalId);
+        miniStrayAnimal.setUpdateTimestamp(currentTimestamp);
+        miniStrayAnimal.setUpdateTime(new Date(currentTimestamp));
+        miniStrayAnimal.setUpdateBy(SecurityUtils.getUserId());
+        handleLngLat(miniStrayAnimal, formData.getLng(), formData.getLat());
+
+        miniStrayAnimalMapper.updateStrayAnimal(miniStrayAnimal);
+    }
+
 }

src/main/resources/mapper/mini/MiniStrayAnimalMapper.xml

@@ -80,4 +80,40 @@
 
     </insert>
 
+
+    <update id="updateStrayAnimal" parameterType="com.youlai.boot.mini.model.entity.MiniStrayAnimal">
+        UPDATE mini_stray_animal
+        <set>
+            <if test="uuid != null">uuid = #{uuid},</if>
+            <if test="miniUserId != null">mini_user_id = #{miniUserId},</if>
+            <if test="animalType != null">animal_type = #{animalType},</if>
+            <if test="color != null">color = #{color},</if>
+            <if test="size != null">size = #{size},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="adoptedBy != null">adopted_by = #{adoptedBy},</if>
+            <if test="adoptedAt != null">adopted_at = #{adoptedAt},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
+            <if test="province != null">province = #{province},</if>
+            <if test="city != null">city = #{city},</if>
+            <if test="district != null">district = #{district},</if>
+            <if test="address != null">address = #{address},</if>
+
+            <if test="gdLocationPoint != null">
+                gd_location_point =
+                ST_GeomFromWKB(#{gdLocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326),
+            </if>
+
+            <if test="wgs84LocationPoint != null">
+                wgs84_location_point =
+                ST_GeomFromWKB(#{wgs84LocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326),
+            </if>
+
+            <if test="wgs84Geohash != null">wgs84_geohash = #{wgs84Geohash},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateTimestamp != null">update_timestamp = #{updateTimestamp},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </set>
+        WHERE id = #{id}
+    </update>
+
 </mapper>