ruoyi
/
ruoyi-vue-server
14
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

项目结构更改成功

nacos
DongZeLiang 2023-10-08 20:00:47 +08:00
parent 2afa26f57a
commit fab39cdc8f
58 changed files with 125 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -14,15 +14,6 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
public class RuoYiApplication {
public static void main (String[] args) {
SpringApplication.run(RuoYiApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
" | ( ' ) | \\ _. / ' \n" +
" |(_ o _) / _( )_ .' \n" +
" | (_,_).' __ ___(_ o _)' \n" +
" | |\\ \\ | || |(_,_)' \n" +
" | | \\ `' /| `-' / \n" +
" | | \\ / \\ / \n" +
" ''-' `'-' `-..-' ");
System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ");
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View File

@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.model.CaptchaModel;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.utils.sign.Base64;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysConfigServic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
@ -39,7 +39,7 @@ public class CaptchaController {
private RedisCache redisCache;
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
/**
* 生成验证码

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPasswordService;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.SysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController {
@Autowired
private ISysLogininforService logininforService;
private SysLogininforService logininforService;
@Autowired
private SysPasswordService passwordService;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.system.service.SysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -24,7 +24,7 @@ import java.util.List;
@RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController {
@Autowired
private ISysOperLogService operLogService;
private SysOperLogService operLogService;
@PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
@GetMapping("/list")

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@ -10,7 +10,7 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.system.service.SysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -29,7 +29,7 @@ import java.util.List;
@RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController {
@Autowired
private ISysUserOnlineService userOnlineService;
private SysUserOnlineService userOnlineService;
@Autowired
private RedisCache redisCache;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysConfigServic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/system/config")
public class SysConfigController extends BaseController {
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
/**
* 获取参数配置列表

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.SysDeptService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/system/dept")
public class SysDeptController extends BaseController {
@Autowired
private ISysDeptService deptService;
private SysDeptService deptService;
/**
* 获取部门列表

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@ -8,8 +8,8 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.SysDictDataService;
import com.ruoyi.system.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -28,10 +28,10 @@ import java.util.List;
@RequestMapping("/system/dict/data")
public class SysDictDataController extends BaseController {
@Autowired
private ISysDictDataService dictDataService;
private SysDictDataService dictDataService;
@Autowired
private ISysDictTypeService dictTypeService;
private SysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/system/dict/type")
public class SysDictTypeController extends BaseController {
@Autowired
private ISysDictTypeService dictTypeService;
private SysDictTypeService dictTypeService;
@PreAuthorize("@ss.hasPermi('system:dict:list')")
@GetMapping("/list")

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.resp.UserInfoResp;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -29,7 +29,7 @@ public class SysLoginController {
private SysLoginService loginService;
@Autowired
private ISysMenuService menuService;
private SysMenuService menuService;
@Autowired
private SysPermissionService permissionService;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.resp.RoleMenuTreeResp;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/system/menu")
public class SysMenuController extends BaseController {
@Autowired
private ISysMenuService menuService;
private SysMenuService menuService;
/**
* 获取菜单列表

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View File

@ -6,7 +6,7 @@ import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
import com.ruoyi.system.service.SysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -23,7 +23,7 @@ import java.util.List;
@RequestMapping("/system/notice")
public class SysNoticeController extends BaseController {
@Autowired
private ISysNoticeService noticeService;
private SysNoticeService noticeService;
/**
* 获取通知公告列表

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.SysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -25,7 +25,7 @@ import java.util.List;
@RequestMapping("/system/post")
public class SysPostController extends BaseController {
@Autowired
private ISysPostService postService;
private SysPostService postService;
/**
* 获取岗位列表

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -13,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@ -27,7 +27,7 @@ import org.springframework.web.multipart.MultipartFile;
@RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController {
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private TokenService tokenService;

4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
View File

@ -5,7 +5,7 @@ import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.SysRegisterService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysConfigServic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -22,7 +22,7 @@ public class SysRegisterController extends BaseController {
private SysRegisterService registerService;
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
@PostMapping("/register")
public Result register (@RequestBody RegisterBody user) {

12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@ -15,9 +15,9 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.service.SysPermissionService;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysDeptService;
import com.ruoyi.system.service.SysRoleService;
import com.ruoyi.system.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@ -35,7 +35,7 @@ import java.util.List;
@RequestMapping("/system/role")
public class SysRoleController extends BaseController {
@Autowired
private ISysRoleService roleService;
private SysRoleService roleService;
@Autowired
private TokenService tokenService;
@ -44,10 +44,10 @@ public class SysRoleController extends BaseController {
private SysPermissionService permissionService;
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private ISysDeptService deptService;
private SysDeptService deptService;
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -13,10 +13,10 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysDeptService;
import com.ruoyi.system.service.SysPostService;
import com.ruoyi.system.service.SysRoleService;
import com.ruoyi.system.service.SysUserService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -37,16 +37,16 @@ import java.util.stream.Collectors;
@RequestMapping("/system/user")
public class SysUserController extends BaseController {
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private ISysRoleService roleService;
private SysRoleService roleService;
@Autowired
private ISysDeptService deptService;
private SysDeptService deptService;
@Autowired
private ISysPostService postService;
private SysPostService postService;
/**
* 获取用户列表

8
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
View File

@ -9,8 +9,8 @@ import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.system.service.SysLogininforService;
import com.ruoyi.system.service.SysOperLogService;
import eu.bitwalker.useragentutils.UserAgent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -70,7 +70,7 @@ public class AsyncFactory {
logininfor.setStatus(Constants.FAIL);
}
// 插入数据
SpringUtils.getBean(ISysLogininforService.class).insertLogininfor(logininfor);
SpringUtils.getBean(SysLogininforService.class).insertLogininfor(logininfor);
}
};
}
@ -88,7 +88,7 @@ public class AsyncFactory {
public void run () {
// 远程查询操作地点
operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
SpringUtils.getBean(ISysOperLogService.class).insertOperlog(operLog);
SpringUtils.getBean(SysOperLogService.class).insertOperlog(operLog);
}
};
}

8
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
View File

@ -15,8 +15,8 @@ import com.ruoyi.common.utils.ip.IpUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.framework.security.context.AuthenticationContextHolder;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysConfigServic;
import com.ruoyi.system.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
import org.springframework.security.authentication.BadCredentialsException;
@ -43,10 +43,10 @@ public class SysLoginService {
private RedisCache redisCache;
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
/**
* 登录验证

8
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
View File

@ -2,8 +2,8 @@ package com.ruoyi.framework.web.service;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.SysMenuService;
import com.ruoyi.system.service.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@ -20,10 +20,10 @@ import java.util.Set;
@Component
public class SysPermissionService {
@Autowired
private ISysRoleService roleService;
private SysRoleService roleService;
@Autowired
private ISysMenuService menuService;
private SysMenuService menuService;
/**
* 获取角色数据权限

8
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
View File

@ -13,8 +13,8 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.manager.AsyncManager;
import com.ruoyi.framework.manager.factory.AsyncFactory;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysConfigServic;
import com.ruoyi.system.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@ -26,10 +26,10 @@ import org.springframework.stereotype.Component;
@Component
public class SysRegisterService {
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
@Autowired
private RedisCache redisCache;

4
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MessageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -25,7 +25,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
private static final Logger log = LoggerFactory.getLogger(UserDetailsServiceImpl.class);
@Autowired
private ISysUserService userService;
private SysUserService userService;
@Autowired
private SysPasswordService passwordService;

8
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
View File

@ -8,8 +8,8 @@ import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.service.IGenTableColumnService;
import com.ruoyi.generator.service.IGenTableService;
import com.ruoyi.generator.service.GenTableColumnService;
import com.ruoyi.generator.service.GenTableService;
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@ -31,10 +31,10 @@ import java.util.Map;
@RequestMapping("/tool/gen")
public class GenController extends BaseController {
@Autowired
private IGenTableService genTableService;
private GenTableService genTableService;
@Autowired
private IGenTableColumnService genTableColumnService;
private GenTableColumnService genTableColumnService;
/**
* 查询代码生成列表

2
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface IGenTableColumnService {
public interface GenTableColumnService {
/**
* 查询业务字段列表
*

2
ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableService.java
View File

@ -10,7 +10,7 @@ import java.util.Map;
*
* @author ruoyi
*/
public interface IGenTableService {
public interface GenTableService {
/**
* 查询业务列表
*

5
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableColumnServiceImpl.java
View File

@ -1,8 +1,9 @@
package com.ruoyi.generator.service;
package com.ruoyi.generator.service.impl;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.mapper.GenTableColumnMapper;
import com.ruoyi.generator.service.GenTableColumnService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +15,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class GenTableColumnServiceImpl implements IGenTableColumnService {
public class GenTableColumnServiceImpl implements GenTableColumnService {
@Autowired
private GenTableColumnMapper genTableColumnMapper;

5
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java → ruoyi-generator/src/main/java/com/ruoyi/generator/service/impl/GenTableServiceImpl.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.generator.service;
package com.ruoyi.generator.service.impl;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
@ -12,6 +12,7 @@ import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.mapper.GenTableColumnMapper;
import com.ruoyi.generator.mapper.GenTableMapper;
import com.ruoyi.generator.service.GenTableService;
import com.ruoyi.generator.util.GenUtils;
import com.ruoyi.generator.util.VelocityInitializer;
import com.ruoyi.generator.util.VelocityUtils;
@ -44,7 +45,7 @@ import java.util.zip.ZipOutputStream;
* @author ruoyi
*/
@Service
public class GenTableServiceImpl implements IGenTableService {
public class GenTableServiceImpl implements GenTableService {
private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class);
@Autowired

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View File

@ -10,7 +10,7 @@ import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.quartz.service.SysJobService;
import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.quartz.util.ScheduleUtils;
import org.quartz.SchedulerException;
@ -30,7 +30,7 @@ import java.util.List;
@RequestMapping("/monitor/job")
public class SysJobController extends BaseController {
@Autowired
private ISysJobService jobService;
private SysJobService jobService;
/**
* 查询定时任务列表

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
View File

@ -7,7 +7,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import com.ruoyi.quartz.service.SysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -24,7 +24,7 @@ import java.util.List;
@RequestMapping("/monitor/jobLog")
public class SysJobLogController extends BaseController {
@Autowired
private ISysJobLogService jobLogService;
private SysJobLogService jobLogService;
/**
* 查询定时任务调度日志列表

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobLogService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysJobLogService {
public interface SysJobLogService {
/**
* 获取quartz调度器日志的计划任务
*

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java → ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/SysJobService.java
View File

@ -11,7 +11,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysJobService {
public interface SysJobService {
/**
* 获取quartz调度器的计划任务
*

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.quartz.service.impl;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.mapper.SysJobLogMapper;
import com.ruoyi.quartz.service.ISysJobLogService;
import com.ruoyi.quartz.service.SysJobLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +14,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysJobLogServiceImpl implements ISysJobLogService {
public class SysJobLogServiceImpl implements SysJobLogService {
@Autowired
private SysJobLogMapper jobLogMapper;

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
View File

@ -4,7 +4,7 @@ import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.mapper.SysJobMapper;
import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.quartz.service.SysJobService;
import com.ruoyi.quartz.util.CronUtils;
import com.ruoyi.quartz.util.ScheduleUtils;
import org.quartz.JobDataMap;
@ -24,7 +24,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysJobServiceImpl implements ISysJobService {
public class SysJobServiceImpl implements SysJobService {
@Autowired
private Scheduler scheduler;

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import com.ruoyi.quartz.service.SysJobLogService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@ -83,7 +83,7 @@ public abstract class AbstractQuartzJob implements Job {
}
// 写入数据库当中
SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
SpringUtils.getBean(SysJobLogService.class).addJobLog(sysJobLog);
}
/**

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysConfigServic.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysConfigService {
public interface SysConfigServic {
/**
* 查询参数配置信息
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysDeptService.java
View File

@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDeptService {
public interface SysDeptService {
/**
* 查询部门管理数据
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictDataService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDictDataService {
public interface SysDictDataService {
/**
* 根据条件分页查询字典数据
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysDictTypeService.java
View File

@ -10,7 +10,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysDictTypeService {
public interface SysDictTypeService {
/**
* 根据条件分页查询字典类型
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysLogininforService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysLogininforService {
public interface SysLogininforService {
/**
* 新增系统登录日志
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysMenuService.java
View File

@ -12,7 +12,7 @@ import java.util.Set;
*
* @author ruoyi
*/
public interface ISysMenuService {
public interface SysMenuService {
/**
* 根据用户查询系统菜单列表
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysNoticeService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysNoticeService {
public interface SysNoticeService {
/**
* 查询公告信息
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysOperLogService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysOperLogService {
public interface SysOperLogService {
/**
* 新增操作日志
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysPostService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysPostService {
public interface SysPostService {
/**
* 查询岗位信息集合
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysRoleService.java
View File

@ -11,7 +11,7 @@ import java.util.Set;
*
* @author ruoyi
*/
public interface ISysRoleService {
public interface SysRoleService {
/**
* 根据条件分页查询角色数据
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserOnlineService.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.system.domain.SysUserOnline;
*
* @author ruoyi
*/
public interface ISysUserOnlineService {
public interface SysUserOnlineService {
/**
* 通过登录地址查询信息
*

2
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/SysUserService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
*
* @author ruoyi
*/
public interface ISysUserService {
public interface SysUserService {
/**
* 根据条件分页查询用户列表
*

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
View File

@ -10,7 +10,7 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.SysConfigServic;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -24,7 +24,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysConfigServiceImpl implements ISysConfigService {
public class SysConfigServiceImpl implements SysConfigServic {
@Autowired
private SysConfigMapper configMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.SysDeptService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -28,7 +28,7 @@ import java.util.stream.Collectors;
* @author ruoyi
*/
@Service
public class SysDeptServiceImpl implements ISysDeptService {
public class SysDeptServiceImpl implements SysDeptService {
@Autowired
private SysDeptMapper deptMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.SysDictDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -15,7 +15,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysDictDataServiceImpl implements ISysDictDataService {
public class SysDictDataServiceImpl implements SysDictDataService {
@Autowired
private SysDictDataMapper dictDataMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
View File

@ -8,7 +8,7 @@ import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDictDataMapper;
import com.ruoyi.system.mapper.SysDictTypeMapper;
import com.ruoyi.system.service.ISysDictTypeService;
import com.ruoyi.system.service.SysDictTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -25,7 +25,7 @@ import java.util.stream.Collectors;
* @author ruoyi
*/
@Service
public class SysDictTypeServiceImpl implements ISysDictTypeService {
public class SysDictTypeServiceImpl implements SysDictTypeService {
@Autowired
private SysDictTypeMapper dictTypeMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.mapper.SysLogininforMapper;
import com.ruoyi.system.service.ISysLogininforService;
import com.ruoyi.system.service.SysLogininforService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +14,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysLogininforServiceImpl implements ISysLogininforService {
public class SysLogininforServiceImpl implements SysLogininforService {
@Autowired
private SysLogininforMapper logininforMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -13,7 +13,7 @@ import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.mapper.SysMenuMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.SysMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -26,7 +26,7 @@ import java.util.stream.Collectors;
* @author ruoyi
*/
@Service
public class SysMenuServiceImpl implements ISysMenuService {
public class SysMenuServiceImpl implements SysMenuService {
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
@Autowired

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.mapper.SysNoticeMapper;
import com.ruoyi.system.service.ISysNoticeService;
import com.ruoyi.system.service.SysNoticeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +14,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysNoticeServiceImpl implements ISysNoticeService {
public class SysNoticeServiceImpl implements SysNoticeService {
@Autowired
private SysNoticeMapper noticeMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.mapper.SysOperLogMapper;
import com.ruoyi.system.service.ISysOperLogService;
import com.ruoyi.system.service.SysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -14,7 +14,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysOperLogServiceImpl implements ISysOperLogService {
public class SysOperLogServiceImpl implements SysOperLogService {
@Autowired
private SysOperLogMapper operLogMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysUserPostMapper;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.SysPostService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -18,7 +18,7 @@ import java.util.List;
* @author ruoyi
*/
@Service
public class SysPostServiceImpl implements ISysPostService {
public class SysPostServiceImpl implements SysPostService {
@Autowired
private SysPostMapper postMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
View File

@ -15,7 +15,7 @@ import com.ruoyi.system.mapper.SysRoleDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.SysRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -28,7 +28,7 @@ import java.util.*;
* @author ruoyi
*/
@Service
public class SysRoleServiceImpl implements ISysRoleService {
public class SysRoleServiceImpl implements SysRoleService {
@Autowired
private SysRoleMapper roleMapper;

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
View File

@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import com.ruoyi.system.service.SysUserOnlineService;
import org.springframework.stereotype.Service;
/**
@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* @author ruoyi
*/
@Service
public class SysUserOnlineServiceImpl implements ISysUserOnlineService {
public class SysUserOnlineServiceImpl implements SysUserOnlineService {
/**
* 通过登录地址查询信息
*

8
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -13,8 +13,8 @@ import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysConfigServic;
import com.ruoyi.system.service.SysUserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +33,7 @@ import java.util.stream.Collectors;
* @author ruoyi
*/
@Service
public class SysUserServiceImpl implements ISysUserService {
public class SysUserServiceImpl implements SysUserService {
private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
@Autowired
protected Validator validator;
@ -48,7 +48,7 @@ public class SysUserServiceImpl implements ISysUserService {
@Autowired
private SysUserPostMapper userPostMapper;
@Autowired
private ISysConfigService configService;
private SysConfigServic configService;
/**
* 根据条件分页查询用户列表