From adb94b92772e6a648948258b32ca164305a25fa4 Mon Sep 17 00:00:00 2001 From: TSQ <1970742763@qq.com> Date: Tue, 12 Jan 2021 13:42:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-d-log/log-business-manage/pom.xml | 7 +++++++ .../controller/LogManagerController.java | 20 ++++++++++++++++++ .../log/db/DbLogManagerServiceImpl.java | 2 +- .../kernel/log/db/service/SysLogService.java | 11 ++++++++++ .../db/service/impl/SysLogServiceImpl.java | 21 +++++++++++++++++++ 5 files changed, 60 insertions(+), 1 deletion(-) diff --git a/kernel-d-log/log-business-manage/pom.xml b/kernel-d-log/log-business-manage/pom.xml index e80709c5b..8333eb481 100644 --- a/kernel-d-log/log-business-manage/pom.xml +++ b/kernel-d-log/log-business-manage/pom.xml @@ -48,6 +48,13 @@ 1.0.0 + + + cn.stylefeng.roses + log-sdk-db + 1.0.0 + + org.springframework.boot diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java index 0f775fcd7..1cbca2532 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java @@ -2,11 +2,13 @@ package cn.stylefeng.roses.kernel.log.modular.manage.controller; import cn.stylefeng.roses.kernel.log.api.LogManagerApi; import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; +import cn.stylefeng.roses.kernel.log.db.service.SysLogService; import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -28,6 +30,11 @@ public class LogManagerController { */ @Resource private LogManagerApi logManagerApi; + /** + * 日志管理service + */ + @Resource + private SysLogService sysLogService; /** * 查询日志列表 @@ -63,4 +70,17 @@ public class LogManagerController { return new SuccessResponseData(); } + /** + * 查看日志详情 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:36 + */ + @GetResource(name = "查看日志详情", path = "/logManager/detail") + public ResponseData detail(@Validated(LogManagerParam.detail.class) LogManagerParam logManagerParam) { + return new SuccessResponseData(sysLogService.detail(logManagerParam)); + } + } 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 af66704c3..4ec3589ac 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 @@ -181,7 +181,7 @@ public class DbLogManagerServiceImpl implements LogManagerApi { // 开始时间为空则用当天时间开始时间 if (StrUtil.isEmpty(logManagerParam.getBeginDateTime())) { - String beginDateTime = DateUtil.beginOfDay(DateUtil.date()).toString(DatePattern.NORM_DATETIME_FORMAT); + String beginDateTime = DateUtil.beginOfDay(DateUtil.parse("2021-01-01 00:00:00")).toString(DatePattern.NORM_DATETIME_FORMAT); logManagerParam.setBeginDateTime(beginDateTime); } 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 0c0215f57..7a920e568 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 @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.log.db.service; +import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,4 +12,14 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface SysLogService extends IService { + /** + * 查看日志详情 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:51 + */ + SysLog detail(LogManagerParam 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 1eaace865..5bd4b645b 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 @@ -1,5 +1,8 @@ package cn.stylefeng.roses.kernel.log.db.service.impl; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.stylefeng.roses.kernel.log.api.pojo.manage.LogManagerParam; import cn.stylefeng.roses.kernel.log.db.entity.SysLog; import cn.stylefeng.roses.kernel.log.db.mapper.SysLogMapper; import cn.stylefeng.roses.kernel.log.db.service.SysLogService; @@ -15,4 +18,22 @@ import org.springframework.stereotype.Service; @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { + @Override + public SysLog detail(LogManagerParam logManagerParam) { + return this.querySysLog(logManagerParam); + } + + /** + * 查询日志详细信息 + * + * @param + * @return + * @author TSQ + * @date 2021/1/11 17:54 + */ + private SysLog querySysLog(LogManagerParam logManagerParam) { + SysLog hrOrganization = this.getById(logManagerParam.getLogId()); + return hrOrganization; + } + } From eceec0401eddd76be5bc37e41dbc239c5447dfab Mon Sep 17 00:00:00 2001 From: TSQ <1970742763@qq.com> Date: Tue, 12 Jan 2021 14:02:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8E=BB=E9=99=A4=E6=97=A0=E6=95=88=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/modular/manage/controller/LogManagerController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java index 1cbca2532..a0f5922bb 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/modular/manage/controller/LogManagerController.java @@ -8,7 +8,6 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource; import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource; import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData; import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController;