From f1727d5cdc433d03321691540bc61fdc5bdc9cec Mon Sep 17 00:00:00 2001 From: wangwenchao Date: Wed, 21 Jun 2023 14:36:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=92=E6=9F=A5=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E6=8A=A5=E9=94=99=E5=8F=8A?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E4=B8=8D=E5=A5=BD=E4=BD=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=B9=B6=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/boecase/api/CasesRecommendApi.java | 13 +++++++------ .../xboe/module/boecase/vo/CasesRecommendVo.java | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java index ff551ed7..544a926d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesRecommendApi.java @@ -54,19 +54,20 @@ public class CasesRecommendApi extends ApiBaseController { /** * 用于后台管理分页 * - * @param pager * @param casesRecommendVo * @return */ @PostMapping("/page") - public JsonResponse> page(Pagination pager, CasesRecommendVo casesRecommendVo) { - PageList page = iCasesRecommendService.page(pager.getPageIndex(), pager.getPageSize(), casesRecommendVo); + public JsonResponse> page(@RequestBody CasesRecommendVo casesRecommendVo) { + PageList page = iCasesRecommendService.page(casesRecommendVo.getPageIndex(), casesRecommendVo.getPageSize(), casesRecommendVo); // 组装查看率 page.getList().forEach(it -> { List recordList = iCasesRecommendPushRecordService.findAllByRecommendId(it.getId()); - // 查看率：查看率=案例查看人数(各案例查看人数之合）/（当条推荐记录包含的案例 × 用户数） - long viewCount = recordList.stream().filter(record -> record.getReadFlag().equals(1)).count(); - it.setViewRate(String.valueOf(viewCount * 100 / recordList.size()).concat("%")); + if (CollectionUtil.isNotEmpty(recordList)){ + // 查看率：查看率=案例查看人数(各案例查看人数之合）/（当条推荐记录包含的案例 × 用户数） + long viewCount = recordList.stream().filter(record -> record.getReadFlag().equals(1)).count(); + it.setViewRate(String.valueOf(viewCount * 100 / recordList.size()).concat("%")); + } }); return success(page); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java index 24988595..0e4438a1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java @@ -1,12 +1,13 @@ package com.xboe.module.boecase.vo; +import com.xboe.common.Pagination; import lombok.Data; import java.time.LocalDateTime; import java.util.List; @Data -public class CasesRecommendVo { +public class CasesRecommendVo extends Pagination { /** 推荐人姓名 */ private String recommendName; From 877189f73020c9d29980625e22400845bf2d760c Mon Sep 17 00:00:00 2001 From: wangwenchao Date: Wed, 21 Jun 2023 15:39:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=81=94=E8=B0=83=E6=8E=92=E6=9F=A5?= =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=8E=A8=E8=8D=90=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=B8=8D=E8=83=BD=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xboe/module/boecase/vo/CasesRecommendVo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java index 0e4438a1..1d0ba10e 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/vo/CasesRecommendVo.java @@ -1,9 +1,9 @@ package com.xboe.module.boecase.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xboe.common.Pagination; import lombok.Data; -import java.time.LocalDateTime; import java.util.List; @Data @@ -13,6 +13,6 @@ public class CasesRecommendVo extends Pagination { private String recommendName; /** 推荐时间区间 */ - private List recommendTimeList; + private List recommendTimeList; }