diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java index aca963a8f..b5ce7c82c 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogManagerApi.java @@ -48,13 +48,11 @@ public interface LogManagerApi { void del(LogManagerRequest logManagerRequest); /** - * 详情 + * 查询日志详情 * - * @param - * @return * @author chenjinlong * @date 2021/2/1 19:47 */ LogRecordDTO detail(LogManagerRequest logManagerRequest); -} \ No newline at end of file +} diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java index cb4001519..f57ae754d 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/LogRecordApi.java @@ -40,5 +40,4 @@ public interface LogRecordApi { */ void addBatch(List logRecords); - -} \ No newline at end of file +} diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java index fb355349a..e4b37e11a 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/LogException.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.log.api.exception; +import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.log.api.constants.LogConstants; import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; @@ -12,6 +13,10 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; */ public class LogException extends ServiceException { + public LogException(AbstractExceptionEnum exception, Object... params) { + super(LogConstants.LOG_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params)); + } + public LogException(AbstractExceptionEnum exception) { super(LogConstants.LOG_MODULE_NAME, exception); } diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java index 930b5857f..9fbf1f8b6 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/exception/enums/LogExceptionEnum.java @@ -32,7 +32,12 @@ public enum LogExceptionEnum implements AbstractExceptionEnum { /** * 初始化日志记录表失败,执行查询语句失败 */ - LOG_SQL_EXE_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + LogConstants.LOG_EXCEPTION_STEP_CODE + "04", "初始化日志记录表失败,执行查询语句失败"); + LOG_SQL_EXE_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + LogConstants.LOG_EXCEPTION_STEP_CODE + "04", "初始化日志记录表失败,执行查询语句失败"), + + /** + * 被查询日志不存在 + */ + LOG_NOT_EXISTED(RuleConstants.BUSINESS_ERROR_TYPE_CODE + LogConstants.LOG_EXCEPTION_STEP_CODE + "05", "被查询日志不存在,日志id:{}"); /** * 错误编码 diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java index 1f3248202..c77b53da7 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/DbLogManagerServiceImpl.java @@ -22,9 +22,6 @@ import java.util.List; @Slf4j public class DbLogManagerServiceImpl implements LogManagerApi { - /** - * 日志记录 service接口 - */ @Resource private SysLogService sysLogService; @@ -59,5 +56,4 @@ public class DbLogManagerServiceImpl implements LogManagerApi { return logRecordDTO; } - } diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java index 7f0a96181..6a496399e 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/SysLogService.java @@ -50,7 +50,6 @@ public interface SysLogService extends IService { */ SysLog detail(LogManagerRequest logManagerParam); - /** * 查询-列表-按实体对象 * diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java index d97c52170..e3c3db3d7 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.log.api.exception.LogException; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerRequest; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import cn.stylefeng.roses.kernel.log.db.mapper.SysLogMapper; @@ -17,6 +18,8 @@ import org.springframework.stereotype.Service; import java.util.List; +import static cn.stylefeng.roses.kernel.log.api.exception.enums.LogExceptionEnum.LOG_NOT_EXISTED; + /** * 日志记录 service接口实现类 * @@ -51,7 +54,6 @@ public class SysLogServiceImpl extends ServiceImpl impleme return this.getOne(queryWrapper, false); } - @Override public List findList(LogManagerRequest logManagerRequest) { LambdaQueryWrapper wrapper = this.createWrapper(logManagerRequest); @@ -65,7 +67,6 @@ public class SysLogServiceImpl extends ServiceImpl impleme return PageResultFactory.createPageResult(page); } - /** * 根据主键id获取对象 * @@ -74,6 +75,9 @@ public class SysLogServiceImpl extends ServiceImpl impleme */ private SysLog querySysLogById(LogManagerRequest logManagerRequest) { SysLog sysLog = this.getById(logManagerRequest.getLogId()); + if (sysLog == null) { + throw new LogException(LOG_NOT_EXISTED, logManagerRequest.getLogId()); + } return sysLog; } @@ -88,6 +92,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme String beginDateTime = logManagerRequest.getBeginDateTime(); String endDateTime = logManagerRequest.getEndDateTime(); + // SQL条件拼接 String name = logManagerRequest.getLogName(); String appName = logManagerRequest.getAppName(); diff --git a/kernel-d-log/log-sdk-file/src/main/java/cn/stylefeng/roses/kernel/log/file/FileLogManagerServiceImpl.java b/kernel-d-log/log-sdk-file/src/main/java/cn/stylefeng/roses/kernel/log/file/FileLogManagerServiceImpl.java index 4a68e5659..2897d64b5 100644 --- a/kernel-d-log/log-sdk-file/src/main/java/cn/stylefeng/roses/kernel/log/file/FileLogManagerServiceImpl.java +++ b/kernel-d-log/log-sdk-file/src/main/java/cn/stylefeng/roses/kernel/log/file/FileLogManagerServiceImpl.java @@ -172,8 +172,6 @@ public class FileLogManagerServiceImpl implements LogManagerApi { /** * 根据id获取日志记录 * - * @param - * @return * @author chenjinlong * @date 2021/2/1 19:54 */