Kaynağa Gözat

feat(family): S-cfc-357 family.familyMembers.list 成员列表分页/搜索+在线状态

E2E Test Bot 5 gün önce
ebeveyn
işleme
8c5e05413f

+ 30 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/family/FamilyMembersController.java

@@ -91,8 +91,36 @@ public Result<?> listMembers(@RequestBody(required = false) Map<String, Object>
     if (visibleOnly) {
         return Result.success(userService.getVisibleMembers(userId));
     }
-    List<FamilyMemberVO> members = familyMemberService.listMembers(userId);
-    return Result.success(members);
+    return listMembersWithPage(params, userId);
+}
+
+/**
+ * SC-P-04 family.familyMembers.list:成员列表分页/搜索(keyword/page/pageSize)。
+ * <p>兼容现状语义:不传分页/搜索参数时返回全量 {@code List<FamilyMemberVO>}(裸列表);
+ * 仅显式传入 page/pageSize/keyword 时返回分页结构 {@code {total, list}}(当前页数据)。</p>
+ * <p>边界:page/pageSize 显式为 0 或负数 → 400 校验失败(不再静默忽略)。</p>
+ */
+private Result<?> listMembersWithPage(Map<String, Object> params, Long userId) {
+    Long page = params != null ? ParamUtils.getLong(params.get("page")) : null;
+    Long pageSize = params != null ? ParamUtils.getLong(params.get("pageSize")) : null;
+    String keyword = params != null && params.get("keyword") != null
+            ? params.get("keyword").toString() : null;
+
+    boolean hasPageOrKeyword = page != null || pageSize != null
+            || (keyword != null && !keyword.trim().isEmpty());
+    if (!hasPageOrKeyword) {
+        List<FamilyMemberVO> members = familyMemberService.listMembers(userId);
+        return Result.success(members);
+    }
+    // SC-P-04 边界:非法分页参数(0/负数)→ 400 校验失败,而非静默忽略
+    if ((page != null && page <= 0) || (pageSize != null && pageSize <= 0)) {
+        return Result.error(400, "分页参数必须为正整数");
+    }
+    List<FamilyMemberVO> all = familyMemberService.listMembers(userId);
+    Map<String, Object> paged = FamilyMemberService.paginateMembers(all, keyword,
+            page != null ? page.intValue() : null,
+            pageSize != null ? pageSize.intValue() : null);
+    return Result.success(paged);
 }
 
 /**

+ 6 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/FamilyMemberVO.java

@@ -105,4 +105,10 @@ public class FamilyMemberVO {
 
     /** 是否可被切换视角(仅不可登录成员 true,由 service 层根据 openid 判定) */
     private Boolean isSwitchable;
+
+    /** 在线状态:true=在线, false=离线(SC-P-04 成员列表展示在线状态) */
+    private Boolean online;
+
+    /** 最后活跃时间(ISO 8601,用于前端计算在线/离线) */
+    private java.util.Date lastActiveAt;
 }

+ 58 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/FamilyMemberService.java

@@ -43,6 +43,9 @@ public class FamilyMemberService {
 
     private static final Logger log = LoggerFactory.getLogger(FamilyMemberService.class);
 
+    /** SC-P-04 family.familyMembers.list 在线判定窗口:最后互动时间距今 15 分钟内视为在线 */
+    private static final long ONLINE_WINDOW_MS = 15 * 60 * 1000L;
+
     @Resource
     private FamilyMemberMapper familyMemberMapper;
 
@@ -249,6 +252,50 @@ public class FamilyMemberService {
         return listMembersOfFamily(user.getFamilyId(), userId);
     }
 
+    /**
+     * 成员列表分页+搜索(SC-P-04 family.familyMembers.list 能力键,S-cfc-357)。
+     * <p>返回分页结构 {@code {total, list}}:total = 关键字匹配后的成员总数,list = 当前页数据。
+     * 无 keyword/page/pageSize 时等价于全量 {@link #listMembers(Long)}(兼容现状语义)。</p>
+     *
+     * @param userId   当前查看者(用于按本人家庭查询)
+     * @param keyword  昵称/姓名过滤关键字(null/空白 = 不过滤)
+     * @param page     页码(null/&lt;1 归一化为 1;非法值 0/负数由 Controller 校验拦截)
+     * @param pageSize 每页数量(null/&lt;1 默认 20)
+     * @return 分页结构 Map:{total: Integer, list: List&lt;FamilyMemberVO&gt;}
+     */
+    public Map<String, Object> listMembers(Long userId, String keyword, Integer page, Integer pageSize) {
+        return paginateMembers(listMembers(userId), keyword, page, pageSize);
+    }
+
+    /**
+     * 关键字过滤 + 分页(纯静态函数,Controller 在 mock 场景下也能复用)。
+     * <p>过滤口径:昵称/name 包含关键字(trim 后,null 安全);分页口径:page 从 1 起,pageSize 缺省 20。</p>
+     */
+    public static Map<String, Object> paginateMembers(List<FamilyMemberVO> members, String keyword,
+                                                      Integer page, Integer pageSize) {
+        Map<String, Object> result = new java.util.HashMap<>();
+        List<FamilyMemberVO> filtered = new ArrayList<>();
+        boolean hasKeyword = keyword != null && !keyword.trim().isEmpty();
+        if (hasKeyword) {
+            String kw = keyword.trim();
+            for (FamilyMemberVO vo : members) {
+                if ((vo.getNickname() != null && vo.getNickname().contains(kw))
+                        || (vo.getName() != null && vo.getName().contains(kw))) {
+                    filtered.add(vo);
+                }
+            }
+        } else {
+            filtered.addAll(members);
+        }
+        result.put("total", filtered.size());
+        int p = (page == null || page < 1) ? 1 : page;
+        int size = (pageSize == null || pageSize < 1) ? 20 : pageSize;
+        int from = Math.min((p - 1) * size, filtered.size());
+        int to = Math.min(from + size, filtered.size());
+        result.put("list", new ArrayList<>(filtered.subList(from, to)));
+        return result;
+    }
+
     /**
      * 获取指定家庭的成员列表(B2-1 新增)。
      * <p>按 familyId 直接查询(成长规划师查看绑定家庭、管理端查看任意家庭时使用);
@@ -393,6 +440,10 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
             }
             vo.setLastInteractionAt(fm.getLastInteractionAt());
             vo.setStreakDays(fm.getStreakDays());
+            // SC-P-04 family.familyMembers.list:在线状态(口径 = lastInteractionAt 最后互动时间)
+            vo.setLastActiveAt(fm.getLastInteractionAt());
+            vo.setOnline(fm.getLastInteractionAt() != null
+                    && (System.currentTimeMillis() - fm.getLastInteractionAt().getTime()) < ONLINE_WINDOW_MS);
             // 兼容旧前端字段
             vo.setMemberId(fm.getId());
             vo.setName(resolveMemberNickname(fm));
@@ -441,6 +492,9 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
             vo.setShowToFamily(p.getShowToFamily() != null ? p.getShowToFamily() : 1);
             vo.setIsSpouse(false);
             vo.setTotalPoints(p.getTotalPoints());
+            // SC-P-04 family.familyMembers.list:在线状态(users 表无 lastInteractionAt,默认离线)
+            vo.setLastActiveAt(null);
+            vo.setOnline(false);
             result.add(vo);
         }
 
@@ -1354,6 +1408,10 @@ vo.setIsSelf(viewerMember != null && viewerMember.getId().equals(fm.getId()));
         } else {
             vo.setIsSwitchable(true);
         }
+        // SC-P-04 family.familyMembers.list:在线状态(口径 = lastInteractionAt 最后互动时间)
+        vo.setLastActiveAt(member.getLastInteractionAt());
+        vo.setOnline(member.getLastInteractionAt() != null
+                && (System.currentTimeMillis() - member.getLastInteractionAt().getTime()) < ONLINE_WINDOW_MS);
         return vo;
     }