Merge remote-tracking branch 'upstream/master'

动态图片存放在post/下的/yyyy/MM目录中

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

@@ -11,6 +11,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
 import java.io.ByteArrayInputStream;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 @Data
 @Slf4j
@@ -30,7 +32,6 @@ public class AliOssUtil {
      * @return 完整的文件访问URL
      */
     public String upload(byte[] bytes, String objectName) {
-
         // 创建OSSClient实例。
         OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
 

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

@@ -45,15 +45,15 @@ public class PostController {
     }
 
     /**
-     * 删除动态
+     * 批量删除动态
      *
-     * @param postId 动态ID
+     * @param postIds 动态ID
      * @return 删除结果
      */
-    @DeleteMapping("/{postId}")
+    @DeleteMapping
-    public Result<String> deleteById(@PathVariable Long postId){
+    public Result<String> deleteById(@RequestParam List<Long> postIds){
-        postService.deletePostById(postId);
+        int deletedCount = postService.deletePostById(postIds);
-        return Result.success(ResultCode.SUCCESS_DELETE, "动态删除成功", null);
+        return Result.success(ResultCode.SUCCESS_DELETE, deletedCount > 0 ? "成功删除" : "删除失败，该动态不存在", null);
     }
 
     /**

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

@@ -4,6 +4,8 @@ import com.bao.dating.pojo.entity.Post;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface PostMapper {
     /**
@@ -16,9 +18,9 @@ public interface PostMapper {
     /**
      * 根据ID删除动态
      *
-     * @param postId 动态ID
+     * @param postIds 动态ID
      */
-    void deletePostById(@Param("postId") Long postId);
+    int deletePostByIds(@Param("postIds") List<Long> postIds);
 
     /**
      * 根据ID查询动态

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

@@ -24,13 +24,12 @@ public interface PostService {
     Post createPost(Long userId, PostRequestDTO postRequestDTO);
 
     /**
-     * 删除动态
+     * 批量删除动态
-     * @param postId 动态ID
+     * @param postIds 动态ID
      * @return 删除的动态对象
      */
-    void deletePostById(Long postId);
+    int deletePostById(List<Long> postIds);
 
-    void deletePostById(Integer postId);
 
     /**
      * 查询动态详情（用于编辑）

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

@@ -12,10 +12,13 @@ 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.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -55,8 +58,11 @@ public class PostServiceImpl implements PostService {
                     try {
                         // 根据文件扩展名判断文件类型
                         String fileType = FileUtil.getFileType(file.getOriginalFilename());
+                        // 创建目录
+                        String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
                         // 生成唯一文件名
-                        String fileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
+                        String newFileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
+                        String fileName = "post/" + dir + "/" + newFileName;
                         // 获取文件字节数据
                         byte[] fileBytes = file.getBytes();
                         // 根据文件类型处理
@@ -106,9 +112,6 @@ public class PostServiceImpl implements PostService {
         }
 
         String textSuggestion = (String) textResult.get("suggestion");
-        if ("block".equals(textSuggestion)) {
-            throw new RuntimeException("动态内容违规，禁止发布");
-        }
 
         // 2. 图片审核（如果有）
         if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
@@ -153,22 +156,25 @@ public class PostServiceImpl implements PostService {
         return post;
     }
 
-    @Override
-    public void deletePostById(Long postId) {
-        postMapper.deletePostById(postId);
-    }
-
     /**
-     * 删除动态
+     * 批量删除动态
      *
-     * @param postId 动态ID
+     * @param postIds 动态ID
      * @return 删除的动态对象
      */
     @Override
-    public void deletePostById(Integer postId) {
+    @Transactional(rollbackFor = Exception.class)
-        postMapper.deletePostById(Long.valueOf(postId));
+    public int deletePostById(List<Long> postIds) {
+        // 批量删除动态
+        return postMapper.deletePostByIds(postIds);
     }
 
+    /**
+     * 查询动态详情（用于编辑）
+     *
+     * @param postId 动态ID
+     * @return
+     */
     @Override
     public PostEditVO getPostForEdit(Long postId) {
 

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

@@ -29,8 +29,23 @@
     </insert>
 
     <!--动态删除-->
-    <delete id="deletePostById">
+    <delete id="deletePostByIds">
-        DELETE FROM post WHERE post_id = #{postId}
+        DELETE FROM post WHERE post_id IN
+        <foreach item="postId" index="index" collection="postIds" separator="," open="(" close=")">
+            #{postId}
+        </foreach>
+    </delete>
+    <!--删除收藏记录-->
+    <delete id="1">
+        DELETE FROM post_favorite WHERE post_id = #{postId}
+    </delete>
+    <!--删除点赞记录-->
+    <delete id="2">
+        DELETE FROM post_like WHERE post_id = #{postId}
+    </delete>
+    <!--动态评论删除-->
+    <delete id="3">
+        DELETE FROM comments WHERE post_id = #{postId}
     </delete>
 
     <!--动态查询-->