From 345880c6cfa20a01a06668e47af3c5040ca49881 Mon Sep 17 00:00:00 2001 From: laker <935009066@qq.com> Date: Wed, 25 Aug 2021 21:54:11 +0800 Subject: [PATCH] =?UTF-8?q?(=E6=96=B0=E5=A2=9E)[=E6=95=B4=E4=BD=93](?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/module/ext/mapper/ExtLogMapper.java | 3 ++ .../sys/controller/StatisticsController.java | 40 +++++++++++++++++++ web/admin/index.html | 4 +- web/admin/view/console/console2.html | 38 +++++++++++------- 4 files changed, 69 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/laker/admin/module/sys/controller/StatisticsController.java diff --git a/src/main/java/com/laker/admin/module/ext/mapper/ExtLogMapper.java b/src/main/java/com/laker/admin/module/ext/mapper/ExtLogMapper.java index 69f9374..c153e01 100644 --- a/src/main/java/com/laker/admin/module/ext/mapper/ExtLogMapper.java +++ b/src/main/java/com/laker/admin/module/ext/mapper/ExtLogMapper.java @@ -40,4 +40,7 @@ public interface ExtLogMapper extends BaseMapper { "LIMIT 10") List selectStatisticsVisitsTop10IP(); + @Select("SELECT count(DISTINCT ip) from ext_log") + int selectDistinctIp(); + } diff --git a/src/main/java/com/laker/admin/module/sys/controller/StatisticsController.java b/src/main/java/com/laker/admin/module/sys/controller/StatisticsController.java new file mode 100644 index 0000000..36b3d4a --- /dev/null +++ b/src/main/java/com/laker/admin/module/sys/controller/StatisticsController.java @@ -0,0 +1,40 @@ +package com.laker.admin.module.sys.controller; + +import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.lang.Dict; +import com.laker.admin.framework.Response; +import com.laker.admin.module.ext.mapper.ExtLogMapper; +import com.laker.admin.module.flow.process.SnakerEngineFacets; +import org.snaker.engine.access.QueryFilter; +import org.snaker.engine.entity.HistoryTask; +import org.snaker.engine.entity.Task; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/sys/statistics") +public class StatisticsController { + @Autowired + private SnakerEngineFacets snakerEngineFacets; + @Autowired + ExtLogMapper extLogMapper; + + + @GetMapping("/console") + public Response get() { + List activeTasks = snakerEngineFacets.getEngine().query() + .getActiveTasks(new QueryFilter().setOperator(StpUtil.getLoginIdAsString())); + List historyTasks = snakerEngineFacets.getEngine().query() + .getHistoryTasks(new QueryFilter().setOperator(StpUtil.getLoginIdAsString())); + List sessionIds = StpUtil.searchTokenValue(null, -1, 1000); + Dict res = Dict.create().set("todo", activeTasks.size()) + .set("done", historyTasks.size()) + .set("ip", extLogMapper.selectDistinctIp()) + .set("online", sessionIds.size()); + return Response.ok(res); + } +} diff --git a/web/admin/index.html b/web/admin/index.html index c74cfe4..f2407d8 100644 --- a/web/admin/index.html +++ b/web/admin/index.html @@ -27,8 +27,8 @@
    • -
    • + +
  • diff --git a/web/admin/view/console/console2.html b/web/admin/view/console/console2.html index 81db0ee..d7f5cc3 100644 --- a/web/admin/view/console/console2.html +++ b/web/admin/view/console/console2.html @@ -41,13 +41,15 @@ 访问日志
    -
    +
    NginxUI
    -
    +
    配套专栏 @@ -78,32 +80,32 @@
    - 代办任务 + 快捷数据
    -
    待审评论
    -
    21
    +
    待办任务
    +
    1
    -
    待审帖子
    -
    32
    +
    已办任务
    +
    1
    -
    待审文章
    -
    14
    +
    IP总数
    +
    1
    -
    待审用户
    -
    63
    +
    在线人数
    +
    1
    @@ -162,14 +164,22 @@