diff --git a/pig-common/src/main/java/com/github/pig/common/vo/LogVo.java b/pig-common/src/main/java/com/github/pig/common/vo/LogVO.java similarity index 86% rename from pig-common/src/main/java/com/github/pig/common/vo/LogVo.java rename to pig-common/src/main/java/com/github/pig/common/vo/LogVO.java index 8264fd49..98401f02 100644 --- a/pig-common/src/main/java/com/github/pig/common/vo/LogVo.java +++ b/pig-common/src/main/java/com/github/pig/common/vo/LogVO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * @date 2017/11/20 */ @Data -public class LogVo implements Serializable { +public class LogVO implements Serializable { private static final long serialVersionUID = 1L; private SysLog sysLog; diff --git a/pig-common/src/main/java/com/github/pig/common/vo/MenuVo.java b/pig-common/src/main/java/com/github/pig/common/vo/MenuVO.java similarity index 96% rename from pig-common/src/main/java/com/github/pig/common/vo/MenuVo.java rename to pig-common/src/main/java/com/github/pig/common/vo/MenuVO.java index b0b565c6..d1c60378 100644 --- a/pig-common/src/main/java/com/github/pig/common/vo/MenuVo.java +++ b/pig-common/src/main/java/com/github/pig/common/vo/MenuVO.java @@ -14,7 +14,7 @@ import java.util.Date; * @since 2017-11-08 */ @Data -public class MenuVo implements Serializable { +public class MenuVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java b/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java index 9b0f09ca..83ef6b81 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java @@ -1,6 +1,6 @@ package com.github.pig.gateway.feign; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import com.github.pig.gateway.feign.fallback.MenuServiceFallbackImpl; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; @@ -21,5 +21,5 @@ public interface MenuService { * @return 菜单列表 */ @GetMapping(value = "/menu/findMenuByRole/{role}") - Set findMenuByRole(@PathVariable("role") String role); + Set findMenuByRole(@PathVariable("role") String role); } diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/feign/fallback/MenuServiceFallbackImpl.java b/pig-gateway/src/main/java/com/github/pig/gateway/feign/fallback/MenuServiceFallbackImpl.java index 14d7e5fb..7652dab5 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/feign/fallback/MenuServiceFallbackImpl.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/feign/fallback/MenuServiceFallbackImpl.java @@ -1,6 +1,6 @@ package com.github.pig.gateway.feign.fallback; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import com.github.pig.gateway.feign.MenuService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,7 +18,7 @@ import java.util.Set; public class MenuServiceFallbackImpl implements MenuService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @Override - public Set findMenuByRole(String role) { + public Set findMenuByRole(String role) { logger.error("调用{}异常{}","findMenuByRole",role); return null; } diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/LogSendServiceImpl.java b/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/LogSendServiceImpl.java index 59521327..76fa4908 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/LogSendServiceImpl.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/LogSendServiceImpl.java @@ -4,7 +4,7 @@ import com.github.pig.common.constant.CommonConstant; import com.github.pig.common.constant.MqQueueConstant; import com.github.pig.common.entity.SysLog; import com.github.pig.common.util.UserUtils; -import com.github.pig.common.vo.LogVo; +import com.github.pig.common.vo.LogVO; import com.github.pig.gateway.service.LogSendService; import com.netflix.zuul.context.RequestContext; import com.xiaoleilu.hutool.http.HttpUtil; @@ -98,7 +98,7 @@ public class LogSendServiceImpl implements LogSendService { } //保存发往MQ(只保存授权) - LogVo logVo = new LogVo(); + LogVO logVo = new LogVO(); logVo.setSysLog(log); if (StringUtils.isNotEmpty(request.getHeader(CommonConstant.REQ_HEADER))) { logVo.setToken(request.getHeader(CommonConstant.REQ_HEADER)); diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/PermissionServiceImpl.java b/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/PermissionServiceImpl.java index 7a0ec60f..53c50ab4 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/PermissionServiceImpl.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/service/impl/PermissionServiceImpl.java @@ -1,7 +1,7 @@ package com.github.pig.gateway.service.impl; import com.baomidou.mybatisplus.toolkit.StringUtils; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import com.github.pig.gateway.feign.MenuService; import com.github.pig.gateway.service.PermissionService; import com.xiaoleilu.hutool.collection.CollectionUtil; @@ -42,12 +42,12 @@ public class PermissionServiceImpl implements PermissionService { return hasPermission; } - Set urls = new HashSet<>(); + Set urls = new HashSet<>(); for (SimpleGrantedAuthority authority : grantedAuthorityList) { urls.addAll(menuService.findMenuByRole(authority.getAuthority())); } - for (MenuVo menu : urls) { + for (MenuVO menu : urls) { if (StringUtils.isNotEmpty(menu.getUrl()) && antPathMatcher.match(menu.getUrl(), request.getRequestURI()) && request.getMethod().equalsIgnoreCase(menu.getMethod())) { hasPermission = true; diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java index dbd703a5..9f5ba803 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java @@ -4,7 +4,7 @@ import com.github.pig.admin.service.SysLogService; import com.github.pig.common.constant.MqQueueConstant; import com.github.pig.common.entity.SysLog; import com.github.pig.common.util.UserUtils; -import com.github.pig.common.vo.LogVo; +import com.github.pig.common.vo.LogVO; import org.slf4j.MDC; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; @@ -24,7 +24,7 @@ public class LogReceiveListener { private SysLogService sysLogService; @RabbitHandler - public void receive(LogVo logVo) { + public void receive(LogVO logVo) { SysLog sysLog = logVo.getSysLog(); String username = UserUtils.getUserName(logVo.getToken()); MDC.put(KEY_USER, username); diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java index 7c9fd1d5..629f6f6d 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java @@ -7,7 +7,7 @@ import com.github.pig.admin.model.entity.SysMenu; import com.github.pig.admin.service.SysMenuService; import com.github.pig.common.constant.CommonConstant; import com.github.pig.common.util.R; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import com.github.pig.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,7 +33,7 @@ public class MenuController extends BaseController { * @return 菜单列表 */ @GetMapping("/findMenuByRole/{role}") - public Set findMenuByRole(@PathVariable String role) { + public Set findMenuByRole(@PathVariable String role) { return sysMenuService.findMenuByRole(role); } @@ -65,9 +65,9 @@ public class MenuController extends BaseController { */ @GetMapping("/userTree") public List userTree() { - Set menus = sysMenuService.findMenuByRole(getRole().get(0)); + Set menus = sysMenuService.findMenuByRole(getRole().get(0)); List menuList = new ArrayList<>(); - for (MenuVo menuVo : menus) { + for (MenuVO menuVo : menus) { menuList.add(menuVo.getMenuId()); } return menuList; @@ -81,9 +81,9 @@ public class MenuController extends BaseController { */ @GetMapping("/roleTree/{roleName}") public List roleTree(@PathVariable String roleName) { - Set menus = sysMenuService.findMenuByRole(roleName); + Set menus = sysMenuService.findMenuByRole(roleName); List menuList = new ArrayList<>(); - for (MenuVo menuVo : menus) { + for (MenuVO menuVo : menus) { menuList.add(menuVo.getMenuId()); } return menuList; diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java index ac3a6da4..033077c5 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java @@ -2,7 +2,7 @@ package com.github.pig.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.github.pig.admin.model.dto.RoleDto; +import com.github.pig.admin.model.dto.RoleDTO; import com.github.pig.admin.model.entity.SysRole; import com.github.pig.admin.service.SysRoleMenuService; import com.github.pig.admin.service.SysRoleService; @@ -46,7 +46,7 @@ public class RoleController extends BaseController { * @return success、false */ @PostMapping - public R role(@RequestBody RoleDto roleDto) { + public R role(@RequestBody RoleDTO roleDto) { return new R<>(sysRoleService.insertRole(roleDto)); } @@ -57,7 +57,7 @@ public class RoleController extends BaseController { * @return success/false */ @PutMapping - public R roleUpdate(@RequestBody RoleDto roleDto) { + public R roleUpdate(@RequestBody RoleDTO roleDto) { return new R<>(sysRoleService.updateRoleById(roleDto)); } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java index 0ae90bcd..dc1ad96b 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java @@ -1,7 +1,7 @@ package com.github.pig.admin.controller; import com.baomidou.mybatisplus.plugins.Page; -import com.github.pig.admin.model.dto.UserDto; +import com.github.pig.admin.model.dto.UserDTO; import com.github.pig.admin.model.dto.UserInfo; import com.github.pig.admin.model.entity.SysUser; import com.github.pig.admin.model.entity.SysUserRole; @@ -89,7 +89,7 @@ public class UserController extends BaseController { * @return success/false */ @PostMapping - public R user(@RequestBody UserDto userDto) { + public R user(@RequestBody UserDTO userDto) { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); sysUser.setDelFlag(CommonConstant.STATUS_NORMAL); @@ -108,7 +108,7 @@ public class UserController extends BaseController { * @return R */ @PutMapping - public R userUpdate(@RequestBody UserDto userDto) { + public R userUpdate(@RequestBody UserDTO userDto) { SysUser user = userService.selectById(userDto.getUserId()); return new R<>(userService.updateUser(userDto, user.getUsername())); } @@ -186,7 +186,7 @@ public class UserController extends BaseController { * @return success/false */ @PutMapping("/editInfo") - public R editInfo(@RequestBody UserDto userDto, UserVo userVo) { + public R editInfo(@RequestBody UserDTO userDto, UserVo userVo) { return new R<>(userService.updateUserInfo(userDto, userVo.getUsername())); } } diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java index 51992710..c83c0df2 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java @@ -2,7 +2,7 @@ package com.github.pig.admin.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.github.pig.admin.model.entity.SysMenu; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import org.apache.ibatis.annotations.Param; import java.util.Set; @@ -23,5 +23,5 @@ public interface SysMenuMapper extends BaseMapper { * @param role 角色名称 * @return 菜单列表 */ - Set findMenuByRoleName(@Param("role") String role); + Set findMenuByRoleName(@Param("role") String role); } \ No newline at end of file diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java index f3b2ec0d..184302ed 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/MenuTree.java @@ -1,6 +1,6 @@ package com.github.pig.admin.model.dto; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import lombok.Data; /** @@ -38,7 +38,7 @@ public class MenuTree extends TreeNode { this.label = name; } - public MenuTree(MenuVo menuVo) { + public MenuTree(MenuVO menuVo) { this.id = menuVo.getMenuId(); this.parentId = menuVo.getParentId(); this.icon = menuVo.getIcon(); diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDTO.java similarity index 89% rename from pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDTO.java index 2ade4f50..486d9955 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDto.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/RoleDTO.java @@ -9,7 +9,7 @@ import lombok.Data; * 角色Dto */ @Data -public class RoleDto extends SysRole { +public class RoleDTO extends SysRole { /** * 角色部门Id */ diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDTO.java similarity index 89% rename from pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDTO.java index c0f50276..ce768a69 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDto.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/model/dto/UserDTO.java @@ -8,7 +8,7 @@ import lombok.Data; * @date 2017/11/5 */ @Data -public class UserDto extends SysUser { +public class UserDTO extends SysUser { /** * 角色ID */ diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java index 8dad8a29..6788b352 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java @@ -4,7 +4,7 @@ package com.github.pig.admin.service; import com.baomidou.mybatisplus.service.IService; import com.github.pig.admin.model.dto.MenuTree; import com.github.pig.admin.model.entity.SysMenu; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import java.util.List; import java.util.Set; @@ -24,7 +24,7 @@ public interface SysMenuService extends IService { * @param role 角色名称 * @return 菜单列表 */ - Set findMenuByRole(String role); + Set findMenuByRole(String role); /** * 通过角色获取菜单权限列表 diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java index b176a657..fbefec42 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java @@ -3,7 +3,7 @@ package com.github.pig.admin.service; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.github.pig.admin.model.dto.RoleDto; +import com.github.pig.admin.model.dto.RoleDTO; import com.github.pig.admin.model.entity.SysRole; import com.github.pig.common.util.Query; @@ -25,7 +25,7 @@ public interface SysRoleService extends IService { * @param roleDto 角色信息 * @return 成功、失败 */ - Boolean insertRole(RoleDto roleDto); + Boolean insertRole(RoleDTO roleDto); /** * 分页查角色列表 @@ -41,7 +41,7 @@ public interface SysRoleService extends IService { * @param roleDto 含有部门信息 * @return 成功、失败 */ - Boolean updateRoleById(RoleDto roleDto); + Boolean updateRoleById(RoleDTO roleDto); /** * 通过部门ID查询角色列表 diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserService.java index e8777475..ac3708cb 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserService.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserService.java @@ -2,7 +2,7 @@ package com.github.pig.admin.service; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.github.pig.admin.model.dto.UserDto; +import com.github.pig.admin.model.dto.UserDTO; import com.github.pig.admin.model.dto.UserInfo; import com.github.pig.admin.model.entity.SysUser; import com.github.pig.common.util.Query; @@ -57,7 +57,7 @@ public interface SysUserService extends IService { * @param username 用户名 * @return Boolean */ - Boolean updateUserInfo(UserDto userDto, String username); + Boolean updateUserInfo(UserDTO userDto, String username); /** * 更新指定用户信息 @@ -65,7 +65,7 @@ public interface SysUserService extends IService { * @param username 用户信息 * @return */ - Boolean updateUser(UserDto userDto, String username); + Boolean updateUser(UserDTO userDto, String username); /** * 通过手机号查询用户信息 diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java index 5652aa73..d3d863d0 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java @@ -9,7 +9,7 @@ import com.github.pig.admin.model.entity.SysMenu; import com.github.pig.admin.service.SysMenuService; import com.github.pig.common.constant.CommonConstant; import com.github.pig.common.util.Assert; -import com.github.pig.common.vo.MenuVo; +import com.github.pig.common.vo.MenuVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; @@ -36,20 +36,20 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override @Cacheable(value = "menu_details", key = "#role + '_menu'") - public Set findMenuByRole(String role) { + public Set findMenuByRole(String role) { return sysMenuMapper.findMenuByRoleName(role); } @Override public String[] findPermission(String[] roles) { - Set menuVoSet = new HashSet<>(); + Set menuVoSet = new HashSet<>(); for (String role : roles) { - Set menuVos = findMenuByRole(role); + Set menuVos = findMenuByRole(role); menuVoSet.addAll(menuVos); } Set permissions = new HashSet<>(); - for (MenuVo menuVo : menuVoSet) { + for (MenuVO menuVo : menuVoSet) { if (StringUtils.isNotEmpty(menuVo.getPermission())) { String permission = menuVo.getPermission(); permissions.add(permission); @@ -92,7 +92,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List findUserMenuTree(String roleName) { // 获取符合条件得菜单 - Set all = findMenuByRole(roleName); + Set all = findMenuByRole(roleName); final List menuTreeList = new ArrayList<>(); all.stream().forEach((menuVo -> { if (CommonConstant.MENU.equals(menuVo.getType())) { diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java index f26f5fed..cf4a8981 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.github.pig.admin.mapper.SysRoleDeptMapper; import com.github.pig.admin.mapper.SysRoleMapper; -import com.github.pig.admin.model.dto.RoleDto; +import com.github.pig.admin.model.dto.RoleDTO; import com.github.pig.admin.model.entity.SysRole; import com.github.pig.admin.model.entity.SysRoleDept; import com.github.pig.admin.service.SysRoleService; @@ -39,7 +39,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 成功、失败 */ @Override - public Boolean insertRole(RoleDto roleDto) { + public Boolean insertRole(RoleDTO roleDto) { SysRole sysRole = new SysRole(); BeanUtils.copyProperties(roleDto, sysRole); sysRoleMapper.insert(sysRole); @@ -71,7 +71,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl */ @Transactional(rollbackFor = Exception.class) @Override - public Boolean updateRoleById(RoleDto roleDto) { + public Boolean updateRoleById(RoleDTO roleDto) { //删除原有的角色部门关系 SysRoleDept condition = new SysRoleDept(); condition.setRoleId(roleDto.getRoleId()); diff --git a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserServiceImpl.java index d44aa155..1877422d 100644 --- a/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserServiceImpl.java +++ b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.github.pig.admin.mapper.SysUserMapper; -import com.github.pig.admin.model.dto.UserDto; +import com.github.pig.admin.model.dto.UserDTO; import com.github.pig.admin.model.dto.UserInfo; import com.github.pig.admin.model.entity.SysDeptRelation; import com.github.pig.admin.model.entity.SysUser; @@ -203,7 +203,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = "user_details", key = "#username") - public Boolean updateUserInfo(UserDto userDto, String username) { + public Boolean updateUserInfo(UserDTO userDto, String username) { UserVo userVo = this.findUserByUsername(username); SysUser sysUser = new SysUser(); @@ -217,7 +217,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override @CacheEvict(value = "user_details", key = "#username") - public Boolean updateUser(UserDto userDto, String username) { + public Boolean updateUser(UserDTO userDto, String username) { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); sysUser.setUpdateTime(new Date()); diff --git a/pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml index 2f79e2f4..e627bfeb 100644 --- a/pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml +++ b/pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml @@ -20,7 +20,7 @@ - + diff --git a/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml index 9bb23518..e20c4471 100644 --- a/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml +++ b/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml @@ -14,7 +14,7 @@ - +