ref: 日志管理增加图表展示接口,方便用户查看使用

This commit is contained in:
lbw committed 2023-11-29 15:05:08 +08:00
1 parent 2a4546becd
commit cde0b20d9b
5 files changed
+121 -51

No files matched your search

@@ -69,6 +69,15 @@ public class SysLogController {
return R.ok(sysLogService.getLogByPage(page, sysLog));
}
/**
* 统计三十天内的数据
* @return R
*/
@GetMapping("/sum")
public R getLogSum() {
return R.ok(sysLogService.getLogSum());
}
/**
* 批量删除日志
* @param ids ID
@@ -23,6 +23,9 @@ import com.pig4cloud.pigx.admin.api.entity.SysLog;
import com.pig4cloud.pigx.common.data.datascope.PigxBaseMapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
import java.util.Map;
/**
* <p>
* 日志表 Mapper 接口
@@ -34,4 +37,10 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SysLogMapper extends PigxBaseMapper<SysLog> {
/**
* 通过日志类型统计日志总数 返回一个包含日志类型和日志总数的列表
* @return List<Map<String, Object>>
*/
List<Map<String, Object>> selectLogSumByType();
}
@@ -26,6 +26,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysLog;
import com.pig4cloud.pigx.admin.api.vo.PreLogVO;
import java.util.List;
import java.util.Map;
/**
* <p>
@@ -59,4 +60,10 @@ public interface SysLogService extends IService<SysLog> {
*/
Boolean saveLog(SysLogDTO sysLog);
/**
* sum 函数计算三十天内的数据
* @return list map
*/
List<Map<String, Object>> getLogSum();
}
@@ -33,13 +33,13 @@ import com.pig4cloud.pigx.admin.service.SysLogService;
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
import com.pig4cloud.pigx.common.data.tenant.TenantBroker;
import com.pig4cloud.pigx.common.data.tenant.TenantContextHolder;
import com.pig4cloud.pigx.common.log.util.LogTypeEnum;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -53,60 +53,67 @@ import java.util.stream.Collectors;
@Service
public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> implements SysLogService {
/**
* 批量插入前端错误日志
*
* @param preLogVoList 日志信息
* @return true/false
*/
@Override
public Boolean saveBatchLogs(List<PreLogVO> preLogVoList) {
List<SysLog> sysLogs = preLogVoList.stream().map(pre -> {
SysLog log = new SysLog();
log.setLogType(LogTypeEnum.ERROR.getType());
log.setTitle(pre.getInfo());
log.setException(pre.getStack());
log.setParams(pre.getMessage());
log.setCreateTime(LocalDateTime.now());
log.setRequestUri(pre.getUrl());
log.setCreateBy(pre.getUser());
return log;
}).collect(Collectors.toList());
return this.saveBatch(sysLogs);
}
/**
* 批量插入前端错误日志
* @param preLogVoList 日志信息
* @return true/false
*/
@Override
public Boolean saveBatchLogs(List<PreLogVO> preLogVoList) {
List<SysLog> sysLogs = preLogVoList.stream().map(pre -> {
SysLog log = new SysLog();
log.setLogType(CommonConstants.STATUS_LOCK);
log.setTitle(pre.getInfo());
log.setException(pre.getStack());
log.setParams(pre.getMessage());
log.setCreateTime(LocalDateTime.now());
log.setRequestUri(pre.getUrl());
log.setCreateBy(pre.getUser());
return log;
}).collect(Collectors.toList());
return this.saveBatch(sysLogs);
}
@Override
public Page getLogByPage(Page page, SysLogDTO sysLog) {
@Override
public Page getLogByPage(Page page, SysLogDTO sysLog) {
LambdaQueryWrapper<SysLog> wrapper = Wrappers.lambdaQuery();
if (StrUtil.isNotBlank(sysLog.getLogType())) {
wrapper.eq(SysLog::getLogType, sysLog.getLogType());
}
LambdaQueryWrapper<SysLog> wrapper = Wrappers.lambdaQuery();
if (StrUtil.isNotBlank(sysLog.getLogType())) {
wrapper.eq(SysLog::getLogType, sysLog.getLogType());
}
if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) {
wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0]).le(SysLog::getCreateTime,
sysLog.getCreateTime()[1]);
}
if (ArrayUtil.isNotEmpty(sysLog.getCreateTime())) {
wrapper.ge(SysLog::getCreateTime, sysLog.getCreateTime()[0])
.le(SysLog::getCreateTime, sysLog.getCreateTime()[1]);
}
return baseMapper.selectPage(page, wrapper);
}
return baseMapper.selectPage(page, wrapper);
}
/**
* 插入日志
*
* @param sysLog 日志对象
* @return true/false
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveLog(SysLogDTO sysLog) {
TenantBroker.applyAs(sysLog::getTenantId, tenantId -> {
TenantContextHolder.setTenantId(tenantId);
SysLog log = new SysLog();
BeanUtils.copyProperties(sysLog, log, "createTime");
return baseMapper.insert(log);
});
return Boolean.TRUE;
}
/**
* 插入日志
* @param sysLog 日志对象
* @return true/false
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean saveLog(SysLogDTO sysLog) {
TenantBroker.applyAs(sysLog::getTenantId, tenantId -> {
TenantContextHolder.setTenantId(tenantId);
SysLog log = new SysLog();
BeanUtils.copyProperties(sysLog, log, "createTime");
return baseMapper.insert(log);
});
return Boolean.TRUE;
}
/**
* sum 函数计算三十天内的数据
* @return list map
*/
@Override
public List<Map<String, Object>> getLogSum() {
return baseMapper.selectLogSumByType();
}
}
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~
~ Copyright (c) 2018-2025, lengleng All rights reserved.
~
~ Redistribution and use in source and binary forms, with or without
~ modification, are permitted provided that the following conditions are met:
~
~ Redistributions of source code must retain the above copyright notice,
~ this list of conditions and the following disclaimer.
~ Redistributions in binary form must reproduce the above copyright
~ notice, this list of conditions and the following disclaimer in the
~ documentation and/or other materials provided with the distribution.
~ Neither the name of the pig4cloud.com developer nor the names of its
~ contributors may be used to endorse or promote products derived from
~ this software without specific prior written permission.
~ Author: lengleng (wangiegie@gmail.com)
~
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pig4cloud.pigx.admin.mapper.SysLogMapper">
<select id="selectLogSumByType" resultType="java.util.Map">
SELECT
DATE(create_time) AS log_date,
SUM(CASE WHEN log_type = '0' THEN 1 ELSE 0 END) AS successful_count,
SUM(CASE WHEN log_type = '9' THEN 1 ELSE 0 END) AS failed_count
FROM
sys_log
WHERE
create_time >= CURDATE() - INTERVAL 30 DAY
GROUP BY
log_date
ORDER BY
log_date;
</select>
</mapper>