diff --git a/doc/工作计划 b/doc/工作计划 index 647b98a24..2d6ea0b12 100644 --- a/doc/工作计划 +++ b/doc/工作计划 @@ -5,3 +5,5 @@ 3.熟悉 实际： +1.完成菜单移植 +2.完成用户列表 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/UserController.java index 14ee6cb94..1ffe88c50 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/dfm/controller/UserController.java @@ -1,5 +1,8 @@ package com.ruoyi.dfm.controller; +import com.ruoyi.common.core.page.PageDomain; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.dfm.constant.UserConstants; import com.ruoyi.dfm.pojo.Page; import com.ruoyi.dfm.pojo.UserInfo; @@ -7,12 +10,15 @@ import com.ruoyi.dfm.pojo.UserQueryBean; import com.ruoyi.dfm.service.FileService; import com.ruoyi.dfm.service.UserService; import com.ruoyi.dfm.util.Md5Util; +import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.system.domain.SysRole; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; @@ -21,7 +27,7 @@ import java.util.List; @Controller @RequestMapping("/user.do") -public class UserController extends BaseController{ +public class UserController extends com.ruoyi.common.core.controller.BaseController { private static final Logger logger = LoggerFactory.getLogger(UserController.class); @Autowired @@ -94,7 +100,21 @@ public class UserController extends BaseController{ } } - + + + /** + * 用户管理控制器，默认打开个人资料方法 + * @param req + * @param res + * @return + * @throws Exception + */ + @RequestMapping("/list") + public ModelAndView list(HttpServletRequest req, + HttpServletResponse res) throws Exception { + return new ModelAndView("dfm/userList"); + } + /** * 获取用户列表 * @param req @@ -102,35 +122,28 @@ public class UserController extends BaseController{ * @return * @throws Exception */ - @RequestMapping("/getUserList") - public ModelAndView getUserList(HttpServletRequest req, - HttpServletResponse res) throws Exception { - String currentPage = req.getParameter("currentPage"); - Page page = new Page(); - if(currentPage == null || "".equals(currentPage.trim())) - { - page.setCurrentPage(1); - } - else - { - page.setCurrentPage(Integer.parseInt(currentPage)); - } - - UserInfo currentUser = getUserInfo(req); - List rs = null; - if(UserConstants.USER_LEVEL_ADMIN == currentUser.getGroupId()) { - rs = userService.getAllUser(page); - } else if(UserConstants.USER_LEVEL_DEP_ADMIN == currentUser.getGroupId()) { - //部门管理员，只能获取自己部门的用户 - UserQueryBean userQueryBean = new UserQueryBean(); - userQueryBean.setDepartment(currentUser.getDepartment()); - rs = userService.getByQueryBean(userQueryBean, page); - } - req.setAttribute("userList", rs); - req.setAttribute("page", page); - return new ModelAndView("userList"); - } - +// @RequestMapping("/getUserList") +// @ResponseBody +// public TableDataInfo getUserList(HttpServletRequest req, HttpServletResponse res) throws Exception { +// startPage(); +// Page page = new Page(); +// PageDomain pageDomain = TableSupport.getPageDomain(); +// page.setCurrentPage(pageDomain.getPageNum()); +// page.setPageSize(pageDomain.getPageSize()); +// +// UserInfo currentUser = ShiroUtils.getLoginUser(); +// List rs = null; +// if(UserConstants.USER_LEVEL_ADMIN == currentUser.getGroupId()) { +// rs = userService.getAllUser(page); +// } else if(UserConstants.USER_LEVEL_DEP_ADMIN == currentUser.getGroupId()) { +// //部门管理员，只能获取自己部门的用户 +// UserQueryBean userQueryBean = new UserQueryBean(); +// userQueryBean.setDepartment(currentUser.getDepartment()); +// rs = userService.getByQueryBean(userQueryBean, page); +// } +// return getDataTable(rs); +// } +// /** @@ -194,7 +207,7 @@ public class UserController extends BaseController{ String ustr = req.getParameter("uid"); if(ustr == null || "".equals(ustr)) { - uid = getUserInfo(req).getId(); + uid = ShiroUtils.getLoginUser().getId(); }else { uid = Integer.parseInt(ustr); @@ -231,7 +244,7 @@ public class UserController extends BaseController{ groupId = UserConstants.USER_LEVEL_DEP_ADMIN; } - UserInfo user1 = getUserInfo(req); + UserInfo user1 = ShiroUtils.getLoginUser(); try { UserInfo user = new UserInfo(); user.setId(Integer.parseInt(id)); @@ -262,10 +275,11 @@ public class UserController extends BaseController{ } } - @RequestMapping("/queryUser") - public ModelAndView queryUser(HttpServletRequest req, + @RequestMapping("/getUserList") + @ResponseBody + public TableDataInfo queryUser(HttpServletRequest req, HttpServletResponse res) throws Exception { - + startPage(); String name = req.getParameter("name"); String username = req.getParameter("username"); String department = req.getParameter("department"); @@ -278,20 +292,15 @@ public class UserController extends BaseController{ queryBean.setProjectGroup(projectGroup); queryBean.setState(state); queryBean.setUsername(username); - - //构造分页参数 - String currentPage = req.getParameter("currentPage"); - Page page = new Page(); - if(currentPage == null || "".equals(currentPage.trim())) - { - page.setCurrentPage(1); - } - else - { - page.setCurrentPage(Integer.parseInt(currentPage)); - } - UserInfo currentUser = getUserInfo(req); + Page page = new Page(); + PageDomain pageDomain = TableSupport.getPageDomain(); + page.setCurrentPage(pageDomain.getPageNum()); + page.setPageSize(pageDomain.getPageSize()); + + UserInfo currentUser = ShiroUtils.getLoginUser(); + + List rs = null; if(UserConstants.USER_LEVEL_ADMIN == currentUser.getGroupId()) { rs = userService.getByQueryBean(queryBean , page); @@ -300,11 +309,7 @@ public class UserController extends BaseController{ queryBean.setDepartment(currentUser.getDepartment()); rs = userService.getByQueryBean(queryBean, page); } - - //List list = userService.getByQueryBean(queryBean , page); - req.setAttribute("page", page); - req.setAttribute("userList", rs); - return new ModelAndView("userList"); + return getDataTable(rs); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/MenuService.java b/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/MenuService.java deleted file mode 100644 index acc2ba827..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/MenuService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.ruoyi.dfm.service; - -import com.ruoyi.dfm.dao.MenuDAO; -import com.ruoyi.dfm.pojo.MenuInfo; -import com.ruoyi.dfm.pojo.UserInfo; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.List; - -@Component -public class MenuService { - private static final Logger logger = LoggerFactory.getLogger(MenuService.class); - @Autowired - private MenuDAO menuDAO; - - - /** - * 根据用户ID获取该用户拥有的菜单列表 - * @return - */ - public List getMenuByUser(UserInfo user) - { - return menuDAO.getByGroup(user.getGroupId()); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 5ca720d5e..2096ccd2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -2,6 +2,10 @@ package com.ruoyi.web.controller.system; import com.ruoyi.common.config.Global; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.dfm.pojo.MenuInfo; +import com.ruoyi.dfm.pojo.UserInfo; +import com.ruoyi.dfm.service.MenuService; +import com.ruoyi.dfm.service.UserService; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.SysUser; @@ -22,27 +26,37 @@ import java.util.List; @Controller public class SysIndexController extends BaseController { - @Autowired - private ISysMenuService menuService; +// @Autowired +// private ISysMenuService menuService; @Autowired private ISysConfigService configService; + @Autowired + MenuService menuService; + + @Autowired + UserService userService; + // 系统首页 @GetMapping("/index") public String index(ModelMap mmap) { // 取身份信息 - SysUser user = ShiroUtils.getSysUser(); + UserInfo user = ShiroUtils.getLoginUser(); +// SysUser user = ShiroUtils.getSysUser(); // 根据用户id取出菜单 - List menus = menuService.selectMenusByUser(user); +// List menus = menuService.selectMenusByUser(user); + //FIXME 临时查询 + List menus = menuService.getMenuByGroup(1); + mmap.put("menus", menus); mmap.put("user", user); mmap.put("sideTheme", configService.selectConfigByKey("sys.index.sideTheme")); mmap.put("skinName", configService.selectConfigByKey("sys.index.skinName")); mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("demoEnabled", Global.isDemoEnabled()); - return "index"; + return "index_dfm"; } // 切换主题 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index f623274e5..a5ef1f7d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -1,46 +1,46 @@ -package com.ruoyi.web.controller.system; - -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.framework.shiro.service.SysRegisterService; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.ResponseBody; - -/** - * 注册验证 - * - * @author ruoyi - */ -@Controller -public class SysRegisterController extends BaseController -{ - @Autowired - private SysRegisterService registerService; - - @Autowired - private ISysConfigService configService; - - @GetMapping("/register") - public String register() - { - return "register"; - } - - @PostMapping("/register") - @ResponseBody - public AjaxResult ajaxRegister(SysUser user) - { - if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) - { - return error("当前系统没有开启注册功能！"); - } - String msg = registerService.register(user); - return StringUtils.isEmpty(msg) ? success() : error(msg); - } -} +//package com.ruoyi.web.controller.system; +// +//import com.ruoyi.common.core.controller.BaseController; +//import com.ruoyi.common.core.domain.AjaxResult; +//import com.ruoyi.framework.shiro.service.SysRegisterService; +//import com.ruoyi.system.domain.SysUser; +//import com.ruoyi.system.service.ISysConfigService; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Controller; +//import org.springframework.util.StringUtils; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.ResponseBody; +// +///** +// * 注册验证 +// * +// * @author ruoyi +// */ +//@Controller +//public class SysRegisterController extends BaseController +//{ +// @Autowired +// private SysRegisterService registerService; +// +// @Autowired +// private ISysConfigService configService; +// +// @GetMapping("/register") +// public String register() +// { +// return "register"; +// } +// +// @PostMapping("/register") +// @ResponseBody +// public AjaxResult ajaxRegister(SysUser user) +// { +// if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) +// { +// return error("当前系统没有开启注册功能！"); +// } +// String msg = registerService.register(user); +// return StringUtils.isEmpty(msg) ? success() : error(msg); +// } +//} diff --git a/ruoyi-admin/src/main/resources/templates/dfm/userList.html b/ruoyi-admin/src/main/resources/templates/dfm/userList.html new file mode 100644 index 000000000..6e8ca1269 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/dfm/userList.html @@ -0,0 +1,196 @@ + + + + + + +
+
+
+
+
+
    +
  • + 员工姓名： +
    • +
  • + 用户名： +
    • +
  • + 所在部门： +
    • +
  • + 项目组： +
    • +
  • + 状态： +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/index_dfm.html b/ruoyi-admin/src/main/resources/templates/index_dfm.html index f6e2e3686..f0efa4b0d 100644 --- a/ruoyi-admin/src/main/resources/templates/index_dfm.html +++ b/ruoyi-admin/src/main/resources/templates/index_dfm.html @@ -4,7 +4,7 @@ - 若依系统首页 + 若依系统首页111111111111 @@ -26,7 +26,7 @@
@@ -40,7 +40,7 @@
-

[[${user.loginName}]]

+

[[${user.name}]]

在线 注销
@@ -49,6 +49,14 @@
  • 首页
    • + + + + + + + +
  • @@ -189,7 +197,7 @@
  • - +
    • diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index f21285364..11789dbdc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -1,6 +1,7 @@ package com.ruoyi.common.core.controller; import java.beans.PropertyEditorSupport; +import java.io.PrintWriter; import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -182,4 +183,25 @@ public class BaseController { return StringUtils.format("redirect:{}", url); } + + + protected void outputMsg(HttpServletResponse res , String msg) throws Exception + { + PrintWriter out = res.getWriter(); + res.setContentType("text/html"); + res.setCharacterEncoding("utf-8"); + out.write(msg); + out.flush(); + out.close(); + } + + protected void outputJson(HttpServletResponse res , String msg) throws Exception + { + PrintWriter out = res.getWriter(); + res.setContentType("text/json"); + res.setCharacterEncoding("utf-8"); + out.write(msg); + out.flush(); + out.close(); + } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java index 7554f7c11..c94a31bbc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java @@ -2,6 +2,8 @@ package com.ruoyi.framework.shiro.realm; import java.util.HashSet; import java.util.Set; + +import com.ruoyi.dfm.pojo.UserInfo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.AuthenticationInfo; @@ -93,7 +95,7 @@ public class UserRealm extends AuthorizingRealm password = new String(upToken.getPassword()); } - SysUser user = null; + UserInfo user = null; try { user = loginService.login(username, password); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java index 788c0d574..061475541 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysLoginService.java @@ -1,5 +1,9 @@ package com.ruoyi.framework.shiro.service; +import com.ruoyi.dfm.dao.UserDAO; +import com.ruoyi.dfm.pojo.UserInfo; +import com.ruoyi.dfm.service.UserService; +import com.ruoyi.dfm.util.Md5Util; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; @@ -32,13 +36,16 @@ public class SysLoginService @Autowired private SysPasswordService passwordService; +// @Autowired +// private ISysUserService userService; + @Autowired - private ISysUserService userService; + UserDAO userDAO; /** * 登录 */ - public SysUser login(String username, String password) + public UserInfo login(String username, String password) { // 验证码校验 if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) @@ -52,24 +59,25 @@ public class SysLoginService AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null"))); throw new UserNotExistsException(); } - // 密码如果不在指定范围内 错误 - if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); - throw new UserPasswordNotMatchException(); - } - - // 用户名不在指定范围内 错误 - if (username.length() < UserConstants.USERNAME_MIN_LENGTH - || username.length() > UserConstants.USERNAME_MAX_LENGTH) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); - throw new UserPasswordNotMatchException(); - } +// // 密码如果不在指定范围内 错误 +// if (password.length() < UserConstants.PASSWORD_MIN_LENGTH +// || password.length() > UserConstants.PASSWORD_MAX_LENGTH) +// { +// AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); +// throw new UserPasswordNotMatchException(); +// } +// +// // 用户名不在指定范围内 错误 +// if (username.length() < UserConstants.USERNAME_MIN_LENGTH +// || username.length() > UserConstants.USERNAME_MAX_LENGTH) +// { +// AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); +// throw new UserPasswordNotMatchException(); +// } // 查询用户信息 - SysUser user = userService.selectUserByLoginName(username); +// SysUser user = userService.get + UserInfo userInfo = userDAO.checkUser(username, Md5Util.md5(password)); /** if (user == null && maybeMobilePhoneNumber(username)) @@ -83,29 +91,29 @@ public class SysLoginService } */ - if (user == null) + if (userInfo == null) { AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.not.exists"))); throw new UserNotExistsException(); } - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.delete"))); - throw new UserDeleteException(); - } - - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark()))); - throw new UserBlockedException(); - } - - passwordService.validate(user, password); +// if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) +// { +// AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.delete"))); +// throw new UserDeleteException(); +// } +// +// if (UserStatus.DISABLE.getCode().equals(user.getStatus())) +// { +// AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.blocked", user.getRemark()))); +// throw new UserBlockedException(); +// } +// +// passwordService.validate(user, password); AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"))); - recordLoginInfo(user); - return user; +// recordLoginInfo(user); + return userInfo; } /** @@ -128,13 +136,13 @@ public class SysLoginService } */ - /** - * 记录登录信息 - */ - public void recordLoginInfo(SysUser user) - { - user.setLoginIp(ShiroUtils.getIp()); - user.setLoginDate(DateUtils.getNowDate()); - userService.updateUserInfo(user); - } +// /** +// * 记录登录信息 +// */ +// public void recordLoginInfo(SysUser user) +// { +// user.setLoginIp(ShiroUtils.getIp()); +// user.setLoginDate(DateUtils.getNowDate()); +// userService.updateUserInfo(user); +// } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysRegisterService.java index 97dfd1022..8445e5011 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysRegisterService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/service/SysRegisterService.java @@ -1,80 +1,80 @@ -package com.ruoyi.framework.shiro.service; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ShiroConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysUserService; - -/** - * 注册校验方法 - * - * @author ruoyi - */ -@Component -public class SysRegisterService -{ - @Autowired - private ISysUserService userService; - - @Autowired - private SysPasswordService passwordService; - - /** - * 注册 - */ - public String register(SysUser user) - { - String msg = "", username = user.getLoginName(), password = user.getPassword(); - - if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) - { - msg = "验证码错误"; - } - else if (StringUtils.isEmpty(username)) - { - msg = "用户名不能为空"; - } - else if (StringUtils.isEmpty(password)) - { - msg = "用户密码不能为空"; - } - else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH - || password.length() > UserConstants.PASSWORD_MAX_LENGTH) - { - msg = "密码长度必须在5到20个字符之间"; - } - else if (username.length() < UserConstants.USERNAME_MIN_LENGTH - || username.length() > UserConstants.USERNAME_MAX_LENGTH) - { - msg = "账户长度必须在2到20个字符之间"; - } - else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(username))) - { - msg = "保存用户'" + username + "'失败，注册账号已存在"; - } - else - { - user.setSalt(ShiroUtils.randomSalt()); - user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); - boolean regFlag = userService.registerUser(user); - if (!regFlag) - { - msg = "注册失败,请联系系统管理人员"; - } - else - { - AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); - } - } - return msg; - } -} +//package com.ruoyi.framework.shiro.service; +// +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +//import org.springframework.util.StringUtils; +//import com.ruoyi.common.constant.Constants; +//import com.ruoyi.common.constant.ShiroConstants; +//import com.ruoyi.common.constant.UserConstants; +//import com.ruoyi.common.utils.MessageUtils; +//import com.ruoyi.common.utils.ServletUtils; +//import com.ruoyi.framework.manager.AsyncManager; +//import com.ruoyi.framework.manager.factory.AsyncFactory; +//import com.ruoyi.framework.util.ShiroUtils; +//import com.ruoyi.system.domain.SysUser; +//import com.ruoyi.system.service.ISysUserService; +// +///** +// * 注册校验方法 +// * +// * @author ruoyi +// */ +//@Component +//public class SysRegisterService +//{ +// @Autowired +// private ISysUserService userService; +// +// @Autowired +// private SysPasswordService passwordService; +// +// /** +// * 注册 +// */ +// public String register(SysUser user) +// { +// String msg = "", username = user.getLoginName(), password = user.getPassword(); +// +// if (!StringUtils.isEmpty(ServletUtils.getRequest().getAttribute(ShiroConstants.CURRENT_CAPTCHA))) +// { +// msg = "验证码错误"; +// } +// else if (StringUtils.isEmpty(username)) +// { +// msg = "用户名不能为空"; +// } +// else if (StringUtils.isEmpty(password)) +// { +// msg = "用户密码不能为空"; +// } +// else if (password.length() < UserConstants.PASSWORD_MIN_LENGTH +// || password.length() > UserConstants.PASSWORD_MAX_LENGTH) +// { +// msg = "密码长度必须在5到20个字符之间"; +// } +// else if (username.length() < UserConstants.USERNAME_MIN_LENGTH +// || username.length() > UserConstants.USERNAME_MAX_LENGTH) +// { +// msg = "账户长度必须在2到20个字符之间"; +// } +// else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkLoginNameUnique(username))) +// { +// msg = "保存用户'" + username + "'失败，注册账号已存在"; +// } +// else +// { +// user.setSalt(ShiroUtils.randomSalt()); +// user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt())); +// boolean regFlag = userService.registerUser(user); +// if (!regFlag) +// { +// msg = "注册失败,请联系系统管理人员"; +// } +// else +// { +// AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"))); +// } +// } +// return msg; +// } +//} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java index 05fce47bf..ac1628d23 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java @@ -1,5 +1,6 @@ package com.ruoyi.framework.util; +import com.ruoyi.dfm.pojo.UserInfo; import org.apache.shiro.SecurityUtils; import org.apache.shiro.crypto.SecureRandomNumberGenerator; import org.apache.shiro.mgt.RealmSecurityManager; @@ -46,6 +47,18 @@ public class ShiroUtils return user; } + public static UserInfo getLoginUser() + { + UserInfo user = null; + Object obj = getSubject().getPrincipal(); + if (StringUtils.isNotNull(obj)) + { + user = new UserInfo(); + BeanUtils.copyBeanProp(user, obj); + } + return user; + } + public static void setSysUser(SysUser user) { Subject subject = getSubject(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/ProjectConstants.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/constant/ProjectConstants.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/ProjectConstants.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/constant/ProjectConstants.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/RequestConstants.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/constant/RequestConstants.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/RequestConstants.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/constant/RequestConstants.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/UserConstants.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/constant/UserConstants.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/UserConstants.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/constant/UserConstants.java index 280362b4d..e05e8176a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/constant/UserConstants.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/constant/UserConstants.java @@ -11,4 +11,7 @@ public interface UserConstants { int USER_STATUS_QIYONG = 0; int USER_STATUS_ZANTING = 1; + + int MENU_LEVEL_0 = 0; + int MENU_LEVEL_1 = 1; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/DataAnalysisDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/DataAnalysisDAO.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/DataAnalysisDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/DataAnalysisDAO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/FileDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/FileDAO.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/FileDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/FileDAO.java index bcfdd1511..de6ddb93b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/FileDAO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/FileDAO.java @@ -5,6 +5,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; + @Component public class FileDAO extends JdbcBaseDao{ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java index 50d7f3ce9..24a8e8e8c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/JdbcBaseDao.java @@ -1,22 +1,15 @@ package com.ruoyi.dfm.dao; -import com.alibaba.druid.pool.DruidDataSource; -import com.ruoyi.framework.config.DruidConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.PreparedStatementCallback; import org.springframework.jdbc.core.RowMapper; -import org.springframework.jdbc.core.support.JdbcDaoSupport; import org.springframework.jdbc.support.lob.LobHandler; import org.springframework.stereotype.Component; -import javax.sql.DataSource; import java.sql.*; import java.util.HashMap; import java.util.List; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java index 8d51b2e1d..a3e232633 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/MenuDAO.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; + @Component public class MenuDAO extends JdbcBaseDao { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java index d3ff4ffbd..d48d16cbe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/ProjectDAO.java @@ -8,7 +8,7 @@ import com.ruoyi.dfm.pojo.ProjectQueryBean; import com.ruoyi.dfm.pojo.ProjectStage; import com.ruoyi.dfm.util.PageUtil; import com.ruoyi.dfm.util.TimeUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -16,6 +16,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; + @Component public class ProjectDAO extends JdbcBaseDao { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java index 96027c065..68a884a01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/StatisticsDAO.java @@ -2,12 +2,9 @@ package com.ruoyi.dfm.dao; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; /** * 统计功能DAO diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/UserDAO.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/UserDAO.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/UserDAO.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/dao/UserDAO.java index e2cd5fd1c..02f1dd8c9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/dao/UserDAO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/dao/UserDAO.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; import java.util.Map; + @Component public class UserDAO extends JdbcBaseDao { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java index 3547d7974..437aafa29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/DataAnalysisBean.java @@ -1,6 +1,10 @@ package com.ruoyi.dfm.pojo; -public class DataAnalysisBean { +import java.io.Serializable; + +public class DataAnalysisBean implements Serializable { + + private static final long serialVersionUID = -1499073053303362866L; private int dataId; private int projectId; private String projectName; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java index 285185bd7..1a96745e4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/FileInfo.java @@ -1,6 +1,10 @@ package com.ruoyi.dfm.pojo; -public class FileInfo { +import java.io.Serializable; + +public class FileInfo implements Serializable { + + private static final long serialVersionUID = 1363196522567826008L; private int id; private String fileName; private String relaPath; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java similarity index 52% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java index 13fee74c4..7de437338 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/MenuInfo.java @@ -1,16 +1,28 @@ package com.ruoyi.dfm.pojo; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + /** * 菜单类 * @author Kfighter * */ -public class MenuInfo { +public class MenuInfo implements Serializable { + private static final long serialVersionUID = 1343486203321146073L; private int id; private String url; private String menuName; private int menuLevel; private int parentId; + private String icon; + private String target; + + + /** 子菜单 */ + private List children = new ArrayList<>(); + public int getId() { return id; } @@ -42,7 +54,28 @@ public class MenuInfo { public void setParentId(int parentId) { this.parentId = parentId; } - - - + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Page.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Page.java similarity index 77% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Page.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Page.java index 2402a35a2..5c44349b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Page.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Page.java @@ -3,18 +3,21 @@ package com.ruoyi.dfm.pojo; import com.ruoyi.dfm.util.PropertiesUtils; -public class Page { +import java.io.Serializable; + +public class Page implements Serializable { + private static final long serialVersionUID = -4222587152137966045L; private int currentPage; private int pageSize; private int totalCount; private int totalPage; private String orderCase; - private static int PAGE_SIZE; + private static int PAGE_SIZE = 10; // 获取系统文件根路径 - static { - PAGE_SIZE = Integer.parseInt(PropertiesUtils.getProperties().getProperty("PAGE_SIZE")); - } +// static { +// PAGE_SIZE = Integer.parseInt(PropertiesUtils.getProperties().getProperty("PAGE_SIZE")); +// } public Page() { this.currentPage = 1; this.pageSize = PAGE_SIZE; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Project.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Project.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Project.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Project.java index 16a04928a..be3afe398 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Project.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Project.java @@ -1,6 +1,9 @@ package com.ruoyi.dfm.pojo; -public class Project { +import java.io.Serializable; + +public class Project implements Serializable { + private static final long serialVersionUID = 6352252350113283745L; private int id; private String projectName; private int version = 1; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java index b0aba3c41..7f439651d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectQueryBean.java @@ -1,6 +1,9 @@ package com.ruoyi.dfm.pojo; -public class ProjectQueryBean { +import java.io.Serializable; + +public class ProjectQueryBean implements Serializable { + private static final long serialVersionUID = -599057777600930089L; private String projectName; private String username; private String state; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java index 7c71721f5..8c4ccfb8c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/ProjectStage.java @@ -1,6 +1,9 @@ package com.ruoyi.dfm.pojo; -public class ProjectStage { +import java.io.Serializable; + +public class ProjectStage implements Serializable { + private static final long serialVersionUID = -5089867653922923969L; private int id ; private String stageName; private int stageOrder; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Result.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Result.java similarity index 75% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Result.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Result.java index 1b416f353..396e25f55 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/Result.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/Result.java @@ -1,6 +1,9 @@ package com.ruoyi.dfm.pojo; -public class Result { +import java.io.Serializable; + +public class Result implements Serializable { + private static final long serialVersionUID = -8219578427197649446L; private boolean success; private String message; private Object data; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java index 9a93369ae..816cd54ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserInfo.java @@ -1,6 +1,9 @@ package com.ruoyi.dfm.pojo; -public class UserInfo { +import java.io.Serializable; + +public class UserInfo implements Serializable { + private static final long serialVersionUID = -8601310432026069019L; private int id; private String name; private String username; @@ -11,6 +14,16 @@ public class UserInfo { private String ccEmail; private int groupId; private int status; + private String avatar; + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + public int getStatus() { return status; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java index 6a565ed26..8de7943f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/pojo/UserQueryBean.java @@ -1,7 +1,10 @@ package com.ruoyi.dfm.pojo; -public class UserQueryBean { +import java.io.Serializable; +public class UserQueryBean implements Serializable { + + private static final long serialVersionUID = -2612773710283491830L; private String name; private String username; private String department; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java index 429d963f1..008bbb4cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/DataAnalysisService.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.List; + @Component public class DataAnalysisService { @Autowired diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/FileService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/FileService.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/FileService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/FileService.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/LoginService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/LoginService.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/LoginService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/LoginService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/dfm/service/MenuService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/MenuService.java new file mode 100644 index 000000000..c53ab8a9d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/MenuService.java @@ -0,0 +1,65 @@ +package com.ruoyi.dfm.service; + +import com.ruoyi.dfm.constant.UserConstants; +import com.ruoyi.dfm.dao.MenuDAO; +import com.ruoyi.dfm.pojo.MenuInfo; +import com.ruoyi.dfm.pojo.UserInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +@Component +public class MenuService { + private static final Logger logger = LoggerFactory.getLogger(MenuService.class); + @Autowired + private MenuDAO menuDAO; + + + /** + * 根据用户ID获取该用户拥有的菜单列表 + * @return + */ + public List getMenuByUser(UserInfo user) + { + return menuDAO.getByGroup(user.getGroupId()); + } + + + /** + * 根据用户ID获取该用户拥有的菜单列表 + * @return + */ + public List getMenuByGroup(int groupId) + { + List menus = menuDAO.getByGroup(groupId); + List result = new ArrayList<>(); + for (MenuInfo menuInfo : menus) { + if(UserConstants.MENU_LEVEL_0 == menuInfo.getMenuLevel()) { + //第一级菜单 + result.add(menuInfo); + } else { + MenuInfo parentMenu = getMenuById(menus, menuInfo.getParentId()); + if(null == parentMenu){ + result.add(menuInfo); + } + parentMenu.getChildren().add(menuInfo); + } + } + return result; + } + + + private MenuInfo getMenuById(List menus, int id) { + for (MenuInfo menuInfo : menus) { + if(menuInfo.getId() == id) { + return menuInfo; + } + } + return null; + } + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/ProjectService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/ProjectService.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/ProjectService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/ProjectService.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/StatisticsService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/StatisticsService.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/StatisticsService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/StatisticsService.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/UserService.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/UserService.java similarity index 98% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/service/UserService.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/service/UserService.java index c1a9fd5fe..7d044edad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/dfm/service/UserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/dfm/service/UserService.java @@ -6,7 +6,7 @@ import com.ruoyi.dfm.pojo.Project; import com.ruoyi.dfm.pojo.UserInfo; import com.ruoyi.dfm.pojo.UserQueryBean; import com.ruoyi.dfm.util.Md5Util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/util/FileUtil.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/util/FileUtil.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/util/FileUtil.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/util/FileUtil.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/util/Md5Util.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/util/Md5Util.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/util/Md5Util.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/util/Md5Util.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/util/PageUtil.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/util/PageUtil.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/util/PageUtil.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/util/PageUtil.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/util/PropertiesUtils.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/util/PropertiesUtils.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/util/PropertiesUtils.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/util/PropertiesUtils.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/dfm/util/TimeUtil.java b/ruoyi-system/src/main/java/com/ruoyi/dfm/util/TimeUtil.java similarity index 100% rename from ruoyi-admin/src/main/java/com/ruoyi/dfm/util/TimeUtil.java rename to ruoyi-system/src/main/java/com/ruoyi/dfm/util/TimeUtil.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index da884de81..8745eb964 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -1,11 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 参数配置表 sys_config diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java index 4d86400d1..d7ea4209d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java @@ -1,9 +1,12 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 部门表 sys_dept diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java index 4b8146a72..8e21e61a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java @@ -1,12 +1,14 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java index 8c786b4bc..56ae279a4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java @@ -1,11 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java index cf79d99d2..0afb98cc9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java @@ -1,11 +1,12 @@ package com.ruoyi.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.Date; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 系统访问记录表 sys_logininfor diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 8a0f83f44..944e21027 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,11 +1,13 @@ package com.ruoyi.system.domain; -import java.util.List; -import java.util.ArrayList; -import javax.validation.constraints.*; +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.ArrayList; +import java.util.List; /** * 菜单权限表 sys_menu diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index 7de4d9460..4bc25f786 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -1,9 +1,11 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; +import com.ruoyi.common.core.domain.BaseEntity; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.core.domain.BaseEntity; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 通知公告表 sys_notice diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java index a3a98438e..bdf6161eb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java @@ -1,11 +1,12 @@ package com.ruoyi.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import java.util.Date; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 操作日志记录表 oper_log diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 7a2cb2bad..d9d936439 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -1,11 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 岗位表 sys_post diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java index 5aa98e138..078e25aa1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java @@ -1,11 +1,13 @@ package com.ruoyi.system.domain; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 角色表 sys_role diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java index 5d4332b3c..428fa06f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java @@ -1,15 +1,18 @@ package com.ruoyi.system.domain; -import java.util.Date; -import java.util.List; -import javax.validation.constraints.*; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel.ColumnType; import com.ruoyi.common.annotation.Excel.Type; import com.ruoyi.common.annotation.Excels; import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 用户对象 sys_user diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index c5467bb66..ce80e8954 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -1,10 +1,11 @@ package com.ruoyi.system.domain; -import java.util.Date; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.enums.OnlineStatus; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; /** * 当前在线会话 sys_user_online diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java index 9bc8482cc..38d94dd94 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysConfig; +import java.util.List; + /** * 参数配置 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index 897400761..8226e7da7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDept; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 部门管理 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java index ad251fdea..f7843e084 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysDictData; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 字典表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java index a1aa3e3b4..f9408d002 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysDictType; +import java.util.List; + /** * 字典表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java index 0efe3d7e8..fa55d6e7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysLogininfor; +import java.util.List; + /** * 系统访问日志情况信息 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java index 4b09dda5f..abb501f7c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysMenu; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 菜单表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java index 1ce1d8cde..b5774b298 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysNotice; +import java.util.List; + /** * 公告 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 98ca5d130..e8c0fa193 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysOperLog; +import java.util.List; + /** * 操作日志 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java index a4aab595b..c6f3edd9c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysPost; +import java.util.List; + /** * 岗位信息 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java index a4ad4de24..45e1c0cb5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysRoleDept; +import java.util.List; + /** * 角色与部门关联表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java index 8c2ea6501..8b9052713 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysRole; +import java.util.List; + /** * 角色表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java index 5ed98f294..87c501dbb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysRoleMenu; +import java.util.List; + /** * 角色与菜单关联表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index ab4a15fe6..32ab3a0b0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysUser; +import java.util.List; + /** * 用户表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java index c6bf94cd2..547c59888 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserOnlineMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysUserOnline; +import java.util.List; + /** * 在线用户 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java index 1f7a1fcbd..1a1853224 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; import com.ruoyi.system.domain.SysUserPost; +import java.util.List; + /** * 用户与岗位关联表 数据层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java index 17fa5c827..ac116ee63 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.system.mapper; -import java.util.List; -import org.apache.ibatis.annotations.Param; import com.ruoyi.system.domain.SysUserRole; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 用户与角色关联表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java index d27b3f514..465bf8a57 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysConfig; +import java.util.List; + /** * 参数配置 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index bd40eb1f0..baaead16f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -1,10 +1,11 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysRole; +import java.util.List; + /** * 部门管理 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java index 857e43661..20faac072 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysDictData; +import java.util.List; + /** * 字典 业务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java index e02946222..7e4fce071 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java @@ -1,10 +1,11 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.system.domain.SysDictData; import com.ruoyi.system.domain.SysDictType; +import java.util.List; + /** * 字典 业务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java index 8e292c25b..c4622e531 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysLogininfor; +import java.util.List; + /** * 系统访问日志情况信息 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java index 04cb8e091..2db312adb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java @@ -1,13 +1,14 @@ package com.ruoyi.system.service; -import java.util.List; -import java.util.Map; -import java.util.Set; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.system.domain.SysMenu; import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.domain.SysUser; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * 菜单 业务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java index abd6d7afc..ea3a1736a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysNotice; +import java.util.List; + /** * 公告 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index 61efe6020..5d44ce87e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysOperLog; +import java.util.List; + /** * 操作日志 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java index bbf7b784f..ceec9d063 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysPost; +import java.util.List; + /** * 岗位信息 服务层 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java index 1d51d6b72..583e6bd8c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java @@ -1,9 +1,10 @@ package com.ruoyi.system.service; +import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUserRole; + import java.util.List; import java.util.Set; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUserRole; /** * 角色业务层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java index 9c62537f2..cc12a6223 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java @@ -1,8 +1,9 @@ package com.ruoyi.system.service; +import com.ruoyi.system.domain.SysUserOnline; + import java.util.Date; import java.util.List; -import com.ruoyi.system.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 51c018d73..06fccc3ec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -1,9 +1,10 @@ package com.ruoyi.system.service; -import java.util.List; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.domain.SysUserRole; +import java.util.List; + /** * 用户 业务层 * @@ -43,6 +44,7 @@ public interface ISysUserService */ public SysUser selectUserByLoginName(String userName); + /** * 通过手机号码查询用户 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index 546ac179d..06aee22db 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -1,9 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.text.Convert; @@ -12,6 +8,11 @@ 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.List; /** * 参数配置 服务层实现 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 69cbdeb17..41f597556 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -1,12 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.Ztree; @@ -16,6 +9,14 @@ import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.mapper.SysDeptMapper; import com.ruoyi.system.service.ISysDeptService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * 部门管理 服务实现 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index 67858799b..d68acf48b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -1,13 +1,14 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysDictData; import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.utils.DictUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 字典 业务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 495389b86..2a3a9f31b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -1,11 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import javax.annotation.PostConstruct; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.core.text.Convert; @@ -17,6 +11,13 @@ import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; import com.ruoyi.system.utils.DictUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.PostConstruct; +import java.util.ArrayList; +import java.util.List; /** * 字典 业务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 3f183d62c..c646094fb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 系统访问日志情况信息 服务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index c1bf72ed4..7375cdb94 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -1,16 +1,5 @@ package com.ruoyi.system.service.impl; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.utils.StringUtils; @@ -20,6 +9,11 @@ import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.mapper.SysMenuMapper; import com.ruoyi.system.mapper.SysRoleMenuMapper; import com.ruoyi.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.text.MessageFormat; +import java.util.*; /** * 菜单 业务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index 0f4814d0a..796e43832 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.mapper.SysNoticeMapper; import com.ruoyi.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 公告 服务层实现 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index c79668b2e..8707e1f73 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,12 +1,13 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.core.text.Convert; import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; import com.ruoyi.system.service.ISysOperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 操作日志 服务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 885b89240..38ebb9e90 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -1,8 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.exception.BusinessException; @@ -11,6 +8,10 @@ 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 岗位信息 服务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 0a8b4b1cd..3568076b0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -1,13 +1,5 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.text.Convert; @@ -23,6 +15,11 @@ 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 org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; /** * 角色 业务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java index 73703b978..a92c9414b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,19 +1,20 @@ package com.ruoyi.system.service.impl; -import java.io.Serializable; -import java.util.Date; -import java.util.Deque; -import java.util.List; -import org.apache.shiro.cache.Cache; -import org.apache.shiro.cache.ehcache.EhCacheManager; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import com.ruoyi.common.constant.ShiroConstants; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.mapper.SysUserOnlineMapper; import com.ruoyi.system.service.ISysUserOnlineService; +import org.apache.shiro.cache.Cache; +import org.apache.shiro.cache.ehcache.EhCacheManager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; +import java.util.Date; +import java.util.Deque; +import java.util.List; /** * 在线用户 服务层处理 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index fd1bfcd92..82aca1fd5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,30 +1,24 @@ package com.ruoyi.system.service.impl; -import java.util.ArrayList; -import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.exception.BusinessException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.Md5Utils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; +import com.ruoyi.system.domain.*; +import com.ruoyi.system.mapper.*; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysUserService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; /** * 用户 业务层处理 @@ -54,6 +48,9 @@ public class SysUserServiceImpl implements ISysUserService @Autowired private ISysConfigService configService; + @Autowired + JdbcTemplate jdbcTemplate; + /** * 根据条件分页查询用户列表 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java b/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java index bec70709c..d12a7b400 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java @@ -1,11 +1,12 @@ package com.ruoyi.system.utils; -import java.util.List; -import org.springframework.stereotype.Component; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.utils.CacheUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysDictData; +import org.springframework.stereotype.Component; + +import java.util.List; /** * 字典工具类