update:develop3
This commit is contained in:
@@ -6,6 +6,8 @@ import com.adc.da.http.ResponseMessage;
|
||||
import com.adc.da.http.Result;
|
||||
import com.adc.da.login.util.UserUtils;
|
||||
import com.adc.da.slrs.sarMenu.entity.SarMenu;
|
||||
import com.adc.da.slrs.sarResource.entity.TsResource;
|
||||
import com.adc.da.slrs.sarResource.service.ITsResourceService;
|
||||
import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
|
||||
import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO;
|
||||
import com.adc.da.slrs.sarRole.service.ITsRoleService;
|
||||
|
||||
@@ -4,6 +4,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Delete;
|
||||
import org.apache.ibatis.annotations.Insert;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
@@ -75,7 +76,7 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
|
||||
* @param resourceId:权限ID
|
||||
*/
|
||||
@Insert("insert into ts_role_resource (role_id,resource_id) values (#{roleId},#{resourceId})")
|
||||
void addResource(String roleId, String resourceId);
|
||||
void addResource(@Param("roleId") String roleId, @Param("resourceId") String resourceId);
|
||||
|
||||
/**
|
||||
* 删除权限
|
||||
@@ -83,7 +84,7 @@ public interface TsRoleDao extends BaseMapper<TsRole> {
|
||||
* @param resourceId:权限ID
|
||||
*/
|
||||
@Delete("delete from ts_role_resource where role_id=#{roleId} and resource_id=#{resourceId}")
|
||||
void delResource(String roleId, String resourceId);
|
||||
void delResource(@Param("roleId") String roleId,@Param("resourceId") String resourceId);
|
||||
|
||||
/**
|
||||
* 通过角色Id列表查询资源Id列表
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.adc.da.slrs.sarMenu.dao.SarMenuDao;
|
||||
import com.adc.da.slrs.sarMenu.entity.SarMenu;
|
||||
import com.adc.da.slrs.sarMenu.service.ISarMenuService;
|
||||
import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService;
|
||||
import com.adc.da.slrs.sarResource.service.ITsResourceService;
|
||||
import com.adc.da.slrs.sarRole.entity.TsRole;
|
||||
import com.adc.da.slrs.sarRole.dao.TsRoleDao;
|
||||
import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO;
|
||||
@@ -42,6 +43,9 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
|
||||
@Autowired
|
||||
@Lazy
|
||||
private ISarUserPersonalMenuService sarUserPersonalMenuService;
|
||||
|
||||
@Autowired
|
||||
private ITsResourceService tsResourceService;
|
||||
/**
|
||||
* 查询所有角色
|
||||
* @return List<TsRole>
|
||||
@@ -105,6 +109,10 @@ public class TsRoleServiceImpl extends ServiceImpl<TsRoleDao, TsRole> implements
|
||||
tsRole.setRoleHierarchy(parentRole.getRoleHierarchy()+1);
|
||||
}
|
||||
tsRoleDao.insert(tsRole);
|
||||
List<String> as=tsResourceService.getDefaultByName();
|
||||
as.forEach(s -> {
|
||||
tsRoleDao.addResource(tsRole.getId(),s);
|
||||
});
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user