修改好友申请列表，修改家族成员管理

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -13,8 +13,10 @@ import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbFamilyMemberService;
 import com.ruoyi.app.service.ITbFamilyService;
 import com.ruoyi.app.service.ITbMemberMiddleService;
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import io.swagger.annotations.Api;
@@ -24,6 +26,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.aspectj.weaver.bcel.AtAjAttributes;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -47,19 +50,10 @@ public class FamilyMemberController extends AppBaseController {
     private final ITbMemberMiddleService middleService;
 
     @ApiOperation("我的家族成员列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页",paramType="int"),
-            @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="int")
-    })
     @GetMapping("/list")
-    public TableDataInfo list(Integer pageNum, Integer pageSize) {
+    public AjaxResult list() {
         // 登录用户
-        AppMemberVo user = getLoginUser().getUser();
-        // 获取成员信息
-        AppMemberVo memberVo = appUserService.getAppMember(user.getUserId().toString(),"");
-        if (memberVo == null) {
-            return new TableDataInfo();
-        }
+        AppMemberVo memberVo = getLoginUser().getUser();
         // 获取默认家族信息
         TbFamily family = familyService.myFamily(memberVo.getMemberId());
         // 获取家族关联成员的信息
@@ -67,20 +61,20 @@ public class FamilyMemberController extends AppBaseController {
             .eq(TbMemberMiddle::getFamilyId, family.getId())
         );
         if (middles.size() <= 0) {
-            return new TableDataInfo();
+            return AjaxResult.success();
         }
         List<Long> ids = new ArrayList<>();
         middles.forEach(item -> {
             ids.add(item.getMemberId());
         });
         // 根据家族获取成员信息
-        pageNum = pageNum == null ? 1 : pageNum;
-        pageSize = pageSize == null ? 10 : pageSize;
-        PageHelper.startPage(pageNum, pageSize, "py_first asc");
+//        pageNum = pageNum == null ? 1 : pageNum;
+//        pageSize = pageSize == null ? 10 : pageSize;
+//        PageHelper.startPage(pageNum, pageSize, "py_first asc");
         List<TbFamilyMember> list = memberService.list(new LambdaQueryWrapper<TbFamilyMember>()
             .in(TbFamilyMember::getId, ids)
         );
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation("家族树")
@@ -169,4 +163,19 @@ public class FamilyMemberController extends AppBaseController {
         }
         return AjaxResult.success(memberService.get(memberId));
     }
+
+    /**
+     * 删除家族成员
+     */
+    @ApiOperation("删除家族成员")
+    @DeleteMapping("/{familyId}/{ids}" )
+    public AjaxResult remove(@PathVariable String familyId, @PathVariable Long[] ids) {
+        if (familyId == null) {
+            return AjaxResult.error("家族id不能为空");
+        }
+        if (ids.length <= 0) {
+            return AjaxResult.error("未选择要删的成员");
+        }
+        return memberService.delMember(familyId,ids);
+    }
 }

ruoyi-app/src/main/java/com/ruoyi/app/controller/MyFriendController.java

@@ -128,21 +128,15 @@ public class MyFriendController extends AppBaseController {
 
 
     @ApiOperation("申请列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "当前页",paramType="int"),
-            @ApiImplicitParam(name = "pageSize", value = "每页行数",paramType="int")
-    })
     @GetMapping("/selectApply")
-    public TableDataInfo selectApply(@LoginAppUser AppMemberVo loginUser, Integer pageNum, Integer pageSize) {
+    public AjaxResult selectApply() {
+        AppMemberVo loginUser = getLoginUser().getUser();
         Long appUserId = loginUser.getUserId();
-        pageNum = pageNum == null ? 1 : pageNum;
-        pageSize = pageSize == null ? 10 : pageSize;
-        PageHelper.startPage(pageNum, pageSize, "create_time desc");
-        List<TbMyFriends> list = friendsService.list(new LambdaQueryWrapper<TbMyFriends>()
+        List<TbMyFriends> list = friendsService.selectApply(new LambdaQueryWrapper<TbMyFriends>()
                 .eq(TbMyFriends::getFriendsUserId, appUserId)
                 .in(TbMyFriends::getStatus, Arrays.asList("1","3"))
         );
-        return getDataTable(list);
+        return AjaxResult.success(list);
     }
 
 

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbMyFriendsMapper.java

@@ -22,5 +22,6 @@ public interface TbMyFriendsMapper extends BaseMapper<TbMyFriends> {
 
 
     List<TbMyFriends> listFriends(@Param("id") Long uid, @Param("status") String status, @Param("search") String search);
+    List<TbMyFriends> selectApply(@Param(Constants.WRAPPER) LambdaQueryWrapper<TbMyFriends> wrapper);
 
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbMyFriendsService.java

@@ -1,7 +1,10 @@
 package com.ruoyi.app.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.app.domain.TbMyFriends;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,5 +18,5 @@ public interface ITbMyFriendsService extends IService<TbMyFriends> {
 
     List<TbMyFriends> pageList(TbMyFriends friends);
     TbMyFriends getByUid(Long userId, Long friendId);
-
+    List<TbMyFriends> selectApply(LambdaQueryWrapper<TbMyFriends> wrapper);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -112,18 +112,16 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
             return AjaxResult.error("删除失败，没有找到要删除的数据");
         }
         AtomicInteger ck = new AtomicInteger(0);
-        List<Long> mIds = Arrays.asList(ids);
         middleList.forEach(item -> {
             if (item.getParentId() != null) {
                 ck.set(1);
             }
-            mIds.add(item.getId());
         });
         // 如果成员已加入家族树，则需要先从家族树删除，才能删除成员
         if(ck.intValue() > 0) {
             return AjaxResult.error("删除失败，成员已加入家族树");
         }
-        if(!memberMiddleService.removeByIds(mIds)) {
+        if(!memberMiddleService.removeByIds(idList)) {
             return AjaxResult.error("删除失败");
         }
         return AjaxResult.success();

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyFriendsServiceImpl.java

@@ -58,4 +58,9 @@ public class TbMyFriendsServiceImpl extends ServiceImpl<TbMyFriendsMapper, TbMyF
                 .eq(TbMyFriends::getFriendsUserId, friendId)
         );
     }
+
+    @Override
+    public List<TbMyFriends> selectApply(LambdaQueryWrapper<TbMyFriends> wrapper){
+        return baseMapper.selectApply(wrapper);
+    }
 }

ruoyi-system/src/main/resources/mapper/app/TbMyFriendsMapper.xml

@@ -37,4 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="selectApply" resultType="com.ruoyi.app.domain.TbMyFriends" parameterType="String">
+        select f.*,u.nick_name,u.py_code,u.py_first
+        from tb_my_friends f left join tb_app_user u on f.app_user_id = u.id
+        ${ew.customSqlSegment}
+    </select>
+
 </mapper>