diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index 8540519..e1f5904 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -64,6 +64,9 @@ public class SysRole extends BaseEntity /** 角色菜单权限 */ private Set permissions; + /** 角色编码 */ + private String roleCode; + public SysRole() { @@ -219,6 +222,14 @@ public class SysRole extends BaseEntity this.permissions = permissions; } + public String getRoleCode() { + return roleCode; + } + + public void setRoleCode(String roleCode) { + this.roleCode = roleCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -236,6 +247,7 @@ public class SysRole extends BaseEntity .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("roleCode", getRoleCode()) .toString(); } } diff --git a/bonus-common/bonus-common-entity/pom.xml b/bonus-common/bonus-common-entity/pom.xml index c5586b7..9e7707d 100644 --- a/bonus-common/bonus-common-entity/pom.xml +++ b/bonus-common/bonus-common-entity/pom.xml @@ -14,6 +14,17 @@ bonus-common-entity + + + + com.bonus + bonus-common-core + + + com.bonus + bonus-common-security + + diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java new file mode 100644 index 0000000..bcf0a55 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java @@ -0,0 +1,16 @@ +package com.bonus.common.entity.app; + +import lombok.Data; + +/** + * @className:AppParamsDto + * @author:cwchen + * @date:2024-07-15-17:11 + * @version:1.0 + * @description:APP前端参数-dto + */ +@Data +public class AppParamsDto { + /** id */ + private String id; +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/AppVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/AppVo.java new file mode 100644 index 0000000..d123c86 --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/vo/AppVo.java @@ -0,0 +1,14 @@ +package com.bonus.common.entity.app.vo; + +import lombok.Data; + +/** + * @className:AppVo + * @author:cwchen + * @date:2024-07-15-17:25 + * @version:1.0 + * @description:App-vo + */ +@Data +public class AppVo { +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java new file mode 100644 index 0000000..9aea3ed --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java @@ -0,0 +1,17 @@ +package com.bonus.common.entity.bracelet; + +import lombok.Data; + +/** + * @className:ParamsDto + * @author:cwchen + * @date:2024-07-15-17:10 + * @version:1.0 + * @description:手环模块前端参数-dto + */ +@Data +public class BraceletParamsDto { + + /** id */ + private String id; +} diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java new file mode 100644 index 0000000..0c8c2cd --- /dev/null +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/ProjectVo.java @@ -0,0 +1,17 @@ +package com.bonus.common.entity.bracelet.vo; + +import lombok.Data; + +/** + * @className:ProjectVo + * @author:cwchen + * @date:2024-07-15-17:24 + * @version:1.0 + * @description:工程管理-vo + */ +@Data +public class ProjectVo { + + /** id */ + private Long id; +} diff --git a/bonus-modules/bonus-bracelet/pom.xml b/bonus-modules/bonus-bracelet/pom.xml index 1199087..181e4b0 100644 --- a/bonus-modules/bonus-bracelet/pom.xml +++ b/bonus-modules/bonus-bracelet/pom.xml @@ -82,6 +82,12 @@ jasypt-spring-boot-starter 3.0.2 + + com.bonus + bonus-common-entity + 24.6.0 + compile + diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ProjectMgeController.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ProjectMgeController.java new file mode 100644 index 0000000..f304f9e --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/controller/ProjectMgeController.java @@ -0,0 +1,32 @@ +package com.bonus.bracelet.controller; + +import com.bonus.bracelet.service.IProjectMgeService; +import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.entity.bracelet.BraceletParamsDto; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @className:ProjectMgeController + * @author:cwchen + * @date:2024-07-15-17:00 + * @version:1.0 + * @description:工程管理-controller + */ +@RestController +@RequestMapping("/project/") +@Slf4j +public class ProjectMgeController { + + @Resource(name = "IProjectMgeService") + private IProjectMgeService service; + + @GetMapping("/getProjectLists") + public AjaxResult getProjectLists(BraceletParamsDto dto) { + return null; + } +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ProjectMgeMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ProjectMgeMapper.java new file mode 100644 index 0000000..81e37f1 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/ProjectMgeMapper.java @@ -0,0 +1,14 @@ +package com.bonus.bracelet.mapper; + +import org.springframework.stereotype.Repository; + +/** + * @className:ProjectMgeMapper + * @author:cwchen + * @date:2024-07-15-17:02 + * @version:1.0 + * @description:工程管理-mapper + */ +@Repository(value = "ProjectMgeMapper") +public interface ProjectMgeMapper { +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IProjectMgeService.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IProjectMgeService.java new file mode 100644 index 0000000..9217147 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/IProjectMgeService.java @@ -0,0 +1,11 @@ +package com.bonus.bracelet.service; + +/** + * @className:IProjectMgeService + * @author:cwchen + * @date:2024-07-15-17:01 + * @version:1.0 + * @description:工程管理-service + */ +public interface IProjectMgeService { +} diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ProjectMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ProjectMgeServiceImpl.java new file mode 100644 index 0000000..822db13 --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ProjectMgeServiceImpl.java @@ -0,0 +1,17 @@ +package com.bonus.bracelet.service.impl; + +import com.bonus.bracelet.service.IProjectMgeService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @className:ProjectMgeServiceImpl + * @author:cwchen + * @date:2024-07-15-17:02 + * @version:1.0 + * @description:工程管理-serviceImpl + */ +@Service(value = "IProjectMgeService") +@Slf4j +public class ProjectMgeServiceImpl implements IProjectMgeService { +} diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ProjectMapper.xml new file mode 100644 index 0000000..6a155ff --- /dev/null +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ProjectMapper.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java index 391bde3..b5e79c4 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java @@ -104,6 +104,8 @@ public class SysRoleController extends BaseController return error("新增角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); + }else if (!roleService.checkRoleCodeUnique(role)) { + return error("新增角色'" + role.getRoleCode() + "'失败，角色编码已存在"); } role.setCreateBy(SecurityUtils.getUsername()); return toAjax(roleService.insertRole(role)); @@ -127,6 +129,8 @@ public class SysRoleController extends BaseController return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在"); } else if (!roleService.checkRoleKeyUnique(role)) { return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); + }else if (!roleService.checkRoleCodeUnique(role)) { + return error("修改角色'" + role.getRoleCode() + "'失败，角色编码已存在"); } role.setUpdateBy(SecurityUtils.getUsername()); return toAjax(roleService.updateRole(role)); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java index dfbfbeb..d921677 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysRoleMapper.java @@ -104,4 +104,13 @@ public interface SysRoleMapper * @return 结果 */ public int deleteRoleByIds(Long[] roleIds); + + /** + * 校验角色编码是否唯一 + * @param roleCode + * @return SysRole + * @author cwchen + * @date 2024/7/15 16:40 + */ + SysRole checkRoleCodeUnique(String roleCode); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java index bba421d..ea05de8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java @@ -170,4 +170,13 @@ public interface ISysRoleService * @return 结果 */ public int insertAuthUsers(Long roleId, Long[] userIds); + + /** + * 校验角色编码是否唯一 + * @param role + * @return boolean + * @author cwchen + * @date 2024/7/15 16:38 + */ + boolean checkRoleCodeUnique(SysRole role); } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java index e01c7f3..1e6cbf8 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java @@ -424,4 +424,17 @@ public class SysRoleServiceImpl implements ISysRoleService } return userRoleMapper.batchUserRole(list); } + + @Override + public boolean checkRoleCodeUnique(SysRole role) { + { + Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); + SysRole info = roleMapper.checkRoleCodeUnique(role.getRoleCode()); + if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) + { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + } } diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml index d12a0d0..410e74e 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -19,11 +19,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, - r.status, r.del_flag, r.create_time, r.remark + r.status, r.del_flag, r.create_time, r.remark ,r.role_code from sys_role r left join sys_user_role ur on ur.role_id = r.role_id left join sys_user u on u.user_id = ur.user_id @@ -92,8 +93,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - - + + + + insert into sys_role( role_id, role_name, @@ -105,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, remark, create_by, + role_code, create_time )values( #{roleId}, @@ -117,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{remark}, #{createBy}, + #{roleCode}, sysdate() ) @@ -133,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status = #{status}, remark = #{remark}, update_by = #{updateBy}, + role_code = #{roleCode}, update_time = sysdate() where role_id = #{roleId} diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 056d4d3..eeeec2d 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,u.login_type,u.team_id,sr.role_code,sr.role_name from sys_user u left join sys_dept d on u.dept_id = d.dept_id LEFT JOIN sys_user_role sur ON u.user_id = sur.user_id - LEFT JOIN sys_role sr ON sur.role_id = sr.role_id AND sr.del_flag = '0' AND sr.status = '0' + LEFT JOIN sys_role sr ON sur.role_id = sr.role_id AND sr.del_flag = '0' where u.del_flag = '0' AND u.user_id = #{userId}