feat:软件使用日志和统计
This commit is contained in:
@@ -35,6 +35,12 @@ public class SysLogDTO {
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
private LocalDateTime createTime;
|
||||
private String[] createTimeArr;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@@ -85,11 +91,6 @@ public class SysLogDTO {
|
||||
*/
|
||||
private String serviceId;
|
||||
|
||||
/**
|
||||
* 创建时间区间 [开始时间,结束时间]
|
||||
*/
|
||||
private LocalDateTime[] createTime;
|
||||
|
||||
/**
|
||||
* 租户编号
|
||||
*/
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
package com.sdm.system.controller;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.feign.inter.system.ISysLogFeignClient;
|
||||
import com.sdm.common.log.dto.SysLogDTO;
|
||||
import com.sdm.system.service.ISimulationLogService;
|
||||
import com.sdm.system.model.resp.DailyOnlineStateResp;
|
||||
import com.sdm.system.model.resp.LoginStateResp;
|
||||
import com.sdm.system.service.ISysLogService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
@@ -25,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
public class SystemLogController implements ISysLogFeignClient {
|
||||
|
||||
@Autowired
|
||||
private ISimulationLogService logService;
|
||||
private ISysLogService logService;
|
||||
|
||||
@PostMapping("/saveLog")
|
||||
public SdmResponse saveLog(@RequestBody SysLogDTO req)
|
||||
@@ -33,4 +37,32 @@ public class SystemLogController implements ISysLogFeignClient {
|
||||
return logService.saveLog(req);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询
|
||||
* @param page 分页对象
|
||||
* @param sysLog 系统日志
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/page")
|
||||
public SdmResponse getLogPage(@ParameterObject Page page, @ParameterObject SysLogDTO sysLog) {
|
||||
return logService.getLogByPage(page, sysLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计某时间段的用户登录数
|
||||
* @param sysLog
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/getUserLoginStatistics")
|
||||
public SdmResponse<List<LoginStateResp>> getUserLoginStatistics(@ParameterObject SysLogDTO sysLog) {
|
||||
return logService.getUserLoginStatistics(sysLog);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取某天每小时在线用户统计
|
||||
*/
|
||||
@GetMapping("/getHourlyOnlineStatistics")
|
||||
public SdmResponse<DailyOnlineStateResp> getHourlyOnlineStatistics(@RequestParam @NotNull(message = "日期不能为空") String date) {
|
||||
return logService.getHourlyOnlineStatistics(date);
|
||||
}
|
||||
}
|
||||
|
||||
21
system/src/main/java/com/sdm/system/dao/SysLogMapper.java
Normal file
21
system/src/main/java/com/sdm/system/dao/SysLogMapper.java
Normal file
@@ -0,0 +1,21 @@
|
||||
package com.sdm.system.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.sdm.system.model.dto.HourlyOnlineDto;
|
||||
import com.sdm.system.model.entity.SysLog;
|
||||
import com.sdm.system.model.resp.LoginStateResp;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface SysLogMapper extends BaseMapper<SysLog> {
|
||||
|
||||
List<LoginStateResp> countDailyLoginUsers(@Param("startTime") String startTime,
|
||||
@Param("endTime") String endTime);
|
||||
|
||||
List<HourlyOnlineDto> getHourlyOnlineUsers(@Param("date") String date);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.sdm.system.model.dto;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class HourlyOnlineDto {
|
||||
|
||||
@Schema(description = "小时")
|
||||
private String hour;
|
||||
|
||||
@Schema(description = "在线用户数")
|
||||
private Integer onlineCount;
|
||||
|
||||
}
|
||||
133
system/src/main/java/com/sdm/system/model/entity/SysLog.java
Normal file
133
system/src/main/java/com/sdm/system/model/entity/SysLog.java
Normal file
@@ -0,0 +1,133 @@
|
||||
package com.sdm.system.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 日志表
|
||||
* </p>
|
||||
*
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Accessors(chain = true)
|
||||
@TableName("sys_log")
|
||||
@ApiModel(value="SysLog对象", description="日志表")
|
||||
public class SysLog implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@Schema(description = "日志编号")
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 日志类型
|
||||
*/
|
||||
@Schema(description = "日志类型")
|
||||
@TableField("logType")
|
||||
private String logType;
|
||||
|
||||
/**
|
||||
* 日志标题
|
||||
*/
|
||||
@Schema(description = "日志标题")
|
||||
@TableField("title")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
@Schema(description = "创建人")
|
||||
@TableField("createBy")
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@Schema(description = "创建时间")
|
||||
@TableField("createTime")
|
||||
private LocalDateTime createTime;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@Schema(description = "更新时间")
|
||||
@TableField("updateTime")
|
||||
private LocalDateTime updateTime;
|
||||
|
||||
/**
|
||||
* 操作IP地址
|
||||
*/
|
||||
@Schema(description = "操作ip地址")
|
||||
@TableField("remoteAddr")
|
||||
private String remoteAddr;
|
||||
|
||||
/**
|
||||
* 用户代理
|
||||
*/
|
||||
@Schema(description = "用户代理")
|
||||
@TableField("userAgent")
|
||||
private String userAgent;
|
||||
|
||||
/**
|
||||
* 请求URI
|
||||
*/
|
||||
@Schema(description = "请求uri")
|
||||
@TableField("requestUri")
|
||||
private String requestUri;
|
||||
|
||||
/**
|
||||
* 操作方式
|
||||
*/
|
||||
@Schema(description = "操作方式")
|
||||
@TableField("method")
|
||||
private String method;
|
||||
|
||||
/**
|
||||
* 操作提交的数据
|
||||
*/
|
||||
@Schema(description = "提交数据")
|
||||
@TableField("params")
|
||||
private String params;
|
||||
|
||||
/**
|
||||
* 执行时间
|
||||
*/
|
||||
@Schema(description = "方法执行时间")
|
||||
@TableField("time")
|
||||
private Long time;
|
||||
|
||||
/**
|
||||
* 异常信息
|
||||
*/
|
||||
@Schema(description = "异常信息")
|
||||
@TableField("exception")
|
||||
private String exception;
|
||||
|
||||
/**
|
||||
* 服务ID
|
||||
*/
|
||||
@Schema(description = "应用标识")
|
||||
@TableField("serviceId")
|
||||
private String serviceId;
|
||||
|
||||
/**
|
||||
* 删除标记
|
||||
*/
|
||||
@Schema(description = "删除标记,1:已删除,0:正常")
|
||||
@TableField("delFlag")
|
||||
private String delFlag;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.sdm.system.model.resp;
|
||||
|
||||
import com.sdm.system.model.dto.HourlyOnlineDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class DailyOnlineStateResp {
|
||||
|
||||
@Schema(description = "日期")
|
||||
private String date;
|
||||
|
||||
@Schema(description = "每小时统计")
|
||||
private List<HourlyOnlineDto> hourlyStats;
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.sdm.system.model.resp;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class LoginStateResp {
|
||||
|
||||
@Schema(description = "日期")
|
||||
private String date;
|
||||
|
||||
@Schema(description = "登录用户数")
|
||||
private Integer loginUserCount;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
|
||||
package com.sdm.system.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.log.dto.SysLogDTO;
|
||||
import com.sdm.system.model.entity.SysLog;
|
||||
import com.sdm.system.model.resp.DailyOnlineStateResp;
|
||||
import com.sdm.system.model.resp.LoginStateResp;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 日志表 服务类
|
||||
* </p>
|
||||
*/
|
||||
public interface ISysLogService extends IService<SysLog> {
|
||||
|
||||
/**
|
||||
* 分页查询日志
|
||||
* @param page
|
||||
* @param sysLog
|
||||
* @return
|
||||
*/
|
||||
SdmResponse getLogByPage(Page page, SysLogDTO sysLog);
|
||||
|
||||
/**
|
||||
* 统计某时间段的用户登录数
|
||||
* @param sysLog
|
||||
* @return
|
||||
*/
|
||||
SdmResponse<List<LoginStateResp>> getUserLoginStatistics(SysLogDTO sysLog);
|
||||
|
||||
SdmResponse<DailyOnlineStateResp> getHourlyOnlineStatistics(String dateStr);
|
||||
|
||||
/**
|
||||
* 插入日志
|
||||
* @param sysLog 日志对象
|
||||
* @return true/false
|
||||
*/
|
||||
SdmResponse saveLog(SysLogDTO sysLog);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
|
||||
package com.sdm.system.service.impl;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.sdm.common.common.SdmResponse;
|
||||
import com.sdm.common.entity.req.system.UserQueryReq;
|
||||
import com.sdm.common.entity.resp.system.CIDUserResp;
|
||||
import com.sdm.common.feign.impl.system.SysUserFeignClientImpl;
|
||||
import com.sdm.common.log.dto.SysLogDTO;
|
||||
import com.sdm.common.utils.CidSysUserUtil;
|
||||
import com.sdm.system.dao.SysLogMapper;
|
||||
import com.sdm.system.model.dto.HourlyOnlineDto;
|
||||
import com.sdm.system.model.entity.SysLog;
|
||||
import com.sdm.system.model.resp.DailyOnlineStateResp;
|
||||
import com.sdm.system.model.resp.LoginStateResp;
|
||||
import com.sdm.system.service.ISysLogService;
|
||||
import org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 日志表 服务实现类
|
||||
* </p>
|
||||
*/
|
||||
@Service
|
||||
public class ISysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements ISysLogService {
|
||||
|
||||
@Autowired
|
||||
SysUserFeignClientImpl sysUserFeignClient;
|
||||
|
||||
@Override
|
||||
public SdmResponse<Page> getLogByPage(Page page, SysLogDTO sysLog) {
|
||||
LambdaQueryWrapper<SysLog> wrapper = Wrappers.lambdaQuery();
|
||||
if (StrUtil.isNotBlank(sysLog.getLogType())) {
|
||||
wrapper.eq(SysLog::getLogType, sysLog.getLogType());
|
||||
}
|
||||
if (StrUtil.isNotBlank(sysLog.getCreateBy())) {
|
||||
wrapper.eq(SysLog::getCreateBy, sysLog.getCreateBy());
|
||||
}
|
||||
|
||||
if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) {
|
||||
wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTimeArr()[0])
|
||||
.le(SysLog::getCreateTime, sysLog.getCreateTimeArr()[1]);
|
||||
}
|
||||
|
||||
Page<SysLog> pageData = baseMapper.selectPage(page, wrapper);
|
||||
setCreatorNames(pageData.getRecords());
|
||||
return SdmResponse.success(pageData);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<List<LoginStateResp>> getUserLoginStatistics(SysLogDTO sysLog) {
|
||||
List<LoginStateResp> respList = baseMapper.countDailyLoginUsers(sysLog.getCreateTimeArr()[0], sysLog.getCreateTimeArr()[1]);
|
||||
return SdmResponse.success(respList);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SdmResponse<DailyOnlineStateResp> getHourlyOnlineStatistics(String dateStr) {
|
||||
// 获取每小时在线用户数
|
||||
List<HourlyOnlineDto> hourlyStats = baseMapper.getHourlyOnlineUsers(dateStr);
|
||||
|
||||
DailyOnlineStateResp result = new DailyOnlineStateResp();
|
||||
result.setDate(dateStr);
|
||||
result.setHourlyStats(hourlyStats);
|
||||
return SdmResponse.success(result);
|
||||
}
|
||||
|
||||
private void setCreatorNames(List<SysLog> list) {
|
||||
try {
|
||||
if (ObjectUtils.isNotEmpty(list)) {
|
||||
// 提取去重的 creatorId
|
||||
List<String> creatorIds = list.stream()
|
||||
.map(SysLog::getCreateBy)
|
||||
.filter(createBy -> !"anonymousUser".equals(createBy))
|
||||
.distinct()
|
||||
.toList();
|
||||
|
||||
// 远程查询用户信息
|
||||
SdmResponse<List<CIDUserResp>> userListSdmRsp = sysUserFeignClient.listUserByIds(
|
||||
UserQueryReq.builder().userIds(creatorIds.stream().map(Long::valueOf).toList()).build()
|
||||
);
|
||||
// 批量设置 creatorName
|
||||
if (userListSdmRsp.isSuccess() && CollectionUtils.isNotEmpty(userListSdmRsp.getData())) {
|
||||
Map<Long, CIDUserResp> cidUserMap = CidSysUserUtil.getCidUserToMap(userListSdmRsp.getData());
|
||||
list.forEach(sysLog -> {
|
||||
Long creatorId = Long.valueOf(sysLog.getCreateBy());
|
||||
CIDUserResp cidUser = cidUserMap.get(creatorId);
|
||||
String username = Objects.isNull(cidUser) ? "" : org.apache.commons.lang3.StringUtils.firstNonBlank(
|
||||
cidUser.getNickname(),
|
||||
cidUser.getUsername(),
|
||||
cidUser.getRealName()
|
||||
);
|
||||
sysLog.setCreateBy(username);
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("[getLogByPage] setCreatorNames error", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 插入日志
|
||||
* @param sysLog 日志对象
|
||||
* @return true/false
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public SdmResponse saveLog(SysLogDTO sysLog) {
|
||||
SysLog log = new SysLog();
|
||||
BeanUtils.copyProperties(sysLog, log);
|
||||
return SdmResponse.success(this.save(log));
|
||||
}
|
||||
|
||||
}
|
||||
59
system/src/main/resources/mapper/SysLogMapper.xml
Normal file
59
system/src/main/resources/mapper/SysLogMapper.xml
Normal file
@@ -0,0 +1,59 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.sdm.system.dao.SysLogMapper">
|
||||
|
||||
<select id="countDailyLoginUsers" resultType="com.sdm.system.model.resp.LoginStateResp">
|
||||
SELECT
|
||||
DATE(createTime) as date,
|
||||
COUNT(DISTINCT createBy) as loginUserCount
|
||||
FROM sys_log
|
||||
WHERE
|
||||
title LIKE '%登录成功%'
|
||||
AND createTime >= #{startTime}
|
||||
AND createTime <= #{endTime}
|
||||
GROUP BY DATE(createTime)
|
||||
ORDER BY date
|
||||
</select>
|
||||
|
||||
<select id="getHourlyOnlineUsers" resultType="com.sdm.system.model.dto.HourlyOnlineDto">
|
||||
SELECT
|
||||
HOUR(hour_time) as hour,
|
||||
COUNT(DISTINCT user_id) as onlineCount
|
||||
FROM (
|
||||
-- 生成时间序列(00:00:00 到 23:00:00)
|
||||
SELECT
|
||||
DATE_ADD(CONCAT(#{date}, ' 00:00:00'), INTERVAL (t0.idx + t1.idx*10 + t2.idx*100) HOUR) as hour_time
|
||||
FROM
|
||||
(SELECT 0 as idx UNION SELECT 1 UNION SELECT 2 UNION SELECT 3 UNION SELECT 4 UNION SELECT 5 UNION SELECT 6 UNION SELECT 7 UNION SELECT 8 UNION SELECT 9) t0,
|
||||
(SELECT 0 as idx UNION SELECT 1 UNION SELECT 2) t1,
|
||||
(SELECT 0 as idx) t2
|
||||
WHERE DATE_ADD(CONCAT(#{date}, ' 00:00:00'), INTERVAL (t0.idx + t1.idx*10 + t2.idx*100) HOUR) < DATE_ADD(CONCAT(#{date}, ' 00:00:00'), INTERVAL 24 HOUR)
|
||||
) hours
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
login.createBy as user_id,
|
||||
login.createTime as login_time,
|
||||
-- 如果有退出记录就用退出时间,否则用登录时间+30分钟作为虚拟退出时间
|
||||
COALESCE(
|
||||
MIN(logout.createTime),
|
||||
DATE_ADD(login.createTime, INTERVAL 30 MINUTE)
|
||||
) as logout_time
|
||||
FROM sys_log login
|
||||
LEFT JOIN sys_log logout ON (
|
||||
logout.createBy = login.createBy
|
||||
AND logout.title = '退出登录'
|
||||
AND logout.createTime > login.createTime
|
||||
)
|
||||
WHERE login.title = '登录成功'
|
||||
AND DATE(login.createTime) = #{date}
|
||||
GROUP BY login.createBy, login.createTime
|
||||
) sessions ON (
|
||||
-- 用户在这个小时内在线
|
||||
sessions.login_time <= DATE_ADD(hours.hour_time, INTERVAL 59 MINUTE)
|
||||
AND (sessions.logout_time IS NULL OR sessions.logout_time > hours.hour_time)
|
||||
)
|
||||
GROUP BY HOUR(hour_time)
|
||||
ORDER BY hour
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user