From 0c1d00d864684fa410a509bb958d4103c67dc6c9 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Thu, 31 Oct 2024 10:01:58 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/vms/server/resourceMapper.vm | 14 ++++--- .../main/resources/vms/server/serviceImpl.vm | 8 +--- .../bunny/dao/vo/log/QuartzExecuteLogVo.java | 4 +- .../bunny/dao/vo/log/UserLoginLogLocalVo.java | 41 +++++++++++++++++++ .../cn/bunny/dao/vo/log/UserLoginLogVo.java | 6 +-- .../dao/vo/quartz/SchedulersGroupVo.java | 4 +- .../cn/bunny/dao/vo/system/files/FilesVo.java | 4 +- .../controller/UserLoginLogController.java | 5 ++- .../services/factory/UserLoginLogFactory.java | 3 +- .../cn/bunny/services/mapper/FilesMapper.java | 3 +- .../mapper/ScheduleExecuteLogMapper.java | 3 +- .../mapper/SchedulersGroupMapper.java | 3 +- .../services/mapper/UserLoginLogMapper.java | 3 +- .../services/service/UserLoginLogService.java | 3 +- .../service/impl/FilesServiceImpl.java | 10 +---- .../impl/ScheduleExecuteLogServiceImpl.java | 11 +---- .../impl/SchedulersGroupServiceImpl.java | 10 +---- .../service/impl/UserLoginLogServiceImpl.java | 19 +++++++-- .../src/main/resources/mapper/FilesMapper.xml | 21 ++++++---- .../mapper/ScheduleExecuteLogMapper.xml | 23 ++++++----- .../mapper/SchedulersGroupMapper.xml | 16 +++++--- .../resources/mapper/UserLoginLogMapper.xml | 24 ++++++----- 22 files changed, 145 insertions(+), 93 deletions(-) create mode 100644 dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java diff --git a/common/common-generator/src/main/resources/vms/server/resourceMapper.vm b/common/common-generator/src/main/resources/vms/server/resourceMapper.vm index e62ff89..2a87460 100644 --- a/common/common-generator/src/main/resources/vms/server/resourceMapper.vm +++ b/common/common-generator/src/main/resources/vms/server/resourceMapper.vm @@ -15,15 +15,19 @@ - select - - from $tableName + base.*, + create_user.username as create_username, + update_user.username as update_username + from $tableName base + left join sys_user create_user on create_user.id = base.create_user + left join sys_user update_user on update_user.id = base.update_user - is_deleted = 0 + base.is_deleted = 0 #foreach($field in $pageQueryMap) - and $field.column like CONCAT('%',#{dto.${field.property}},'%') + and base.$field.column like CONCAT('%',#{dto.${field.property}},'%') #end diff --git a/common/common-generator/src/main/resources/vms/server/serviceImpl.vm b/common/common-generator/src/main/resources/vms/server/serviceImpl.vm index 57670c2..a40384f 100644 --- a/common/common-generator/src/main/resources/vms/server/serviceImpl.vm +++ b/common/common-generator/src/main/resources/vms/server/serviceImpl.vm @@ -31,13 +31,7 @@ public class ${originalName}ServiceImpl extends ServiceImpl<${originalName}Mappe */ @Override public PageResult<${originalName}Vo> get${originalName}List(Page<${originalName}> pageParams, ${originalName}Dto dto) { - IPage<${originalName}> page = baseMapper.selectListByPage(pageParams, dto); - - List<${originalName}Vo> voList = page.getRecords().stream().map(${lowercaseName} -> { - ${originalName}Vo ${lowercaseName}Vo = new ${originalName}Vo(); - BeanUtils.copyProperties(${lowercaseName}, ${lowercaseName}Vo); - return ${lowercaseName}Vo; - }).toList(); + IPage<${originalName}Vo> page = baseMapper.selectListByPage(pageParams, dto); return PageResult.<${originalName}Vo>builder() .list(voList) diff --git a/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java index 88dd127..ef3e9e5 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/QuartzExecuteLogVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.log; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.common.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -10,7 +10,7 @@ import lombok.*; @NoArgsConstructor @Builder @Schema(name = "QuartzExecuteLogVo对象", title = "调度任务执行日志返回对象", description = "调度任务执行日志返回对象") -public class QuartzExecuteLogVo extends BaseVo { +public class QuartzExecuteLogVo extends BaseUserVo { @Schema(name = "jobName", title = "任务名称") private String jobName; diff --git a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java new file mode 100644 index 0000000..2afde05 --- /dev/null +++ b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogLocalVo.java @@ -0,0 +1,41 @@ +package cn.bunny.dao.vo.log; + +import cn.bunny.dao.common.vo.BaseVo; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Schema(name = "UserLoginLogLocalVo对象", title = "用户登录日志", description = "用户登录日志") +public class UserLoginLogLocalVo extends BaseVo { + + @Schema(name = "userId", title = "用户Id") + private Long userId; + + @Schema(name = "username", title = "用户名") + private String username; + + @Schema(name = "token", title = "登录token") + private String token; + + @Schema(name = "ipAddress", title = "登录Ip") + private String ipAddress; + + @Schema(name = "ipRegion", title = "登录Ip归属地") + private String ipRegion; + + @Schema(name = "userAgent", title = "登录时代理") + private String userAgent; + + @Schema(name = "type", title = "操作类型") + private String type; + + @Schema(name = "xRequestedWith", title = "标识客户端是否是通过Ajax发送请求的") + @JsonProperty("xRequestedWith") + private String xRequestedWith; + +} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java index bf9e569..02171ee 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/log/UserLoginLogVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.log; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.common.vo.BaseUserVo; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -11,7 +11,7 @@ import lombok.*; @NoArgsConstructor @Builder @Schema(name = "UserLoginLogVo对象", title = "用户登录日志", description = "用户登录日志") -public class UserLoginLogVo extends BaseVo { +public class UserLoginLogVo extends BaseUserVo { @Schema(name = "userId", title = "用户Id") private Long userId; @@ -38,4 +38,4 @@ public class UserLoginLogVo extends BaseVo { @JsonProperty("xRequestedWith") private String xRequestedWith; -} \ No newline at end of file +} diff --git a/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java b/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java index cc27eb9..e07f4cc 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/quartz/SchedulersGroupVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.quartz; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.common.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -10,7 +10,7 @@ import lombok.*; @NoArgsConstructor @Builder @Schema(name = "SchedulersGroupVo", title = "任务调度分组返回对象", description = "任务调度分组返回对象") -public class SchedulersGroupVo extends BaseVo { +public class SchedulersGroupVo extends BaseUserVo { @Schema(name = "groupName", title = "分组名称") private String groupName; diff --git a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java index 735367e..449d05c 100644 --- a/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java +++ b/dao/src/main/java/cn/bunny/dao/vo/system/files/FilesVo.java @@ -1,6 +1,6 @@ package cn.bunny.dao.vo.system.files; -import cn.bunny.dao.common.vo.BaseVo; +import cn.bunny.dao.common.vo.BaseUserVo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -10,7 +10,7 @@ import lombok.*; @NoArgsConstructor @Builder @Schema(name = "FilesVo对象", title = "系统文件", description = "管理端系统文件返回信息") -public class FilesVo extends BaseVo { +public class FilesVo extends BaseUserVo { @Schema(name = "filename", title = "文件的名称") private String filename; diff --git a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java index 789faa1..53ef3e5 100644 --- a/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java +++ b/service/src/main/java/cn/bunny/services/controller/UserLoginLogController.java @@ -5,6 +5,7 @@ import cn.bunny.dao.entity.log.UserLoginLog; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.pojo.result.Result; import cn.bunny.dao.pojo.result.ResultCodeEnum; +import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.services.service.UserLoginLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -48,13 +49,13 @@ public class UserLoginLogController { @Operation(summary = "获取本地用户登录日志", description = "获取本地用户登录日志") @GetMapping("noManage/getUserLoginLogListByLocalUser/{page}/{limit}") - public Mono>> getUserLoginLogListByLocalUser( + public Mono>> getUserLoginLogListByLocalUser( @Parameter(name = "page", description = "当前页", required = true) @PathVariable("page") Integer page, @Parameter(name = "limit", description = "每页记录数", required = true) @PathVariable("limit") Integer limit) { Page pageParams = new Page<>(page, limit); - PageResult voPageResult = userLoginLogService.getUserLoginLogListByLocalUser(pageParams); + PageResult voPageResult = userLoginLogService.getUserLoginLogListByLocalUser(pageParams); return Mono.just(Result.success(voPageResult)); } diff --git a/service/src/main/java/cn/bunny/services/factory/UserLoginLogFactory.java b/service/src/main/java/cn/bunny/services/factory/UserLoginLogFactory.java index 15ab724..baded06 100644 --- a/service/src/main/java/cn/bunny/services/factory/UserLoginLogFactory.java +++ b/service/src/main/java/cn/bunny/services/factory/UserLoginLogFactory.java @@ -1,6 +1,5 @@ package cn.bunny.services.factory; -import cn.bunny.dao.entity.log.UserLoginLog; import cn.bunny.dao.pojo.result.PageResult; import cn.bunny.dao.vo.log.UserLoginLogVo; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,7 +17,7 @@ public class UserLoginLogFactory { * @param page 分页结果 * @return 分页用户登录日志 */ - public PageResult getUserLoginLogVoPageResult(IPage page) { + public PageResult getUserLoginLogVoPageResult(IPage page) { List voList = page.getRecords().stream().map(userLoginLog -> { UserLoginLogVo userLoginLogVo = new UserLoginLogVo(); BeanUtils.copyProperties(userLoginLog, userLoginLogVo); diff --git a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java b/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java index a2308d9..59a3557 100644 --- a/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/FilesMapper.java @@ -2,6 +2,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.dto.system.files.FilesDto; import cn.bunny.dao.entity.system.Files; +import cn.bunny.dao.vo.system.files.FilesVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,7 +29,7 @@ public interface FilesMapper extends BaseMapper { * @param dto 系统文件表查询表单 * @return 系统文件表分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") FilesDto dto); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") FilesDto dto); /** * 物理删除系统文件表 diff --git a/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java index 8b29db8..05ee979 100644 --- a/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/ScheduleExecuteLogMapper.java @@ -2,6 +2,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.dto.log.ScheduleExecuteLogDto; import cn.bunny.dao.entity.log.ScheduleExecuteLog; +import cn.bunny.dao.vo.log.QuartzExecuteLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,7 +29,7 @@ public interface ScheduleExecuteLogMapper extends BaseMapper * @param dto 调度任务执行日志查询表单 * @return 调度任务执行日志分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") ScheduleExecuteLogDto dto); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") ScheduleExecuteLogDto dto); /** * 物理删除调度任务执行日志 diff --git a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java b/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java index ae6c1d4..cf6cb3e 100644 --- a/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/SchedulersGroupMapper.java @@ -2,6 +2,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.dto.quartz.group.SchedulersGroupDto; import cn.bunny.dao.entity.quartz.SchedulersGroup; +import cn.bunny.dao.vo.quartz.SchedulersGroupVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,7 +29,7 @@ public interface SchedulersGroupMapper extends BaseMapper { * @param dto 任务调度分组查询表单 * @return 任务调度分组分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") SchedulersGroupDto dto); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") SchedulersGroupDto dto); /** * 物理删除任务调度分组 diff --git a/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java b/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java index 7eb123f..fa58afc 100644 --- a/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java +++ b/service/src/main/java/cn/bunny/services/mapper/UserLoginLogMapper.java @@ -2,6 +2,7 @@ package cn.bunny.services.mapper; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; +import cn.bunny.dao.vo.log.UserLoginLogVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -28,7 +29,7 @@ public interface UserLoginLogMapper extends BaseMapper { * @param dto 用户登录日志查询表单 * @return 用户登录日志分页结果 */ - IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") UserLoginLogDto dto); + IPage selectListByPage(@Param("page") Page pageParams, @Param("dto") UserLoginLogDto dto); /** * 物理删除用户登录日志 diff --git a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java b/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java index 14e8315..800756b 100644 --- a/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java +++ b/service/src/main/java/cn/bunny/services/service/UserLoginLogService.java @@ -3,6 +3,7 @@ package cn.bunny.services.service; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -39,5 +40,5 @@ public interface UserLoginLogService extends IService { * @param pageParams 分页查询内容 * @return 用户登录日志返回列表 */ - PageResult getUserLoginLogListByLocalUser(Page pageParams); + PageResult getUserLoginLogListByLocalUser(Page pageParams); } diff --git a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java index 9ec650f..8783e0b 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/FilesServiceImpl.java @@ -74,16 +74,10 @@ public class FilesServiceImpl extends ServiceImpl implements @Override public PageResult getFilesList(Page pageParams, FilesDto dto) { // 分页查询菜单图标 - IPage page = baseMapper.selectListByPage(pageParams, dto); - - List voList = page.getRecords().stream().map(files -> { - FilesVo filesVo = new FilesVo(); - BeanUtils.copyProperties(files, filesVo); - return filesVo; - }).toList(); + IPage page = baseMapper.selectListByPage(pageParams, dto); return PageResult.builder() - .list(voList) + .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) .total(page.getTotal()) diff --git a/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java index 63e4ac5..220b23c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/ScheduleExecuteLogServiceImpl.java @@ -9,7 +9,6 @@ import cn.bunny.services.service.ScheduleExecuteLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -35,16 +34,10 @@ public class ScheduleExecuteLogServiceImpl extends ServiceImpl getQuartzExecuteLogList(Page pageParams, ScheduleExecuteLogDto dto) { // 分页查询菜单图标 - IPage page = baseMapper.selectListByPage(pageParams, dto); - - List voList = page.getRecords().stream().map(quartzExecuteLog -> { - QuartzExecuteLogVo quartzExecuteLogVo = new QuartzExecuteLogVo(); - BeanUtils.copyProperties(quartzExecuteLog, quartzExecuteLogVo); - return quartzExecuteLogVo; - }).toList(); + IPage page = baseMapper.selectListByPage(pageParams, dto); return PageResult.builder() - .list(voList) + .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) .total(page.getTotal()) diff --git a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java index 06de656..1bcb385 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/SchedulersGroupServiceImpl.java @@ -40,16 +40,10 @@ public class SchedulersGroupServiceImpl extends ServiceImpl getSchedulersGroupList(Page pageParams, SchedulersGroupDto dto) { // 分页查询菜单图标 - IPage page = baseMapper.selectListByPage(pageParams, dto); - - List voList = page.getRecords().stream().map(schedulersGroup -> { - SchedulersGroupVo schedulersGroupVo = new SchedulersGroupVo(); - BeanUtils.copyProperties(schedulersGroup, schedulersGroupVo); - return schedulersGroupVo; - }).toList(); + IPage page = baseMapper.selectListByPage(pageParams, dto); return PageResult.builder() - .list(voList) + .list(page.getRecords()) .pageNo(page.getCurrent()) .pageSize(page.getSize()) .total(page.getTotal()) diff --git a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java index 47f3bef..54e5f3c 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/UserLoginLogServiceImpl.java @@ -4,6 +4,7 @@ import cn.bunny.common.service.context.BaseContext; import cn.bunny.dao.dto.log.UserLoginLogDto; import cn.bunny.dao.entity.log.UserLoginLog; import cn.bunny.dao.pojo.result.PageResult; +import cn.bunny.dao.vo.log.UserLoginLogLocalVo; import cn.bunny.dao.vo.log.UserLoginLogVo; import cn.bunny.services.factory.UserLoginLogFactory; import cn.bunny.services.mapper.UserLoginLogMapper; @@ -11,6 +12,7 @@ import cn.bunny.services.service.UserLoginLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,7 +44,7 @@ public class UserLoginLogServiceImpl extends ServiceImpl getUserLoginLogList(Page pageParams, UserLoginLogDto dto) { // 分页查询菜单图标 - IPage page = baseMapper.selectListByPage(pageParams, dto); + IPage page = baseMapper.selectListByPage(pageParams, dto); return factory.getUserLoginLogVoPageResult(page); } @@ -68,10 +70,21 @@ public class UserLoginLogServiceImpl extends ServiceImpl getUserLoginLogListByLocalUser(Page pageParams) { + public PageResult getUserLoginLogListByLocalUser(Page pageParams) { Long userId = BaseContext.getUserId(); IPage page = baseMapper.selectListByPageWithLocalUser(pageParams, userId); - return factory.getUserLoginLogVoPageResult(page); + List voList = page.getRecords().stream().map(userLoginLog -> { + UserLoginLogLocalVo userLoginLogVo = new UserLoginLogLocalVo(); + BeanUtils.copyProperties(userLoginLog, userLoginLogVo); + return userLoginLogVo; + }).toList(); + + return PageResult.builder() + .list(voList) + .pageNo(page.getCurrent()) + .pageSize(page.getSize()) + .total(page.getTotal()) + .build(); } } diff --git a/service/src/main/resources/mapper/FilesMapper.xml b/service/src/main/resources/mapper/FilesMapper.xml index efaae12..26e4409 100644 --- a/service/src/main/resources/mapper/FilesMapper.xml +++ b/service/src/main/resources/mapper/FilesMapper.xml @@ -23,26 +23,29 @@ - select - - from sys_files + files.*, + create_user.username as create_username, + update_user.username as update_username + from sys_files files + left join sys_user create_user on create_user.id = files.create_user + left join sys_user update_user on update_user.id = files.update_user - is_deleted = 0 + files.is_deleted = 0 - and filename like CONCAT('%',#{dto.filename},'%') + and files.filename like CONCAT('%',#{dto.filename},'%') - and filepath like CONCAT('%',#{dto.filepath},'%') + and files.filepath like CONCAT('%',#{dto.filepath},'%') - and file_type like CONCAT('%',#{dto.fileType},'%') + and files.file_type like CONCAT('%',#{dto.fileType},'%') - and download_count like CONCAT('%',#{dto.downloadCount},'%') + and files.download_count like CONCAT('%',#{dto.downloadCount},'%') - order by update_time diff --git a/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml b/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml index bb54d5f..3c4979d 100644 --- a/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml +++ b/service/src/main/resources/mapper/ScheduleExecuteLogMapper.xml @@ -25,29 +25,32 @@ - select - - from log_quartz_execute + log.*, + create_user.username as create_username, + update_user.username as update_username + from log_quartz_execute log + left join sys_user create_user on create_user.id = log.create_user + left join sys_user update_user on update_user.id = log.update_user - is_deleted = 0 + log.is_deleted = 0 - and job_name like CONCAT('%',#{dto.jobName},'%') + and log.job_name like CONCAT('%',#{dto.jobName},'%') - and job_group like CONCAT('%',#{dto.jobGroup},'%') + and log.job_group like CONCAT('%',#{dto.jobGroup},'%') - and job_class_name like CONCAT('%',#{dto.jobClassName},'%') + and log.job_class_name like CONCAT('%',#{dto.jobClassName},'%') - and cron_expression like CONCAT('%',#{dto.cronExpression},'%') + and log.cron_expression like CONCAT('%',#{dto.cronExpression},'%') - and trigger_name like CONCAT('%',#{dto.triggerName},'%') + and log.trigger_name like CONCAT('%',#{dto.triggerName},'%') - order by update_time desc diff --git a/service/src/main/resources/mapper/SchedulersGroupMapper.xml b/service/src/main/resources/mapper/SchedulersGroupMapper.xml index ee74545..0fd85be 100644 --- a/service/src/main/resources/mapper/SchedulersGroupMapper.xml +++ b/service/src/main/resources/mapper/SchedulersGroupMapper.xml @@ -20,19 +20,23 @@ - select - - from qrtz_schedulers_group + schedulers_group.*, + create_user.username as create_username, + update_user.username as update_username + from qrtz_schedulers_group schedulers_group + left join sys_user create_user on create_user.id = schedulers_group.create_user + left join sys_user update_user on update_user.id = schedulers_group.update_user + schedulers_group.is_deleted = 0 - and group_name like CONCAT('%',#{dto.groupName},'%') + and schedulers_group.group_name like CONCAT('%',#{dto.groupName},'%') - and description like CONCAT('%',#{dto.description},'%') + and schedulers_group.description like CONCAT('%',#{dto.description},'%') - order by update_time desc diff --git a/service/src/main/resources/mapper/UserLoginLogMapper.xml b/service/src/main/resources/mapper/UserLoginLogMapper.xml index 3472d16..3a04cd3 100644 --- a/service/src/main/resources/mapper/UserLoginLogMapper.xml +++ b/service/src/main/resources/mapper/UserLoginLogMapper.xml @@ -26,26 +26,30 @@ - select - - from log_user_login + user_login.*, + create_user.username as create_username, + update_user.username as update_username + from log_user_login user_login + left join sys_user create_user on create_user.id = user_login.create_user + left join sys_user update_user on update_user.id = user_login.update_user - is_deleted = 0 + user_login.is_deleted = 0 - and username like CONCAT('%',#{dto.username},'%') + and user_login.username like CONCAT('%',#{dto.username},'%') - and ip_address like CONCAT('%',#{dto.ipAddress},'%') + and user_login.ip_address like CONCAT('%',#{dto.ipAddress},'%') - and ip_region like CONCAT('%',#{dto.ipRegion},'%') + and user_login.ip_region like CONCAT('%',#{dto.ipRegion},'%') - and type like CONCAT('%',#{dto.type},'%') + and user_login.type like CONCAT('%',#{dto.type},'%') - and x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%') + and user_login.x_requested_with like CONCAT('%',#{dto.xRequestedWith},'%') @@ -54,7 +58,7 @@