diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..139cd45 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,18 @@ + + + + + mysql.8 + true + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://106.15.251.123:3305/guigu-oa?serverTimezone=GMT + + + + + + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml deleted file mode 100644 index 0ebb202..0000000 --- a/.idea/deployment.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/common/service-util/src/main/java/com/atguigu/CodeGet.java b/common/service-util/src/main/java/com/atguigu/CodeGet.java index af6fbca..ac05953 100644 --- a/common/service-util/src/main/java/com/atguigu/CodeGet.java +++ b/common/service-util/src/main/java/com/atguigu/CodeGet.java @@ -18,8 +18,7 @@ public class CodeGet { // 全局配置 GlobalConfig gc = new GlobalConfig(); // TODO 需要修改路径名称 - gc.setOutputDir("G:\\java项目\\guigu-oa\\guigu-oa-parent\\service-oa" + "/src/main/java"); - + gc.setOutputDir("G:\\java项目\\guigu-oa\\guigu-oa\\service-oa" + "/src/main/java"); gc.setServiceName("%sService"); // 去掉Service接口的首字母I gc.setAuthor("bunny"); gc.setOpen(false); @@ -56,7 +55,7 @@ public class CodeGet { private static StrategyConfig getStrategyConfig() { StrategyConfig strategy = new StrategyConfig(); // TODO 要生成的表 - strategy.setInclude("sys_user", "sys_role"); + strategy.setInclude("sys_user", "sys_role","sys_user_role"); strategy.setNaming(NamingStrategy.underline_to_camel);// 数据库表映射到实体的命名策略 strategy.setColumnNaming(NamingStrategy.underline_to_camel);// 数据库表字段映射到实体的命名策略 strategy.setEntityLombokModel(true); // lombok 模型 @Accessors(chain = true) setter链式操作 diff --git a/common/service-util/target/classes/com/atguigu/CodeGet.class b/common/service-util/target/classes/com/atguigu/CodeGet.class index 8d71498..49d78bb 100644 Binary files a/common/service-util/target/classes/com/atguigu/CodeGet.class and b/common/service-util/target/classes/com/atguigu/CodeGet.class differ diff --git a/model/src/main/java/com/atguigu/model/system/RoleByUser.java b/model/src/main/java/com/atguigu/model/system/RoleByUser.java new file mode 100644 index 0000000..2cf5ed4 --- /dev/null +++ b/model/src/main/java/com/atguigu/model/system/RoleByUser.java @@ -0,0 +1,17 @@ +package com.atguigu.model.system; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RoleByUser { + private List assginRoleList; + private List allRolesList; +} diff --git a/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java b/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java index 1916d5a..1c73c38 100644 --- a/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java +++ b/service-oa/src/main/java/com/atguigu/auth/controller/SysRoleController.java @@ -2,7 +2,9 @@ package com.atguigu.auth.controller; import com.atguigu.auth.service.SysRoleService; import com.atguigu.common.result.Result; +import com.atguigu.model.system.RoleByUser; import com.atguigu.model.system.SysRole; +import com.atguigu.vo.system.AssginRoleVo; import com.atguigu.vo.system.SysRoleQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.ApiOperation; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; @Tag(name = "角色管理接口") @RestController @@ -62,4 +65,18 @@ public class SysRoleController { sysRoleService.removeByIds(idList); return Result.success(); } + + @ApiOperation(value = "根据用户获取角色数据") + @GetMapping("/toAssign/{userId}") + public Result toAssign(@PathVariable Long userId) { + RoleByUser roleMap = sysRoleService.findRoleByAdminId(userId); + return Result.success(roleMap); + } + + @ApiOperation(value = "根据用户分配角色") + @PostMapping("/doAssign") + public Result doAssign(@RequestBody AssginRoleVo assginRoleVo) { + sysRoleService.doAssign(assginRoleVo); + return Result.success(); + } } diff --git a/service-oa/src/main/resources/mapper/SysRoleController.java b/service-oa/src/main/java/com/atguigu/auth/controller/SysUserRoleController.java similarity index 53% rename from service-oa/src/main/resources/mapper/SysRoleController.java rename to service-oa/src/main/java/com/atguigu/auth/controller/SysUserRoleController.java index d985b90..58eba16 100644 --- a/service-oa/src/main/resources/mapper/SysRoleController.java +++ b/service-oa/src/main/java/com/atguigu/auth/controller/SysUserRoleController.java @@ -1,20 +1,21 @@ -package mapper; +package com.atguigu.auth.controller; import org.springframework.web.bind.annotation.RequestMapping; + import org.springframework.web.bind.annotation.RestController; /** *

- * 角色 前端控制器 + * 用户角色 前端控制器 *

* * @author bunny - * @since 2024-04-22 + * @since 2024-04-23 */ @RestController -@RequestMapping("/order/sys-role") -public class SysRoleController { +@RequestMapping("/auth/sys-user-role") +public class SysUserRoleController { } diff --git a/service-oa/src/main/java/com/atguigu/auth/mapper/SysRoleMapper.java b/service-oa/src/main/java/com/atguigu/auth/mapper/SysRoleMapper.java index 8592f4c..7922b5f 100644 --- a/service-oa/src/main/java/com/atguigu/auth/mapper/SysRoleMapper.java +++ b/service-oa/src/main/java/com/atguigu/auth/mapper/SysRoleMapper.java @@ -2,6 +2,17 @@ package com.atguigu.auth.mapper; import com.atguigu.model.system.SysRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import java.util.List; + +@Mapper public interface SysRoleMapper extends BaseMapper { + /** + * 根据用户id查询所有的角色 + * + * @param userId 用户id + * @return 角色列表 + */ + List selectByUserId(Long userId); } diff --git a/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserRoleMapper.java b/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserRoleMapper.java new file mode 100644 index 0000000..5b8580b --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/auth/mapper/SysUserRoleMapper.java @@ -0,0 +1,18 @@ +package com.atguigu.auth.mapper; + +import com.atguigu.model.system.SysUserRole; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** + *

+ * 用户角色 Mapper 接口 + *

+ * + * @author bunny + * @since 2024-04-23 + */ +@Mapper +public interface SysUserRoleMapper extends BaseMapper { + +} diff --git a/service-oa/src/main/java/com/atguigu/auth/service/SysRoleService.java b/service-oa/src/main/java/com/atguigu/auth/service/SysRoleService.java index e4aa5a0..a2a81c0 100644 --- a/service-oa/src/main/java/com/atguigu/auth/service/SysRoleService.java +++ b/service-oa/src/main/java/com/atguigu/auth/service/SysRoleService.java @@ -1,6 +1,8 @@ package com.atguigu.auth.service; +import com.atguigu.model.system.RoleByUser; import com.atguigu.model.system.SysRole; +import com.atguigu.vo.system.AssginRoleVo; import com.atguigu.vo.system.SysRoleQueryVo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,5 +17,19 @@ public interface SysRoleService extends IService { * @return 分页结果 */ IPage pageResult(Long page, Long limit, SysRoleQueryVo vo); + + /** + * 根据用户获取角色数据 + * + * @param userId 用户id + * @return 用户角色集合 + */ + RoleByUser findRoleByAdminId(Long userId); + + /** + * 根据用户分配角色 + * @param vo 分配条件 + */ + void doAssign(AssginRoleVo vo); } diff --git a/service-oa/src/main/java/com/atguigu/auth/service/SysUserRoleService.java b/service-oa/src/main/java/com/atguigu/auth/service/SysUserRoleService.java new file mode 100644 index 0000000..23f020d --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/auth/service/SysUserRoleService.java @@ -0,0 +1,16 @@ +package com.atguigu.auth.service; + +import com.atguigu.model.system.SysUserRole; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + *

+ * 用户角色 服务类 + *

+ * + * @author bunny + * @since 2024-04-23 + */ +public interface SysUserRoleService extends IService { + +} diff --git a/service-oa/src/main/java/com/atguigu/auth/service/impl/SysRoleServiceImpl.java b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysRoleServiceImpl.java index a462fd8..687bd06 100644 --- a/service-oa/src/main/java/com/atguigu/auth/service/impl/SysRoleServiceImpl.java +++ b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysRoleServiceImpl.java @@ -1,18 +1,28 @@ package com.atguigu.auth.service.impl; + import com.atguigu.auth.mapper.SysRoleMapper; +import com.atguigu.auth.mapper.SysUserRoleMapper; import com.atguigu.auth.service.SysRoleService; +import com.atguigu.model.system.RoleByUser; import com.atguigu.model.system.SysRole; +import com.atguigu.vo.system.AssginRoleVo; import com.atguigu.vo.system.SysRoleQueryVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import java.util.List; + @Service public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { + @Autowired + private SysUserRoleMapper sysUserRoleMapper; + /** * 角色条件分页查询 * @@ -31,4 +41,30 @@ public class SysRoleServiceImpl extends ServiceImpl impl return page(pageParam, wrapper); } + + /** + * 根据用户获取角色数据 + * + * @param userId 用户id + * @return 用户角色集合 + */ + @Override + public RoleByUser findRoleByAdminId(Long userId) { + // 查询所有角色 + List allRolesList = list(); + + // 根据用户id查询所有的角色 + List assginRoleList = baseMapper.selectByUserId(userId); + return RoleByUser.builder().allRolesList(allRolesList).assginRoleList(assginRoleList).build(); + } + + /** + * 根据用户分配角色 + * + * @param vo 分配条件 + */ + @Override + public void doAssign(AssginRoleVo vo) { + + } } diff --git a/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserRoleServiceImpl.java b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserRoleServiceImpl.java new file mode 100644 index 0000000..56ed2ed --- /dev/null +++ b/service-oa/src/main/java/com/atguigu/auth/service/impl/SysUserRoleServiceImpl.java @@ -0,0 +1,20 @@ +package com.atguigu.auth.service.impl; + +import com.atguigu.auth.mapper.SysUserRoleMapper; +import com.atguigu.auth.service.SysUserRoleService; +import com.atguigu.model.system.SysUserRole; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + *

+ * 用户角色 服务实现类 + *

+ * + * @author bunny + * @since 2024-04-23 + */ +@Service +public class SysUserRoleServiceImpl extends ServiceImpl implements SysUserRoleService { + +} diff --git a/service-oa/src/main/resources/mapper/SysRoleMapper.xml b/service-oa/src/main/resources/mapper/SysRoleMapper.xml new file mode 100644 index 0000000..1e21dca --- /dev/null +++ b/service-oa/src/main/resources/mapper/SysRoleMapper.xml @@ -0,0 +1,10 @@ + + + + + + diff --git a/service-oa/src/main/resources/mapper/SysUserController.java b/service-oa/src/main/resources/mapper/SysUserController.java deleted file mode 100644 index b095421..0000000 --- a/service-oa/src/main/resources/mapper/SysUserController.java +++ /dev/null @@ -1,20 +0,0 @@ -package mapper; - - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 用户表 前端控制器 - *

- * - * @author bunny - * @since 2024-04-22 - */ -@RestController -@RequestMapping("/order/sys-user") -public class SysUserController { - -} - diff --git a/service-oa/src/main/resources/mapper/SysUserMapper.xml b/service-oa/src/main/resources/mapper/SysUserMapper.xml new file mode 100644 index 0000000..1a578b2 --- /dev/null +++ b/service-oa/src/main/resources/mapper/SysUserMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/service-oa/src/main/resources/mapper/SysUserRoleMapper.xml b/service-oa/src/main/resources/mapper/SysUserRoleMapper.xml new file mode 100644 index 0000000..ec00f84 --- /dev/null +++ b/service-oa/src/main/resources/mapper/SysUserRoleMapper.xml @@ -0,0 +1,5 @@ + + + + +