smart-flow/ruoyi-vue-pro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

迁移登陆日志完成

Browse Source 
开始迁移参数配置
This commit is contained in:
YunaiV
2021-01-19 00:45:26 +08:00
parent c95f540201
commit 35a01cbf29
38 changed files with 389 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java
View File

@@ -2,9 +2,12 @@ package cn.iocoder.dashboard.modules.system.service.logger;
import cn.iocoder.dashboard.common.pojo.PageResult;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
import java.util.List;
/**
* 登陆日志 Service 接口
*/
@@ -25,4 +28,12 @@ public interface SysLoginLogService {
*/
PageResult<SysLoginLogDO> getLoginLogPage(SysLoginLogPageReqVO reqVO);
/**
* 获得登陆日志列表
*
* @param reqVO 列表条件
* @return 登陆日志列表
*/
List<SysLoginLogDO> getLoginLogList(SysLoginLogExportReqVO reqVO);
}

7
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.dashboard.common.pojo.PageResult;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
import cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger.SysLoginLogMapper;
@@ -15,6 +16,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
@@ -41,4 +43,9 @@ public class SysLoginLogServiceImpl implements SysLoginLogService {
return loginLogMapper.selectPage(reqVO);
}
@Override
public List<SysLoginLogDO> getLoginLogList(SysLoginLogExportReqVO reqVO) {
return loginLogMapper.selectList(reqVO);
}
}

6
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
View File

@@ -12,7 +12,7 @@ import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMapper;
import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum;
import cn.iocoder.dashboard.modules.system.enums.permission.RoleTypeEnum;
import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;
import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -101,7 +101,7 @@ public class SysRoleServiceImpl implements SysRoleService {
checkDuplicateRole(reqVO.getName(), reqVO.getCode(), null);
// 插入到数据库
SysRoleDO role = SysRoleConvert.INSTANCE.convert(reqVO);
role.setType(RoleTypeEnum.CUSTOM.getType());
role.setType(SysRoleTypeEnum.CUSTOM.getType());
role.setStatus(CommonStatusEnum.ENABLE.getStatus());
roleMapper.insert(role);
// 返回
@@ -207,7 +207,7 @@ public class SysRoleServiceImpl implements SysRoleService {
throw ServiceExceptionUtil.exception(ROLE_NOT_EXISTS);
}
// 内置角色，不允许删除
if (RoleTypeEnum.SYSTEM.getType().equals(roleDO.getType())) {
if (SysRoleTypeEnum.SYSTEM.getType().equals(roleDO.getType())) {
throw ServiceExceptionUtil.exception(ROLE_CAN_NOT_UPDATE_SYSTEM_TYPE_ROLE);
}
}