refactor(ai): 优化会员学习记录查询逻辑

Administrator

1 days ago 001da1169ce18233a46bf22abd352cf8fa979f2c

 src/main/java/cc/mrbird/febs/ai/service/impl/AiMemberServiceImpl.java

@@ -241,8 +241,6 @@
        String companyId = LoginUserUtil.getLoginUser().getCompanyId();
        String memberUuid = dto.getMemberUuid();



        // 创建分页对象，传入当前页和每页大小
        Page<AiMemberPoint> page = new Page<>(dto.getPageNow(), dto.getPageSize());
        LambdaQueryWrapper<AiMemberPoint> queryWrapper = Wrappers.lambdaQuery(AiMemberPoint.class);
@@ -251,24 +249,28 @@
        Page<AiMemberPoint> pageListByQuery = aiMemberPointService.getBaseMapper().selectPage(page, queryWrapper);
        List<AiMemberPoint> aiMemberPoints = pageListByQuery.getRecords();

//        List<AiMemberPoint> aiMemberPoints = aiMemberPointService.getListByCompanyIdAndMemberUuid(companyId, memberUuid);
        if (CollUtil.isEmpty(aiMemberPoints)){
            return new FebsResponse().success().data(vos);
        }
        Map<String, List<AiMemberPoint>> aiMemberPointMap = new HashMap<>();
        if (CollUtil.isNotEmpty(aiMemberPoints)){
            //stream操作aiMemberPoints，返回一个Map<productPointId,List<AiMemberPoint>>
            aiMemberPointMap = aiMemberPoints.stream().collect(Collectors.groupingBy(AiMemberPoint::getProductPointId));
        }

        //stream流操作aiMemberPoints，返回一个productPointId的set集合
        Set<String> productPointIdSet = aiMemberPoints.stream().map(AiMemberPoint::getProductPointId).collect(Collectors.toSet());
        // 按 productPointId 分组并计算每个分组的总学习时间
        Map<String, Integer> productPointTimeMap = aiMemberPoints.stream()
                .collect(Collectors.groupingBy(
                        AiMemberPoint::getProductPointId,
                        Collectors.summingInt(AiMemberPoint::getTotalTime)
                ));

        // stream流操作aiMemberPoints，返回一个productPointId的set集合
        Set<String> productPointIdSet = aiMemberPoints.stream()
                .map(AiMemberPoint::getProductPointId)
                .collect(Collectors.toSet());

        List<AiProductPoint> aiProductPoints = aiProductPointService.getBaseMapper().selectList(
                Wrappers.lambdaQuery(AiProductPoint.class)
                        .select(AiProductPoint::getId,AiProductPoint::getTitle)
                        .select(AiProductPoint::getId, AiProductPoint::getTitle)
                        .in(AiProductPoint::getId, productPointIdSet)
        );

        if (CollUtil.isEmpty(aiProductPoints)){
            return new FebsResponse().success().data(vos);
        }
@@ -276,20 +278,15 @@
        for (AiProductPoint aiProductPoint : aiProductPoints){
            ApiMemberTeamStudyVo vo = new ApiMemberTeamStudyVo();
            vo.setTitle(aiProductPoint.getTitle());
            Integer totalTime = 0;
            if (aiMemberPointMap.containsKey(aiProductPoint.getId())){
                List<AiMemberPoint> memberPoints = aiMemberPointMap.get(aiProductPoint.getId());
                for (AiMemberPoint memberPoint : memberPoints){
                    totalTime += memberPoint.getTotalTime();
                }
            }
            vo.setTotalTime(DateUtil.secondToTime(totalTime));

            Integer totalTime = productPointTimeMap.get(aiProductPoint.getId());
            // 添加 null 值保护，避免 NPE
            vo.setTotalTime(DateUtil.secondToTime(totalTime != null ? totalTime : 0));
            vos.add(vo);
        }

        return new FebsResponse().success().data(vos);
    }


    @Override
    public FebsResponse talkPage(ApiMemberTalkPageDto dto) {
@@ -392,23 +389,51 @@
        // 创建分页对象，传入当前页和每页大小
        Page<ApiCompanyStudyVo> page = new Page<>(dto.getPageNow(), dto.getPageSize());
        IPage<ApiCompanyStudyVo> result = aiMemberAnswerService.selectListPage(dto, page);
//        List<ApiCompanyStudyVo> records = result.getRecords();
//        if (CollUtil.isNotEmpty(records)){
//            //stream流获取re cords集合中的元素productId的set集合
//            Set<String> collect = records.stream().map(ApiCompanyStudyVo::getProductId).collect(Collectors.toSet());
//            List<AiMemberAnswer>  list = aiMemberAnswerService.getIdListByCompanyIdAndProductId(companyId,  collect);
//            if (CollUtil.isNotEmpty(list)){
//                //利用stream流，操作集合list，返回一个map对象，key为productId，value为按照productId分组的集合的大小,默认值为0
//                Map<String, Long> memberAnswerItemCountMap =
//                        list.stream().collect(Collectors.groupingBy(
//                                        AiMemberAnswer::getProductId,
//                                        Collectors.counting()
//                                ));
//                for ( ApiCompanyStudyVo record : records){
//                     record.setPracticeCnt(memberAnswerItemCountMap.getOrDefault(record.getProductId(), 0L).intValue());
//                }
//            }
//        }

        List<ApiCompanyStudyVo> records = result.getRecords();
        if (CollUtil.isNotEmpty(records)){
            //stream流获取re cords集合中的元素productId的set集合
            Set<String> collect = records.stream().map(ApiCompanyStudyVo::getProductId).collect(Collectors.toSet());
            List<AiMemberAnswer>  list = aiMemberAnswerService.getIdListByCompanyIdAndProductId(companyId,  collect);
            if (CollUtil.isNotEmpty(list)){
                //利用stream流，操作集合list，返回一个map对象，key为productId，value为按照productId分组的集合的大小,默认值为0
                Map<String, Long> memberAnswerItemCountMap =
                        list.stream().collect(Collectors.groupingBy(
                                        AiMemberAnswer::getProductId,
                                        Collectors.counting()
                                ));
                for ( ApiCompanyStudyVo record : records){
                     record.setPracticeCnt(memberAnswerItemCountMap.getOrDefault(record.getProductId(), 0L).intValue());
            // 安全地获取 productId 集合，过滤掉 null 值
            Set<String> collect = records.stream()
                    .filter(Objects::nonNull)
                    .map(ApiCompanyStudyVo::getProductId)
                    .filter(Objects::nonNull)
                    .collect(Collectors.toSet());

            if (CollUtil.isNotEmpty(collect)) {  // 确保 collect 不为空
                List<AiMemberAnswer> list = aiMemberAnswerService.getIdListByCompanyIdAndProductId(companyId, collect);
                if (CollUtil.isNotEmpty(list)){
                    Map<String, Long> memberAnswerItemCountMap = list.stream()
                            .collect(Collectors.groupingBy(
                                    AiMemberAnswer::getProductId,
                                    Collectors.counting()
                            ));

                    for (ApiCompanyStudyVo record : records){
                        if (record != null && record.getProductId() != null) {
                            record.setPracticeCnt(memberAnswerItemCountMap.getOrDefault(record.getProductId(), 0L).intValue());
                        }
                    }
                }
            }
        }

        return new FebsResponse().success().data(result);
    }