diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 503b05d7..d0fa62ba 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -91,7 +91,6 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/druid/* # ======================================= mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml -mybatis-plus.type-aliases-package=com.adc.da.**.entity # ======================================== # activiti 配置信息 diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml index b2a17634..e0f98a9f 100644 --- a/adc-da-slrs/pom.xml +++ b/adc-da-slrs/pom.xml @@ -11,10 +11,6 @@ adc-da-slrs - - - - com.adc adc-da-base diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java index d875b7ad..7f56cde4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/dao/TsPositionDao.java @@ -19,14 +19,34 @@ import java.util.List; */ public interface TsPositionDao extends BaseMapper { + /** + * 查询岗位绑定的角色ID + * @param positionId:岗位ID + * @return List：角色ID + */ @Select("select role_id from ts_position_role where position_id=#{positionId}") List getRoleId(String positionId); + /** + * 绑定角色 + * @param positionId：岗位ID + * @param roleId：角色ID + */ @Insert("insert into ts_position_role (position_id,role_id) values (#{positionId},#{roleId})") void insertRole(String positionId, String roleId); + /** + * 解绑角色 + * @param positionId：岗位ID + * @param roleId：角色ID + */ @Delete("delete from ts_position_role where position_id=#{positionId} and role_id=#{roleId}") void deleteRole(String positionId, String roleId); + /** + * 查询岗位绑定的角色信息 + * @param positionId：岗位ID + * @return List + */ List getRole(String positionId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java index 44a8e98b..6e815986 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarPosition/service/impl/TsPositionServiceImpl.java @@ -88,6 +88,7 @@ public class TsPositionServiceImpl extends ServiceImpl0){ return Result.error("该岗位已存在"); } + tsPosition.setType("2"); tsPositionDao.insert(tsPosition); return Result.success(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index df2266d9..932f7d8c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -7,6 +7,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.sys.entity.UserEO; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -62,4 +63,10 @@ public class TsRoleController extends BaseController { tsRole.setOperator(userEO.getUname()); return tsRoleService.updateRole(tsRole); } + + @ApiOperation("删除角色") + @DeleteMapping + public ResponseMessage deleteRole(@RequestParam String roleId){ + return tsRoleService.deleteRole(roleId); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index 51bc80e2..762c671d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -2,6 +2,9 @@ package com.adc.da.slrs.sarRole.dao; import com.adc.da.slrs.sarRole.entity.TsRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** *

@@ -13,4 +16,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsRoleDao extends BaseMapper { + /** + * 查询该角色绑定的岗位ID + * @param roleId:角色ID + * @return List:岗位ID + */ + @Select("select position_id from ts_position_role where role_id=#{roleId}") + List getPositionIds(String roleId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index f70d4a22..33e7ed5c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -42,4 +42,11 @@ public interface ITsRoleService extends IService { * @return ResponseMessage */ ResponseMessage updateRole(TsRole tsRole); + + /** + * 删除角色 + * @param roleId：角色Id + * @return ResponseMessage + */ + ResponseMessage deleteRole(String roleId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 052a70e7..a1fdf72a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -109,5 +109,30 @@ public class TsRoleServiceImpl extends ServiceImpl implements return Result.success(); } + /** + * 删除角色 + * @param roleId：角色Id + * @return ResponseMessage + */ + @Override + public ResponseMessage deleteRole(String roleId) { + TsRole tsRole=tsRoleDao.selectById(roleId); + if(tsRole==null){ + return Result.error("该角色不存在"); + } + QueryWrapper childrenRoleQueryWrapper=new QueryWrapper<>(); + childrenRoleQueryWrapper.eq("parent_id",roleId); + List childrenRole=tsRoleDao.selectList(childrenRoleQueryWrapper); + if(childrenRole!=null&&childrenRole.size()>0){ + return Result.error("该角色有下属角色，无法删除"); + } + List positionIds=tsRoleDao.getPositionIds(roleId); + if(positionIds!=null&&positionIds.size()>0){ + return Result.error("该角色已绑定岗位，无法删除"); + } + tsRoleDao.deleteById(roleId); + return Result.success(); + } + } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml index 2c45b160..6188a7bb 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml @@ -1,7 +1,7 @@ - select * from ts_role r left join ts_position_role ps on r.id=ps.role_id