diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java new file mode 100644 index 000000000..d8c1b76b5 --- /dev/null +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/loginlog/SysLoginLogDto.java @@ -0,0 +1,62 @@ +package cn.stylefeng.roses.kernel.log.api.pojo.loginlog; + +import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +@Data +@EqualsAndHashCode(callSuper = true) +public class SysLoginLogDto extends BaseRequest { + + /** + * 主键id + */ + private Long llgId; + + /** + * 日志名称 + */ + private String llgName; + + /** + * 是否执行成功 + */ + private String llgSucceed; + + /** + * 具体消息 + */ + private String llgMessage; + + /** + * 登录ip + */ + private String llgIpAddress; + + /** + * 用户id + */ + private Long userId; + + /** + * 登录姓名 + */ + private String userName; + + /** + * 开始时间 + */ + private Date createTime; + + /** + * 开始时间 + */ + private String beginTime; + + /** + * 结束时间 + */ + private String endTime; +} diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java index 7fa9fa289..fa7bbdf8d 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java @@ -30,8 +30,6 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData; import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.system.modular.loginlog.service.SysLoginLogService; -import cn.stylefeng.roses.kernel.system.modular.loginlog.wrapper.SysLoginLogWrapper; -import cn.stylefeng.roses.kernel.wrapper.api.annotation.Wrapper; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RestController; @@ -80,7 +78,6 @@ public class SysLoginLogController { * @date 2021/1/13 17:51 */ @GetResource(name = "分页查询登录日志", path = "/loginLog/page") - @Wrapper(SysLoginLogWrapper.class) public ResponseData page(SysLoginLogRequest sysLoginLogRequest) { return new SuccessResponseData(sysLoginLogService.findPage(sysLoginLogRequest)); } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java index 3a6e2df12..8dbeea60c 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java @@ -24,8 +24,12 @@ */ package cn.stylefeng.roses.kernel.system.modular.loginlog.mapper; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; /** * 系统应用mapper接口 @@ -34,4 +38,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @date 2020/3/13 16:17 */ public interface SysLoginLogMapper extends BaseMapper { + + Page customFindPage(@Param("page") Page page, @Param("sysLoginLogRequest") SysLoginLogRequest sysLoginLogRequest); + } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml index 11372cf04..fc4f6711c 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml @@ -2,4 +2,18 @@ + + diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java index 1c73605a1..a08981552 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/SysLoginLogService.java @@ -25,6 +25,7 @@ package cn.stylefeng.roses.kernel.system.modular.loginlog.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import com.baomidou.mybatisplus.extension.service.IService; @@ -70,6 +71,6 @@ public interface SysLoginLogService extends IService { * @author chenjinlong * @date 2021/1/13 10:57 */ - PageResult findPage(SysLoginLogRequest sysLoginLogRequest); + PageResult findPage(SysLoginLogRequest sysLoginLogRequest); } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java index 098002238..0a9ec69c0 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java @@ -31,6 +31,7 @@ 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.LoginLogServiceApi; +import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; @@ -66,10 +67,8 @@ public class SysLoginLogServiceImpl extends ServiceImpl findPage(SysLoginLogRequest sysLoginLogRequest) { - LambdaQueryWrapper wrapper = createWrapper(sysLoginLogRequest); - wrapper.orderByDesc(SysLoginLog::getCreateTime); - Page page = this.page(PageFactory.defaultPage(), wrapper); + public PageResult findPage(SysLoginLogRequest sysLoginLogRequest) { + Page page = baseMapper.customFindPage(PageFactory.defaultPage(), sysLoginLogRequest); return PageResultFactory.createPageResult(page); } diff --git a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java index dd21e2fd0..6ede928f5 100644 --- a/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java +++ b/kernel-d-log/log-business-manage/src/main/java/cn/stylefeng/roses/kernel/log/manage/LogManagerController.java @@ -104,6 +104,7 @@ public class LogManagerController { * @date 2021/1/11 17:36 */ @GetResource(name = "查看日志详情", path = "/logManager/detail") + @Wrapper(LogInfoWrapper.class) public ResponseData detail(@Validated(LogManagerRequest.detail.class) LogManagerRequest logManagerRequest) { return new SuccessResponseData(logManagerApi.detail(logManagerRequest)); }