From 3fb754a359d5d51cb0b7f9b988baa141bdc02f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=BF=97=E6=81=92?= <842328916@qq.com> Date: Sun, 7 Sep 2025 11:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0-myApi-diamondStat=E6=8B=86?= =?UTF-8?q?=E5=88=86=E4=B8=A4=E4=B8=AA=E6=97=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accompany/admin/service/api/MyApiService.java | 8 +++++++- .../admin/controller/api/MyApiController.java | 15 ++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java index 26d4dbe73..86801a6ce 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/api/MyApiService.java @@ -618,12 +618,18 @@ public class MyApiService { }); } - public void diamondStat(String date) { + public void diamondStatAr(String date) { List partitionIds = List.of(PartitionEnum.ARAB.getId(), PartitionEnum.TURKEY.getId()); Date now = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); diamondStatService.stat(partitionIds, now); } + public void diamondStatEn(String date) { + List partitionIds = List.of(PartitionEnum.ENGLISH.getId(), PartitionEnum.CHINESE.getId(), PartitionEnum.ENGLISH2.getId()); + Date now = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); + diamondStatService.stat(partitionIds, now); + } + public void dauStat(String date) { Date now = DateTimeUtil.convertStrToDate(date, DateTimeUtil.DEFAULT_DATE_PATTERN); String yesterday = DateTimeUtil.convertDate(DateTimeUtil.addDays(now, -1), DateTimeUtil.DEFAULT_DATE_PATTERN); diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java index 1669b1e41..cbb791666 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/api/MyApiController.java @@ -220,12 +220,21 @@ public class MyApiController { return BusiResult.success(); } - @GetMapping("/diamondStat") - public BusiResult diamondStat(Long roomId, String date) { + @GetMapping("/diamondStatAr") + public BusiResult diamondStatAr(Long roomId, String date) { if (null == roomId || !roomId.equals(603L)) { throw new AdminServiceException(BusiStatus.PARAMERROR); } - myApiService.diamondStat(date); + myApiService.diamondStatAr(date); + return BusiResult.success(); + } + + @GetMapping("/diamondStatEn") + public BusiResult diamondStatEn(Long roomId, String date) { + if (null == roomId || !roomId.equals(603L)) { + throw new AdminServiceException(BusiStatus.PARAMERROR); + } + myApiService.diamondStatEn(date); return BusiResult.success(); }