合并分区

# 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

@@ -11,8 +11,6 @@ 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
@@ -32,6 +30,7 @@ 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

@@ -21,7 +21,7 @@ public class PostController {
     private PostService postService;
 
     /**
-     * 上传媒体文件接口
+     * 上传媒体文件接口 like
      * @param files 媒体文件数组
      * @return 上传后的文件URL列表
      */
@@ -45,14 +45,14 @@ public class PostController {
     }
 
     /**
-     * 批量删除动态
+     * 删除动态
      *
-     * @param postIds 动态ID
+     * @param postId 动态ID
      * @return 删除结果
      */
-    @DeleteMapping
-    public Result<String> deleteById(@RequestParam List<Long> postIds){
-        postService.deletePostById(postIds);
+    @DeleteMapping("/{postId}")
+    public Result<String> deleteById(@PathVariable Long postId){
+        postService.deletePostById(postId);
         return Result.success(ResultCode.SUCCESS_DELETE, "动态删除成功", null);
     }
 

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/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

@@ -4,8 +4,6 @@ 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 {
     /**
@@ -18,9 +16,9 @@ public interface PostMapper {
     /**
      * 根据ID删除动态
      *
-     * @param postIds 动态ID
+     * @param postId 动态ID
      */
-    void deletePostByIds(@Param("postIds") List<Long> postIds);
+    void deletePostById(@Param("postId") Long postId);
 
     /**
      * 根据ID查询动态
@@ -61,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/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

@@ -25,10 +25,12 @@ public interface PostService {
 
     /**
      * 删除动态
-     * @param postIds 动态ID
+     * @param postId 动态ID
      * @return 删除的动态对象
      */
-    void deletePostById(List<Long> postIds);
+    void deletePostById(Long postId);
+
+    void deletePostById(Integer postId);
 
     /**
      * 查询动态详情（用于编辑）
@@ -43,4 +45,11 @@ public interface PostService {
      * @return 修改后的动态对象
      */
     PostEditVO updatePost(Long postId, PostRequestDTO postRequestDTO);
+
+    /**
+     * 查询
+     * @param postId 动态id
+     * @return 用户id
+     */
+    Long selectUserIdByPostId(Long postId);
 }

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

@@ -12,13 +12,10 @@ 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;
@@ -58,11 +55,8 @@ public class PostServiceImpl implements PostService {
                     try {
                         // 根据文件扩展名判断文件类型
                         String fileType = FileUtil.getFileType(file.getOriginalFilename());
-                        // 创建目录
-                        String dir = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM"));
                         // 生成唯一文件名
-                        String newFileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
-                        String fileName = "post/" + dir + "/" + newFileName;
+                        String fileName = UUID.randomUUID().toString() + "." + FileUtil.getFileExtension(file.getOriginalFilename());
                         // 获取文件字节数据
                         byte[] fileBytes = file.getBytes();
                         // 根据文件类型处理
@@ -110,8 +104,11 @@ public class PostServiceImpl implements PostService {
         } catch (Exception e) {
             throw new RuntimeException("文本审核失败");
         }
-        // 文本审核结果
+
         String textSuggestion = (String) textResult.get("suggestion");
+        if ("block".equals(textSuggestion)) {
+            throw new RuntimeException("动态内容违规，禁止发布");
+        }
 
         // 2. 图片审核（如果有）
         if (postRequestDTO.getMediaOssKeys() != null && !postRequestDTO.getMediaOssKeys().isEmpty()) {
@@ -148,7 +145,6 @@ public class PostServiceImpl implements PostService {
                 post.setIsPublic(0);
             }
         }
-        
         post.setUpdatedAt(LocalDateTime.now());
         post.setCreatedAt(LocalDateTime.now());
 
@@ -157,17 +153,20 @@ public class PostServiceImpl implements PostService {
         return post;
     }
 
+    @Override
+    public void deletePostById(Long postId) {
+        postMapper.deletePostById(postId);
+    }
+
     /**
      * 删除动态
      *
-     * @param postIds 动态ID
+     * @param postId 动态ID
      * @return 删除的动态对象
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void deletePostById(List<Long> postIds) {
-        // 批量删除动态
-        postMapper.deletePostByIds(postIds);
+    public void deletePostById(Integer postId) {
+        postMapper.deletePostById(postId);
     }
 
     @Override
@@ -257,4 +256,15 @@ public class PostServiceImpl implements PostService {
         return postEditVO;
     }
 
+    /**
+     * 根据动态ID查询用户ID
+     *
+     * @param postId 动态ID
+     * @return 用户ID
+     */
+    @Override
+    public Long selectUserIdByPostId(Long postId) {
+        return postMapper.selectUserIdByPostId(postId);
+    }
+
 }

src/main/resources/application.yml

@@ -0,0 +1,28 @@
+server:
+  port: 8080
+
+spring:
+  datasource:
+    url: jdbc:mysql://110.42.41.177:3306/dating?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: JoyeeServe2025
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
+# MyBatis 配置
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.bao.dating.pojo
+  configuration:
+    map-underscore-to-camel-case: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+# 阿里云 OSS 配置
+aliyun:
+  oss:
+    endpoint: oss-cn-beijing.aliyuncs.com
+    access-key-id: LTAI5t5vpcbCZwweNHEDDDaF
+    access-key-secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
+    bucket-name: heimatoo
+  accessKeyId: LTAI5t5vpcbCZwweNHEDDDaF
+  secret: bBHBAPiCqGyVBHUv07348wsHXkKqrk
+  scenes: antispam

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,23 +29,8 @@
     </insert>
 
     <!--动态删除-->
-    <delete id="deletePostByIds">
-        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 id="deletePostById">
+        DELETE FROM post WHERE post_id = #{postId}
     </delete>
 
     <!--动态查询-->
@@ -107,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" +
-                    "?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";
+            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";
 
             // 将图片URL添加到列表中进行检测
             List<String> imageUrls = Arrays.asList(imageUrl);