diff --git a/kernel-s-system/system-business-login-log/pom.xml b/kernel-s-system/system-business-login-log/pom.xml index 84b58e011..ab0e59cb1 100644 --- a/kernel-s-system/system-business-login-log/pom.xml +++ b/kernel-s-system/system-business-login-log/pom.xml @@ -40,6 +40,22 @@ 7.0.1 + + + + cn.stylefeng.roses + system-api + 7.0.1 + + + + + + cn.stylefeng.roses + wrapper-api + 7.0.1 + + diff --git a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java index 0b0e26be0..1f8c13ae0 100644 --- a/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java +++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/controller/SysLoginLogController.java @@ -6,6 +6,8 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.system.api.pojo.loginlog.SysLoginLogRequest; 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; @@ -54,6 +56,7 @@ 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-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java new file mode 100644 index 000000000..5fb77392e --- /dev/null +++ b/kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/wrapper/SysLoginLogWrapper.java @@ -0,0 +1,34 @@ +package cn.stylefeng.roses.kernel.system.modular.loginlog.wrapper; + +import cn.hutool.extra.spring.SpringUtil; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; +import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; +import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper; + +import java.util.HashMap; +import java.util.Map; + +/** + * 日志结果进行包装 + * + * @author fengshuonan + * @date 2021/2/28 10:59 + */ +public class SysLoginLogWrapper implements BaseWrapper { + + @Override + public Map doWrap(SysLoginLog sysLoginLog) { + + if (sysLoginLog.getUserId() == null) { + return new HashMap<>(); + } + UserServiceApi userServiceApi = SpringUtil.getBean(UserServiceApi.class); + SysUserDTO sysUserDTO = userServiceApi.getUserInfoByUserId(sysLoginLog.getUserId()); + + HashMap map = new HashMap<>(); + map.put("realName", sysUserDTO.getRealName()); + return map; + } + +}