Commit 40d46750 authored by 黎博's avatar 黎博

新增角色-namespace关联接口

parent a9d5369d
package cn.qg.holmes.controller.k8s;
import cn.qg.holmes.common.JsonResult;
import cn.qg.holmes.config.annotation.RequiresPermissions;
import cn.qg.holmes.entity.k8s.DockerProject;
import cn.qg.holmes.service.k8s.DockerProjectService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
......@@ -44,6 +45,7 @@ public class DockerProjectController {
* @param dockerProject docker项目实体类
* @return
*/
@RequiresPermissions("docker:proconfig:add")
@PostMapping("/add")
public JsonResult addDockerProject(@RequestBody DockerProject dockerProject) {
return JsonResult.buildSuccessResult(dockerProjectService.saveOrUpdate(dockerProject));
......@@ -55,6 +57,7 @@ public class DockerProjectController {
* @param dockerProject docker项目实体类
* @return
*/
@RequiresPermissions("docker:proconfig:edit")
@PostMapping("/edit")
public JsonResult editDockerProject(@RequestBody DockerProject dockerProject) {
return JsonResult.buildSuccessResult(dockerProjectService.saveOrUpdate(dockerProject));
......
......@@ -332,4 +332,25 @@ public class K8sController {
@RequestParam String owner) {
return JsonResult.buildSuccessResult(k8sService.createNewNamespace(name, desc, owner));
}
/**
* 根据roleId获取有权限展示按钮的namespace
* @param roleId
* @return
*/
@GetMapping("/role/namespace")
public JsonResult getNamespaceListByRoleId(@RequestParam Integer roleId) {
List<String> nsStrList = new ArrayList<>();
List<Map> nsMapList = new ArrayList<>();
if (roleId == 1 || roleId == 2) {
nsMapList = k8sService.getNamespaceList("all");
}
if (roleId == 3) {
nsMapList = k8sService.getNamespaceList("dev");
}
for (Map map: nsMapList) {
nsStrList.add(map.get("name").toString());
}
return JsonResult.buildSuccessResult(String.join(",", nsStrList));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment