From 156e09d4df3f306746597a9f31c416b436bc0f50 Mon Sep 17 00:00:00 2001 From: majintao Date: Mon, 12 Aug 2024 15:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=89=A9=E4=BD=99=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=AC=A1=E6=95=B0=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=80=BB=E6=AC=A1=E6=95=B0=E5=92=8C=E5=B7=B2?= =?UTF-8?q?=E7=94=A8=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/controllers/UsersController.java | 20 +++++++++++-------- .../fangjia/open/model/ApiMonitorInfo.java | 19 +++++++++++++++++- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java index 69b48a5f8..951c354b3 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/UsersController.java @@ -149,17 +149,21 @@ public class UsersController { // 改成遍历用户有的uri for (OpenResource openResource : userResources) { String uri = openResource.getUri(); + ApiMonitorInfo info = new ApiMonitorInfo(); + info.setApiUri(uri); + info.setApiName(openResource.getName()); + info.setUserId((int) id); + info.setUsername(user.getUserName()); if (null != countMap.get(uri) && countMap.get(uri) > 0) { - ApiMonitorInfo info = new ApiMonitorInfo(); - info.setApiUri(uri); - info.setApiName(openResource.getName()); - info.setUserId((int) id); - info.setUsername(user.getUserName()); long curVistedCount = apiVisitCountService.findApiVisitCountByDay(id, uri, DateUtil.truncateDay(new Date())); - long total = apiVisitCountService.findApiVisitAllCount(id, uri, DateUtil.truncateDay(new Date())); - info.setSurplusCallCount(countMap.get(uri) - curVistedCount - total); - list.add(info); + long historyCount = apiVisitCountService.findApiVisitAllCount(id, uri, DateUtil.truncateDay(new Date())); + Integer totalCount = countMap.get(uri); + info.setTotalCallCount(Long.valueOf(totalCount)); + long usedCount = curVistedCount + historyCount; + info.setSurplusCallCount(totalCount - usedCount); + info.setUsedCallCount(usedCount); } + list.add(info); } } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiMonitorInfo.java b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiMonitorInfo.java index 0fdb11e38..481c6bf62 100644 --- a/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiMonitorInfo.java +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/model/ApiMonitorInfo.java @@ -10,6 +10,8 @@ public class ApiMonitorInfo { private String apiUri; private String apiName; private Long surplusCallCount; + private Long totalCallCount; + private Long usedCallCount; private Date endTime; public Long getSurplusCallCount() { @@ -60,5 +62,20 @@ public class ApiMonitorInfo { public void setApiName(String apiName) { this.apiName = apiName; } - + + public Long getTotalCallCount() { + return totalCallCount; + } + + public void setTotalCallCount(Long totalCallCount) { + this.totalCallCount = totalCallCount; + } + + public Long getUsedCallCount() { + return usedCallCount; + } + + public void setUsedCallCount(Long usedCallCount) { + this.usedCallCount = usedCallCount; + } }