From 47c54503eed31d66e65ca11414c628f4fed73d48 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Tue, 11 Feb 2025 15:15:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE--=E6=B7=BB=E5=8A=A0--APP=20?=
 =?UTF-8?q?=E6=B3=A8=E9=94=80=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/AppSystemController.java   | 22 ++++++++++++++++++-
 .../system/mapper/SysUserFollowMapper.java    |  6 +++++
 .../system/service/ISysUserFollowService.java |  5 +++++
 .../impl/SysUserFollowServiceImpl.java        |  8 +++++++
 .../mapper/system/SysUserFollowMapper.xml     |  4 ++++
 5 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index c7036c52..a1d9ef3d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1579,7 +1579,7 @@ public class AppSystemController extends BaseController {
     public TableDataInfo addFollowerList()
     {
         Long userId = getUserId();
-
+        startPage();
         List<FollowerListDto> addFollowerList = userFollowService.getAddFollowerList(userId);
 
 
@@ -1663,6 +1663,7 @@ public class AppSystemController extends BaseController {
         // 点了之后所有的点赞信息应该已读
         userNotificationService.readNotifiaction(userId, "2", "1");
 
+        startPage();
         // 先从系统通知中获取
         List<WorkLikeDto> addLikeList = userNotificationService.getWorkLikeList(userId);
         return getDataTable(addLikeList);
@@ -1918,6 +1919,25 @@ public class AppSystemController extends BaseController {
         return AjaxResult.success(userMessageVo);
     }
 
+    // 设置--注销账号--完全删除
+    @Transactional
+    @GetMapping("/deleteUserAccount")
+    public AjaxResult deleteUserAccount()
+    {
+        Long userId = getUserId();
+        if(sysUserService.deleteUserById(userId) > 0){
+
+
+            // 对所有本账号关注的人, 删除 sys_user_follow中的数据
+            // 现不删除其点赞数据.
+            userFollowService.deleteSysUserFollowUserId(userId);
+
+            return success();
+        }else{
+            return error();
+        }
+    }
+
 
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java
index 3bd856ff..4e4c68a8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserFollowMapper.java
@@ -90,4 +90,10 @@ public interface SysUserFollowMapper
      * 获取新增关注列表
      * */
     public List<FollowerListDto> getAddFollowerList(Long userId);
+
+    /*
+
+    * 设置--注销账号--删除用户关注表中的数据
+    */
+    public int deleteSysUserFollowUserId(Long userId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java
index 8fbc002d..41264f9f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserFollowService.java
@@ -89,4 +89,9 @@ public interface ISysUserFollowService
     * 获取新增关注列表
     * */
     public List<FollowerListDto> getAddFollowerList(Long userId);
+
+    /*
+    * 设置--注销账号--清除本人关注数据
+    * */
+    public int deleteSysUserFollowUserId(Long userId);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java
index c8bc2c67..67bc9ca8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserFollowServiceImpl.java
@@ -141,4 +141,12 @@ public class SysUserFollowServiceImpl implements ISysUserFollowService
     public List<FollowerListDto> getAddFollowerList(Long userId){
         return sysUserFollowMapper.getAddFollowerList(userId);
     }
+
+    /*
+     * 设置--注销账号--清除本人关注数据
+     * */
+    @Override
+    public int deleteSysUserFollowUserId(Long userId){
+        return sysUserFollowMapper.deleteSysUserFollowUserId(userId);
+    }
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
index 5fb54f88..e95a4f21 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserFollowMapper.xml
@@ -104,6 +104,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <delete id="deleteSysUserFollowUserId" parameterType="Long">
+        delete from sys_user_follow where user_id = #{userId}
+    </delete>
+
     <delete id="deleteSysUserFollowById" parameterType="Long">
         delete from sys_user_follow where id = #{id}
     </delete>