公告

# Conflicts:
#	src/main/java/com/bao/dating/mapper/PostMapper.java
#	src/main/java/com/bao/dating/service/PostService.java
#	src/main/java/com/bao/dating/service/impl/PostServiceImpl.java

src/main/java/com/bao/dating/common/aliyun/AliOssUtil.java

@@ -1,4 +1,4 @@
-package com.bao.dating.util;
+package com.bao.dating.common.aliyun;
 
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;
@@ -7,12 +7,15 @@ import com.aliyun.oss.OSSException;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
 
 @Data
-@AllArgsConstructor
 @Slf4j
+@Component
+@ConfigurationProperties(prefix = "aliyun.oss")
 public class AliOssUtil {
 
     private String endpoint;

src/main/java/com/bao/dating/common/aliyun/GreenImageScan.java

@@ -61,19 +61,24 @@ public class GreenImageScan {
 
             if (scanImageResponse.getStatusCode() == 200) {
 
-                List<ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults> subResults = scanImageResponse.body.data.results.get(0).getSubResults();
+                List<ScanImageResponseBody.ScanImageResponseBodyDataResults> results = scanImageResponse.body.data.results;
 
-                ListIterator<ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults> listIterator = subResults.listIterator();
+                // 遍历每一张图片的审核结果
-                while (listIterator.hasNext()) {
+                for (ScanImageResponseBody.ScanImageResponseBodyDataResults result : results) {
-                    ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults item = listIterator.next();
+                    List<ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults> subResults = result.getSubResults();
                     
-                    if (!item.suggestion.equals("pass")) {
+                    // 检查这张图片的所有子审核项
-                        resultMap.put("suggestion", item.suggestion);
+                    for (ScanImageResponseBody.ScanImageResponseBodyDataResultsSubResults subResult : subResults) {
-                        resultMap.put("label", item.label);
+                        // 如果有任何一项未通过审核，则整个审核不通过
+                        if (!subResult.suggestion.equals("pass")) {
+                            resultMap.put("suggestion", subResult.suggestion);
+                            resultMap.put("label", subResult.label);
                             return resultMap;
                         }
                     }
-                // 所有审核项都通过时，返回pass结果
+                }
+                
+                // 所有图片的所有审核项都通过时，返回pass结果
                 resultMap.put("suggestion", "pass");
                 resultMap.put("label", "normal");
                 return resultMap;

src/main/java/com/bao/dating/config/OssConfiguration.java

@@ -1,26 +0,0 @@
-package com.bao.dating.config;
-
-
-import com.bao.dating.properties.AliOssProperties;
-import com.bao.dating.util.AliOssUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 配置类，用于创建AliOssUtil对象
- */
-@Configuration
-@Slf4j
-public class OssConfiguration {
-    @Bean
-    @ConditionalOnMissingBean
-    public AliOssUtil aliOssUtil(AliOssProperties aliOssProperties){
-        log.info("开始创建阿里云文件上传工具类对象：{}",aliOssProperties);
-        return new AliOssUtil(aliOssProperties.getEndpoint(),
-                aliOssProperties.getAccessKeyId(),
-                aliOssProperties.getAccessKeySecret(),
-                aliOssProperties.getBucketName());
-    }
-}

src/main/java/com/bao/dating/controller/NoticeController.java

@@ -0,0 +1,39 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.pojo.entity.Notice;
+import com.bao.dating.service.NoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 公告控制器
+ */
+@RestController
+@RequestMapping("/notice")
+public class NoticeController {
+    @Autowired
+    private NoticeService noticeService;
+
+    /**
+     * 查询所有公告数据
+     * @return 公告列表
+     */
+    @GetMapping("/list")
+    public List<Notice> getNoticeList() {
+        return noticeService.getNoticeList();
+    }
+
+    /**
+     * 判断是否有公告数据
+     * @return true=有数据 false=无数据
+     */
+    @GetMapping("/hasData")
+    public boolean hasNoticeData() {
+        List<Notice> noticeList = noticeService.getNoticeList();
+        return !noticeList.isEmpty();
+    }
+}

src/main/java/com/bao/dating/controller/PostController.java

@@ -5,6 +5,7 @@ import com.bao.dating.common.Result;
 import com.bao.dating.common.ResultCode;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
+import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -20,8 +21,7 @@ public class PostController {
     private PostService postService;
 
     /**
-     * text
+     * 上传媒体文件接口 like
-     * 上传媒体文件接口
      * @param files 媒体文件数组
      * @return 上传后的文件URL列表
      */
@@ -33,13 +33,14 @@ public class PostController {
 
     /**
      * 发布动态接口 - JSON格式请求
-     * @param postRequestDTO 动态信息
+     * @param postDTO 动态信息
+     * @param userId 用户ID
      * @return 发布的动态对象
      */
     @PostMapping(consumes = "application/json")
-    public Result<Post> createPostJson(@RequestBody PostRequestDTO postRequestDTO) {
+    public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO, @RequestParam Long userId) {
         // 调用 Service 层处理发布动态业务逻辑
-        Post result = postService.createPost(postRequestDTO);
+        Post result = postService.createPost(userId, postDTO);
         return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功，等待审核。", result);
     }
 
@@ -50,8 +51,31 @@ public class PostController {
      * @return 删除结果
      */
     @DeleteMapping("/{postId}")
-    public Result<String> deleteById(@PathVariable Integer postId){
+    public Result<String> deleteById(@PathVariable Long postId){
         postService.deletePostById(postId);
         return Result.success(ResultCode.SUCCESS_DELETE, "动态删除成功", null);
     }
+
+    /**
+     * 根据ID查询动态接口
+     * @param postId 动态ID
+     * @return 动态对象
+     */
+    @GetMapping("/{postId}")
+    public Result<PostEditVO> getPostById(@PathVariable Long postId) {
+        PostEditVO postEditVO = postService.getPostForEdit(postId);
+        return Result.success(ResultCode.SUCCESS,"查询成功", postEditVO);
+    }
+    
+    /**
+     * 更新动态接口
+     * @param postId 动态ID
+     * @param postRequestDTO 动态信息
+     * @return 更新后的动态对象
+     */
+    @PutMapping("/{postId}")
+    public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
+        PostEditVO result = postService.updatePost(postId, postRequestDTO);
+        return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
+    }
 }

src/main/java/com/bao/dating/controller/PostFavoriteController.java

@@ -0,0 +1,34 @@
+package com.bao.dating.controller;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.pojo.entity.User;
+import com.bao.dating.service.PostFavoriteService;
+import com.bao.dating.service.PostService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/posts")
+public class PostFavoriteController {
+    @Autowired
+    private PostFavoriteService postFavoriteService;
+    @PostMapping("/{post_id}/favorites")
+    public Result<Map<String,Long>> addPostFavorite(@PathVariable("post_id")Long postId, User user){
+        if (user == null){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long userId = user.getUserId();
+        return postFavoriteService.postFavorite(userId,postId);
+    }
+    @DeleteMapping("/{post_id}/favorites")
+    public Result<?> deletePostFavorite(@PathVariable("post_id")Long postId, User user){
+        if (user == null){
+            return Result.error(ResultCode.PARAM_ERROR);
+        }
+        Long userId = user.getUserId();
+        return postFavoriteService.deletePostFavorite(userId, postId);
+    }
+}

src/main/java/com/bao/dating/controller/PostLikeController.java

@@ -17,6 +17,12 @@ public class PostLikeController {
     @Autowired
     private PostLikeService postLikeService;
 
+    /**
+     * 点赞接口
+     * @param postId
+     * @param body
+     * @return
+     */
     @PostMapping("/{postId}/likes")
     public Result<?> likePost(@PathVariable Long postId, @RequestBody Map<String, Long> body){
         // 从请求体中取出 user_id
@@ -27,6 +33,11 @@ public class PostLikeController {
         return postLikeService.likePost(postId,userId);
     }
 
+    /**
+     * 取消点赞接口
+     * @param postId
+     * @param body
+     */
     @DeleteMapping("/{postId}/likes")
     public void unlike(@PathVariable Long postId, @RequestBody Map<String, Long> body){
         // 从请求体中获取 user_id

src/main/java/com/bao/dating/controller/text.java

@@ -0,0 +1,4 @@
+package com.bao.dating.controller;
+
+public class text {
+}

src/main/java/com/bao/dating/mapper/NoticeMapper.java

@@ -0,0 +1,16 @@
+package com.bao.dating.mapper;
+
+import com.bao.dating.pojo.entity.Notice;
+
+import java.util.List;
+
+/**
+ * 公告Mapper接口
+ */
+public interface NoticeMapper {
+    /**
+     * 查询所有公告
+     * @return 公告列表
+     */
+    List<Notice> selectNoticeList();
+}

src/main/java/com/bao/dating/mapper/PostFavoriteMapper.java

@@ -0,0 +1,15 @@
+package com.bao.dating.mapper;
+
+import com.bao.dating.pojo.entity.PostFavorite;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PostFavoriteMapper {
+    //查询当前已收藏所有用户
+    List<Long> selectUserIDByPostID(@Param("postId") Long postId);
+    int addPostFavorite(PostFavorite postFavorite);
+    int deletePostFavorite(@Param("postId") Long postId);
+}

src/main/java/com/bao/dating/mapper/PostMapper.java

@@ -2,24 +2,39 @@ package com.bao.dating.mapper;
 
 import com.bao.dating.pojo.entity.Post;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface PostMapper {
     /**
      * 插入动态
      *
-     * @param post 动态对象
+     * @param post
-     * @return 插入的行数
      */
-    int insert(Post post);
+    void insert(Post post);
 
     /**
      * 根据ID删除动态
      *
      * @param postId 动态ID
-     * @return 删除的行数
      */
-    int deletePostById(Integer postId);
+    void deletePostById(@Param("postId") Long postId);
+
+    /**
+     * 根据ID查询动态
+     *
+     * @param postId
+     * @return
+     */
+    Post selectById(@Param("postId") Long postId);
+
+    /**
+     * 根据ID更新动态
+     *
+     * @param post
+     * @return
+     */
+    void updateById(Post post);
 
     /**
      * 查询点赞数
@@ -44,4 +59,34 @@ public interface PostMapper {
      * @return 影响行数
      */
     int decreaseLikeCount(Long postId);
+
+    /**
+     * 查询当前动态属于哪个用户id
+     * @param postId 动态id
+     * @return 用户id
+     */
+    Long selectUserIdByPostId(@Param("post_id") Long postId);
+
+    /**
+     * 查询点赞数
+     *
+     * @param postId
+     * @return
+     */
+    int selectFavoriteCount(Long postId);
+
+    /**
+     * 收藏数+1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int increaseFavoriteCount(Long postId);
+    /**
+     * 收藏数-1
+     *
+     * @param postId 动态ID
+     * @return 影响行数
+     */
+    int decreaseFavoriteCount(Long postId);
 }

src/main/java/com/bao/dating/pojo/dto/PostRequestDTO.java

@@ -1,14 +1,15 @@
 package com.bao.dating.pojo.dto;
 
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
+/**
+ * 动态数据传输对象
+ */
 @Data
 public class PostRequestDTO {
-    private Long userId;
     private String content;
+    private List<String> mediaOssKeys;
     private List<String> tags;
-    private List<String> mediaUrls;
 }

src/main/java/com/bao/dating/pojo/entity/Notice.java

@@ -0,0 +1,40 @@
+package com.bao.dating.pojo.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 公告实体类
+ */
+@Data
+public class Notice {
+    /**
+     * 公告ID
+     */
+    private Long noticeId;
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+    /**
+     * 状态（0正常 1关闭）
+     */
+    private String noticeStatus;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+}
+

src/main/java/com/bao/dating/pojo/vo/PostEditVO.java

@@ -0,0 +1,19 @@
+package com.bao.dating.pojo.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 修改内容查询返回数据
+ */
+@Data
+public class PostEditVO {
+    private Long postId;
+    private String content;
+    private List<String> mediaOssKeys;
+    private List<String> tags;
+    private Integer isPublic;
+    private LocalDateTime updatedAt;
+}

src/main/java/com/bao/dating/properties/AliOssProperties.java

@@ -1,15 +0,0 @@
-package com.bao.dating.properties;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-@Component
-@ConfigurationProperties(prefix = "aliyun.oss")
-@Data
-public class AliOssProperties {
-    private String endpoint;
-    private String accessKeyId;
-    private String accessKeySecret;
-    private String bucketName;
-}

src/main/java/com/bao/dating/service/NoticeService.java

@@ -0,0 +1,16 @@
+package com.bao.dating.service;
+
+import com.bao.dating.pojo.entity.Notice;
+
+import java.util.List;
+
+/**
+ * 公告服务接口
+ */
+public interface NoticeService {
+    /**
+     * 查询所有公告
+     * @return 公告列表
+     */
+    List<Notice> getNoticeList();
+}

src/main/java/com/bao/dating/service/PostFavoriteService.java

@@ -0,0 +1,10 @@
+package com.bao.dating.service;
+
+import com.bao.dating.common.Result;
+
+import java.util.Map;
+
+public interface PostFavoriteService {
+    Result<Map<String,Long>> postFavorite(Long userid,Long postId);
+    Result<?> deletePostFavorite(Long userid,Long postId);
+}

src/main/java/com/bao/dating/service/PostService.java

@@ -2,6 +2,7 @@ package com.bao.dating.service;
 
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
+import com.bao.dating.pojo.vo.PostEditVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -16,15 +17,39 @@ public interface PostService {
 
     /**
      * 创建动态
-     * @param postRequestDTO 动态请求数据传输对象
+     * @param userId 用户ID
+     * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
-    Post createPost(PostRequestDTO postRequestDTO);
+    Post createPost(Long userId, PostRequestDTO postRequestDTO);
 
     /**
      * 删除动态
      * @param postId 动态ID
      * @return 删除的动态对象
      */
+    void deletePostById(Long postId);
+
     void deletePostById(Integer postId);
+
+    /**
+     * 查询动态详情（用于编辑）
+     * @param postId 动态ID
+     */
+    PostEditVO getPostForEdit(Long postId);
+
+    /**
+     * 修改动态
+     * @param postId 动态ID
+     * @param postRequestDTO 修改的动态数据传输对象
+     * @return 修改后的动态对象
+     */
+    PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO);
+
+    /**
+     * 查询
+     * @param postId 动态id
+     * @return 用户id
+     */
+    Long selectUserIdByPostId(Long postId);
 }

src/main/java/com/bao/dating/service/impl/NoticeServiceImpl.java

@@ -0,0 +1,18 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.mapper.NoticeMapper;
+import com.bao.dating.pojo.entity.Notice;
+import com.bao.dating.service.NoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class NoticeServiceImpl implements NoticeService {
+    @Autowired
+    private NoticeMapper noticeMapper;
+    @Override
+    public List<Notice> getNoticeList() {
+        return noticeMapper.selectNoticeList();
+    }
+}

src/main/java/com/bao/dating/service/impl/PostFavoriteServiceImpl.java

@@ -0,0 +1,61 @@
+package com.bao.dating.service.impl;
+
+import com.bao.dating.common.Result;
+import com.bao.dating.common.ResultCode;
+import com.bao.dating.mapper.PostFavoriteMapper;
+import com.bao.dating.mapper.PostMapper;
+import com.bao.dating.pojo.entity.PostFavorite;
+import com.bao.dating.service.PostFavoriteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PostFavoriteServiceImpl implements PostFavoriteService {
+    @Autowired
+    private PostFavoriteMapper postFavoriteMapper;
+    @Autowired
+    private PostMapper postMapper;
+    @Override
+    @Transactional
+    public Result<Map<String, Long>> postFavorite(Long userid, Long postId) {
+        Long userId = postMapper.selectUserIdByPostId(postId);
+        if (userid.equals(userId)){
+            return Result.error(ResultCode.FORBIDDEN,"无法收藏自己发布动态");
+        }
+        List<Long> allUserId = postFavoriteMapper.selectUserIDByPostID(postId);
+        if (allUserId.contains(userid)){
+            return Result.error(ResultCode.FORBIDDEN,"已收藏");
+        }
+        PostFavorite postFavorite = new PostFavorite();
+        postFavorite.setPostId(postId);
+        postFavorite.setUserId(userid);
+        postFavorite.setCreatedAt(LocalDateTime.now());
+        postFavoriteMapper.addPostFavorite(postFavorite);
+        postMapper.increaseFavoriteCount(postId);
+        Long count = (long) postMapper.selectFavoriteCount(postId);
+        Map<String, Long> data = new HashMap<>();
+        data.put("favorite_id",postFavorite.getFavoriteId());
+        data.put("post_id",postId);
+        data.put("user_id",userid);
+        data.put("current_favorites_count",count);
+        return Result.success(ResultCode.SUCCESS_REVIEW,"收藏成功",data);
+    }
+
+    @Override
+    @Transactional
+    public Result<?> deletePostFavorite(Long userid, Long postId) {
+        List<Long> allUserId = postFavoriteMapper.selectUserIDByPostID(postId);
+        if (! allUserId.contains(userid)){
+            return Result.error(ResultCode.FORBIDDEN,"请先收藏");
+        }
+        postFavoriteMapper.deletePostFavorite(postId);
+        postMapper.decreaseFavoriteCount(postId);
+        return null;
+    }
+}

src/main/java/com/bao/dating/service/impl/PostServiceImpl.java

@@ -5,9 +5,11 @@ import com.bao.dating.common.aliyun.GreenTextScan;
 import com.bao.dating.mapper.PostMapper;
 import com.bao.dating.pojo.dto.PostRequestDTO;
 import com.bao.dating.pojo.entity.Post;
+import com.bao.dating.pojo.vo.PostEditVO;
 import com.bao.dating.service.PostService;
-import com.bao.dating.util.AliOssUtil;
+import com.bao.dating.common.aliyun.AliOssUtil;
 import com.bao.dating.util.FileUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -77,11 +79,23 @@ public class PostServiceImpl implements PostService {
     /**
      * 创建动态
      *
-     * @param postRequestDTO 动态请求数据传输对象
+     * @param userId 用户ID
+     * @param postRequestDTO 动态数据传输对象
      * @return 创建的动态对象
      */
     @Override
-    public Post createPost(PostRequestDTO postRequestDTO) {
+    public Post createPost(Long userId, PostRequestDTO postRequestDTO) {
+
+        // 创建动态对象
+        Post post = new Post();
+        post.setUserId(userId);
+        post.setContent(postRequestDTO.getContent());
+        post.setTags(postRequestDTO.getTags());
+        post.setMediaOssKeys(new ArrayList<>());
+        // 如果有传入的媒体链接，则使用它们
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+            post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
+        }
 
         // 1. 文本内容审核
         Map textResult;
@@ -97,37 +111,39 @@ public class PostServiceImpl implements PostService {
         }
 
         // 2. 图片审核（如果有）
-        if (postRequestDTO.getMediaUrls() != null && !postRequestDTO.getMediaUrls().isEmpty()) {
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
             Map imageResult;
             try {
-                imageResult = greenImageScan.imageScan(postRequestDTO.getMediaUrls());
+                imageResult = greenImageScan.imageScan(postRequestDTO.getMediaOssKeys());
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
+            // 图片审核结果
+            String imageSuggestion = (String) imageResult.get("suggestion");
 
-            if ("block".equals(imageResult.get("suggestion"))) {
+            // 根据审核结果设置状态
-                throw new RuntimeException("图片内容违规，禁止发布");
+            if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
-            }
+                // 审核未通过，允许用户修改
-        }
+                post.setIsPublic(2);
-
+            } else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
-        Post post = new Post();
-        post.setUserId(Long.valueOf(postRequestDTO.getUserId()));
-        post.setContent(postRequestDTO.getContent());
-        post.setTags(postRequestDTO.getTags());
-        post.setMediaOssKeys(new ArrayList<>());
-        
-        // 如果有传入的媒体链接，则使用它们
-        if (postRequestDTO.getMediaUrls() != null && !postRequestDTO.getMediaUrls().isEmpty()) {
-            post.setMediaOssKeys(postRequestDTO.getMediaUrls());
-        }
-
-        // 4. 根据审核结果设置状态
-        if ("review".equals(textSuggestion)) {
                 // 待审核，需人工审核
-            post.setIsPublic(0);
+                post.setIsPublic(1);
             } else {
                 // 审核通过
+                post.setIsPublic(0);
+            }
+        } else {
+            // 只有文本内容的情况
+            if ("block".equals(textSuggestion)) {
+                // 审核未通过，允许用户修改
+                post.setIsPublic(2);
+            } else if ("review".equals(textSuggestion)) {
+                // 待审核，需人工审核
                 post.setIsPublic(1);
+            } else {
+                // 审核通过
+                post.setIsPublic(0);
+            }
         }
         post.setUpdatedAt(LocalDateTime.now());
         post.setCreatedAt(LocalDateTime.now());
@@ -137,6 +153,11 @@ public class PostServiceImpl implements PostService {
         return post;
     }
 
+    @Override
+    public void deletePostById(Long postId) {
+        postMapper.deletePostById(postId);
+    }
+
     /**
      * 删除动态
      *
@@ -147,4 +168,103 @@ public class PostServiceImpl implements PostService {
     public void deletePostById(Integer postId) {
         postMapper.deletePostById(postId);
     }
+
+    @Override
+    public PostEditVO getPostForEdit(Long postId) {
+
+        Post post = postMapper.selectById(postId);
+        if (post == null) {
+            throw new RuntimeException("动态不存在");
+        }
+        PostEditVO postEditVO = new PostEditVO();
+        BeanUtils.copyProperties(post, postEditVO);
+        return postEditVO;
+    }
+
+    /**
+     * 修改动态
+     * @param postId 动态ID
+     * @param postRequestDTO 修改的动态数据传输对象
+     * @return
+     */
+    @Override
+    public PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO) {
+        // 查询动态
+        Post post = postMapper.selectById(postId);
+        if (post == null) {
+            throw new RuntimeException("动态不存在");
+        }
+        post.setContent(postRequestDTO.getContent());
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+            post.setMediaOssKeys(postRequestDTO.getMediaOssKeys());
+        }
+
+        // 1. 文本内容审核
+        Map textResult;
+        try {
+            textResult = greenTextScan.greeTextScan(postRequestDTO.getContent());
+        } catch (Exception e) {
+            throw new RuntimeException("文本审核失败");
+        }
+        // 文本审核结果
+        String textSuggestion = (String) textResult.get("suggestion");
+
+        // 2. 图片审核（如果有）
+        if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
+            Map imageResult;
+            try {
+                imageResult = greenImageScan.imageScan(postRequestDTO.getMediaOssKeys());
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+            // 图片审核结果
+            String imageSuggestion = (String) imageResult.get("suggestion");
+
+            // 根据审核结果设置状态
+            if ("block".equals(textSuggestion) || "block".equals(imageSuggestion)) {
+                // 审核未通过，允许用户修改
+                post.setIsPublic(2);
+            } else if ("review".equals(textSuggestion) || "review".equals(imageSuggestion)) {
+                // 待审核，需人工审核
+                post.setIsPublic(1);
+            } else {
+                // 审核通过
+                post.setIsPublic(0);
+            }
+        } else {
+            // 只有文本内容的情况
+            if ("block".equals(textSuggestion)) {
+                // 审核未通过，允许用户修改
+                post.setIsPublic(2);
+            } else if ("review".equals(textSuggestion)) {
+                // 待审核，需人工审核
+                post.setIsPublic(1);
+            } else {
+                // 审核通过
+                post.setIsPublic(0);
+            }
+        }
+        post.setTags(postRequestDTO.getTags());
+        post.setUpdatedAt(LocalDateTime.now());
+
+        // 更新动态
+        postMapper.updateById(post);
+
+        // 返回动态详情
+        PostEditVO postEditVO = new PostEditVO();
+        BeanUtils.copyProperties(post, postEditVO);
+        return postEditVO;
+    }
+
+    /**
+     * 根据动态ID查询用户ID
+     *
+     * @param postId 动态ID
+     * @return 用户ID
+     */
+    @Override
+    public Long selectUserIdByPostId(Long postId) {
+        return postMapper.selectUserIdByPostId(postId);
+    }
+
 }

src/main/resources/application.yml

@@ -20,9 +20,9 @@ mybatis:
 aliyun:
   oss:
     endpoint: oss-cn-beijing.aliyuncs.com
-    access-key-id: LTAI5tKo9TpWH1aW6JxWm1Gp
+    access-key-id: LTAI5t5vpcbCZwweNHEDDDaF
-    access-key-secret: LHk9DdHECKCwIdaIM9fkGgEuowt18W
+    access-key-secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
-    bucket-name: heimato
+    bucket-name: heimatoo
   accessKeyId: LTAI5t5vpcbCZwweNHEDDDaF
   secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
   scenes: antispam

src/main/resources/com/bao/dating/mapper/NoticeMapper.xml

@@ -0,0 +1,20 @@
+<?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.bao.dating.mapper.NoticeMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Notice_Column_List">
+        notice_id, notice_title, notice_content, notice_status, create_time, update_time
+    </sql>
+
+    <!-- 查询所有公告 -->
+    <select id="selectNoticeList" resultType="com.bao.dating.pojo.entity.Notice">
+        select
+        <include refid="Notice_Column_List"/>
+        from sys_notice
+        where notice_status = '0'
+        order by create_time desc
+    </select>
+
+</mapper>

src/main/resources/com/bao/dating/mapper/PostFavoriteMapper.xml

@@ -0,0 +1,17 @@
+<?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.bao.dating.mapper.PostFavoriteMapper">
+    <!--添加动态收藏-->
+    <insert id="addPostFavorite">
+        insert into post_favorite values (null,#{userId},#{postId},#{createdAt})
+    </insert>
+    <!--删除动态收藏-->
+    <delete id="deletePostFavorite">
+        delete from post_favorite where post_id = #{postId}
+    </delete>
+    <!--查询当前已收藏所有用户-->
+    <select id="selectUserIDByPostID" resultType="java.lang.Long">
+        SELECT user_id FROM post_favorite WHERE post_id = #{postId}
+    </select>
+</mapper>

src/main/resources/com/bao/dating/mapper/PostMapper.xml

@@ -29,10 +29,60 @@
     </insert>
 
     <!--动态删除-->
-    <delete id="deletePostById" parameterType="int">
+    <delete id="deletePostById">
         DELETE FROM post WHERE post_id = #{postId}
     </delete>
 
+    <!--动态查询-->
+    <resultMap id="PostResultMap" type="com.bao.dating.pojo.entity.Post">
+        <id property="postId" column="post_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="content" column="content"/>
+        <result property="mediaOssKeys" column="media_oss_keys" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="tags" column="tags" typeHandler="com.bao.dating.handler.ListToVarcharTypeHandler"/>
+        <result property="location" column="location"/>
+        <result property="isPublic" column="is_public"/>
+        <result property="likeCount" column="like_count"/>
+        <result property="favoriteCount" column="favorite_count"/>
+        <result property="createdAt" column="created_at"/>
+        <result property="updatedAt" column="updated_at"/>
+    </resultMap>
+    <select id="selectById" resultMap="PostResultMap">
+        SELECT 
+          post_id,
+          user_id,
+          content,
+          media_oss_keys,
+          tags,
+          location,
+          is_public,
+          like_count,
+          favorite_count,
+          created_at,
+          updated_at
+        FROM post WHERE post_id = #{postId}
+    </select>
+
+    <!--动态更新-->
+    <update id="updateById">
+        UPDATE post
+        <set>
+            <if test="content != null">
+                content = #{content},
+            </if>
+            <if test="tags != null">
+                tags = #{tags, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
+            </if>
+            <if test="mediaOssKeys != null">
+                media_oss_keys =
+                #{mediaOssKeys, typeHandler=com.bao.dating.handler.ListToVarcharTypeHandler},
+            </if>
+            is_public = #{isPublic},
+            updated_at = #{updatedAt}
+        </set>
+        WHERE post_id = #{postId}
+    </update>
+
     <!--增加点赞数量-->
     <update id="increaseLikeCount">
         update dating.post set like_count = like_count + 1 where post.post_id = #{postId}
@@ -42,10 +92,26 @@
     <update id="decreaseLikeCount">
         update dating.post set like_count= like_count - 1 where post.post_id = #{postId}
     </update>
+    <!--增加收藏数量-->
+    <update id="increaseFavoriteCount">
+        update post set favorite_count = favorite_count + 1 where post_id = #{post_id}
+    </update>
+    <!--减少收藏数量-->
+    <update id="decreaseFavoriteCount">
+        update post set favorite_count = favorite_count - 1 where post_id = #{post_id}
+    </update>
 
     <!--查询点赞当前数量-->
     <select id="selectLikeCount" resultType="java.lang.Integer">
         select dating.post.like_count from dating.post where post.post_id = #{postId}
     </select>
+    <!--查询当前动态的用户id-->
+    <select id="selectUserIdByPostId" resultType="java.lang.Long">
+        SELECT user_id FROM post WHERE post_id = #{post_id}
+    </select>
+    <!--查询当前收藏数量-->
+    <select id="selectFavoriteCount" resultType="java.lang.Integer">
+        select dating.post.favorite_count from dating.post where post.post_id = #{postId}
+    </select>
 
 </mapper>

src/test/java/com/bao/dating/DatingApplicationTests.java

@@ -31,10 +31,7 @@ public class DatingApplicationTests {
     public void testUploadAndScanImageFromUrl() {
         try {
             // 阿里oss图片url
-            String imageUrl = "https://heimato.oss-cn-beijing.aliyuncs.com/75d067b3-8605-494a-a839-b0a9d32c993a.jpg" +
+            String imageUrl = "https://heimatoo.oss-cn-beijing.aliyuncs.com/ScreenShot_2025-12-01_135624_491.png?x-oss-credential=LTAI5t5vpcbCZwweNHEDDDaF%2F20251222%2Fcn-beijing%2Foss%2Faliyun_v4_request&x-oss-date=20251222T092951Z&x-oss-expires=32400&x-oss-signature-version=OSS4-HMAC-SHA256&x-oss-signature=c06742a4e530c7a095aa4c376c3c88e605dddcd232d0ee07da76988e5ccb7727";
-                    "?x-oss-credential=LTAI5tKo9TpWH1aW6JxWm1Gp%2F20251218%2Fcn-beijing%2Foss%2Faliyun_v4_request" +
-                    "&x-oss-date=20251218T164128Z&x-oss-expires=32400&x-oss-signature-version=OSS4-HMAC-SHA256" +
-                    "&x-oss-signature=e9c46381a5d33e5c541fe2e838ff3ebeeb5dbc51f792ed31ae992aa0a4109d8a";
 
             // 将图片URL添加到列表中进行检测
             List<String> imageUrls = Arrays.asList(imageUrl);