From 02881dd139000da4a0c46c299e24d3aea65e0dd7 Mon Sep 17 00:00:00 2001 From: xjs <1294405880@qq.com> Date: Wed, 6 Apr 2022 09:53:49 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F=E7=BB=9F=E8=AE=A1apiLog?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xjs/business/log/RemoteLogFeign.java | 8 ++ .../log/factory/RemoteLogFactory.java | 9 +++ .../api/business/statistics/apistatistics.js | 9 +++ .../statistics/apistatistics/index.vue | 81 +++++++++++++++++-- .../statistics/weatherstatistics/index.vue | 2 +- .../apilog/controller/ApiLogController.java | 24 ++++-- .../com/xjs/apilog/mapper/ApiLogMapper.java | 13 +++ .../xjs/apilog/service/IApiLogService.java | 9 +++ .../service/impl/ApiLogServiceImpl.java | 21 ++++- .../main/java/com/xjs/apilog/vo/ApiLogVo.java | 23 ++++++ .../resources/mapper/log/ApiLogMapper.xml | 6 ++ .../controller/ApiStatisticsController.java | 9 +++ .../com/xjs/service/ApiStatisticsService.java | 7 ++ .../impl/ApiStatisticsServiceImpl.java | 26 +++++- 14 files changed, 230 insertions(+), 17 deletions(-) create mode 100644 xjs-business/xjs-business-log/src/main/java/com/xjs/apilog/vo/ApiLogVo.java diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java index 13988d37..551abd52 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/RemoteLogFeign.java @@ -7,8 +7,13 @@ import com.xjs.business.log.domain.TaskLog; import com.xjs.business.log.domain.WebmagicLog; import com.xjs.business.log.factory.RemoteLogFactory; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.Map; /** * rpc远程调用日志服务接口 @@ -23,6 +28,9 @@ public interface RemoteLogFeign { @PostMapping("/apilog/forPRC") R saveApiLog(@RequestBody ApiLog apiLog); + @GetMapping("/apilog/byDateForRPC") + R> statisticsByDate(@RequestParam("startDate") String startDate, @RequestParam("endDate") String endDate); + @PostMapping("reptileLog/saveForPRC") R saveReptileLog(@RequestBody WebmagicLog webmagicLog); diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java index 3b4693f5..b47b847d 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/xjs/business/log/factory/RemoteLogFactory.java @@ -10,6 +10,9 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Map; + /** * 日志远程调用rpc服务降级处理 * @author xiejs @@ -28,6 +31,12 @@ public class RemoteLogFactory implements FallbackFactory { return R.fail("日志模块api日志服务添加调用失败" + cause.getMessage()); } + @Override + public R> statisticsByDate(String startDate, String endDate) { + log.error("日志模块api日志服务根据时间查询调用失败"); + return R.fail("日志模块api日志服务根据时间查询调用失败" + cause.getMessage()); + } + @Override public R saveReptileLog(WebmagicLog webmagicLog) { log.error("日志模块爬虫日志服务添加调用失败"); diff --git a/ruoyi-ui/src/api/business/statistics/apistatistics.js b/ruoyi-ui/src/api/business/statistics/apistatistics.js index e5b83c18..0f31b8ee 100644 --- a/ruoyi-ui/src/api/business/statistics/apistatistics.js +++ b/ruoyi-ui/src/api/business/statistics/apistatistics.js @@ -16,3 +16,12 @@ export function getStatisticsTodayApi() { method: 'get', }) } + +// 根据时间查询API记录统计 +export function statisticsByDate(param) { + return request({ + url: '/statistics/apistatistics/byDate', + method: 'get', + params:param + }) +} diff --git a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue index 07911e17..8b00950f 100644 --- a/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue +++ b/ruoyi-ui/src/views/business/statistics/apistatistics/index.vue @@ -4,10 +4,36 @@ element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)"> -
+ + + + + + + 重置 + + + + +
-
+
@@ -18,7 +44,11 @@