获取家族申请数量，获取好友申请数量；会员表添加 是否接收消息字段receive

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

@@ -277,4 +277,18 @@ public class FamilyController extends AppBaseController {
         return AjaxResult.success(family);
     }
 
+    /**
+     * 获取家族申请数量
+     */
+    @ApiOperation("获取家族申请数量")
+    @ApiImplicitParam(name = "familyId", value = "家族id",paramType="Long")
+    @GetMapping(value = "/getApplyCount" )
+    public AjaxResult getApplyCount(Long familyId) {
+
+        if (familyId == null){
+            return AjaxResult.error("家族id不能为空");
+        }
+        return AjaxResult.success(familyService.getApplyCount(familyId));
+    }
+
 }

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

@@ -174,4 +174,16 @@ public class MyFriendController extends AppBaseController {
         }
         return toAjax(friendsService.removeById(id) ? 1 : 0);
     }
+
+    /**
+     * 获取好友申请数量
+     */
+    @ApiOperation("获取好友申请数量")
+    @GetMapping(value = "/getApplyCount")
+    public AjaxResult getApplyCount() {
+        AppMemberVo loginUser = getLoginUser().getUser();
+        Long appUserId = loginUser.getUserId();
+        return AjaxResult.success(friendsService.getApplyCount(appUserId));
+    }
+
 }

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbAppUser.java

@@ -1,6 +1,7 @@
 package com.ruoyi.app.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -81,6 +82,9 @@ public class TbAppUser implements Serializable {
     private String pyFirst;
     private String clientId;
 
+    /** 接收消息  1是 0否 */
+    private String receive;
+
     /** 创建者 */
     private Long createBy;
 

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppMemberVo.java

@@ -83,6 +83,11 @@ public class AppMemberVo extends BaseEntity {
     @ApiModelProperty(value="个推客户端id")
     private String clientId;
 
+    /** 接收消息  1是 0否 */
+    @ApiModelProperty(value="删除  1是 0否")
+    @Excel(name = "接收消息  1是 0否")
+    private String receive;
+
 
     @ApiModelProperty(value="会员昵称拼音首字母")
     private String userPyCode;

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

@@ -26,4 +26,6 @@ public interface ITbFamilyService extends IService<TbFamily> {
     TbFamily myFamily(Long memberId);
     boolean change(Long memberId,Long familyId);
     AjaxResult applyFamily(AppMemberVo memberVo);
+    int getApplyCount(Long familyId);
+
 }

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

@@ -19,4 +19,5 @@ public interface ITbMyFriendsService extends IService<TbMyFriends> {
     List<TbMyFriends> pageList(TbMyFriends friends);
     TbMyFriends getByUid(Long userId, Long friendId);
     List<TbMyFriends> selectApply(LambdaQueryWrapper<TbMyFriends> wrapper);
+    int getApplyCount(Long userId);
 }

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

@@ -131,8 +131,12 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
         // 管理员列表
         List<AppMemberVo> memberVos = memberService.myMemberList(new LambdaQueryWrapper<AppMemberVo>()
                 .eq(AppMemberVo::getFamilyId,familyId)
+                //已通过
                 .eq(AppMemberVo::getStatus,"2")
+                //管理员标志
                 .eq(AppMemberVo::getAdmin,"Y")
+                //接收消息标志
+                .eq(AppMemberVo::getReceive,"Y")
         );
         if (memberVos.size() <= 0) {
             return;
@@ -152,6 +156,20 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
         PushUtil.sendMessage("家族通知",builder.toString(),cids);
     }
 
+    /**
+     * 获取家族申请数量
+     * @param familyId
+     * @return
+     */
+    @Override
+    public int getApplyCount(Long familyId) {
+        List<TbMemberMiddle> middles = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
+                .eq(TbMemberMiddle::getFamilyId,familyId)
+                .eq(TbMemberMiddle::getStatus,"1")
+        );
+        return middles.size();
+    }
+
     @Override
     public boolean saveFamily(TbFamily family){
         if (familyService.save(family)) {

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

@@ -63,4 +63,13 @@ public class TbMyFriendsServiceImpl extends ServiceImpl<TbMyFriendsMapper, TbMyF
     public List<TbMyFriends> selectApply(LambdaQueryWrapper<TbMyFriends> wrapper){
         return baseMapper.selectApply(wrapper);
     }
+
+    @Override
+    public int getApplyCount(Long userId) {
+        List<TbMyFriends> friends = baseMapper.selectList(new LambdaQueryWrapper<TbMyFriends>()
+                .eq(TbMyFriends::getFriendsUserId,userId)
+                .eq(TbMyFriends::getStatus,"1")
+        );
+        return friends.size();
+    }
 }

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

@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="verCode"    column="ver_code"    />
         <result property="enable"    column="enable"    />
         <result property="deleted"    column="deleted"    />
+        <result property="receive"    column="receive"    />
         <result property="loginIp"    column="login_ip"    />
         <result property="loginTime"    column="login_time"    />
         <result property="createBy"    column="create_by"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <sql id="sqlAppMember">
         select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,a.deleted,a.enable,a.login_time,a.login_ip,
-        a.py_code user_py_code,a.py_first user_py_first,
+        a.py_code user_py_code,a.py_first user_py_first,a.receive,
         a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark
         ,
         b.id member_id,b.spouse_user_id,b.name,b.birthday,b.gender,b.education,b.state,b.py_code member_py_code,b.py_first member_py_first,

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

@@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectFamilyMember" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
         select u.id user_id,m.id member_id,u.mobile,u.qrcode,u.nick_name,u.avatar,u.client_id,
-        u.py_code user_py_code,u.py_first user_py_first,
+        u.py_code user_py_code,u.py_first user_py_first,u.receive,
         m.name,m.gender,m.birthday,m.spouse_user_id,m.state,
         m.py_code member_py_code,m.py_first member_py_first,
         mi.family_id,mi.parent_id,mi.admin,mi.acquiesce,mi.status,mi.patriarch,
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFamilyTree" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
         select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,
         a.deleted,a.enable,a.login_time,a.login_ip, a.py_code user_py_code,a.py_first user_py_first,a.client_id,
-        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by,
+        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by,a.receive,
         a.update_time user_update_time, a.remark user_remark
         ,
         b.id member_id,b.spouse_user_id,b.name,b.birthday,b.gender,b.education,b.state,