diff --git a/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java b/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java index 56af6c74..61f0b265 100644 --- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java +++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java @@ -78,9 +78,9 @@ public interface OperateFeignClient { /** * 根据区域id获取计费规则。 * - * @param regionId 运营区id + * @param operationRegionId 运营区id * @return 返回结果 */ @GetMapping("ebikesysrcostset/getRegionFeeConfigById") - JsonResult getRegionFeeConfigById(@RequestParam(name = "regionId") Long regionId); + JsonResult getRegionFeeConfigById(@RequestParam(name = "operationRegionId") Long operationRegionId); } diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/RolePermissionsController.java b/ebike-user/src/main/java/com/cdzy/user/controller/RolePermissionsController.java index d70859ac..715e975e 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/RolePermissionsController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/RolePermissionsController.java @@ -5,11 +5,14 @@ import com.cdzy.common.model.PageParam; import com.cdzy.user.model.entity.RolePermissions; import com.cdzy.user.service.RolePermissionsService; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; import java.util.List; +import static com.cdzy.user.model.entity.table.RolePermissionsTableDef.ROLE_PERMISSIONS; + /** * 角色权限控制层。 * @@ -94,4 +97,19 @@ public class RolePermissionsController { return JsonResult.success(page); } + + /** + * 查询角色下的权限列表 + * + * @param roleId 角色id + * @return + */ + @GetMapping("getRolePermissionsByRoleId/{roleId}") + public JsonResult getRolePermissionsByRoleId(@PathVariable("roleId") Long roleId) { + QueryWrapper queryWrapper = QueryWrapper.create() + .eq(ROLE_PERMISSIONS.ROLE_ID.getName(), roleId); + List list = rolePermissionsService.list(queryWrapper); + return JsonResult.success(list); + } + }