diff --git a/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java b/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java index a901c6370b6dca7969c5f0e00473579a065c2225..bd7668f2d21891c8813caf6df7a43c123ca7119b 100644 --- a/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java +++ b/src/main/java/neatlogic/module/tenant/api/role/RoleSearchApi.java @@ -15,6 +15,7 @@ along with this program. If not, see .*/ package neatlogic.module.tenant.api.role; +import neatlogic.framework.common.config.Config; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.util.PageUtil; import neatlogic.framework.dao.mapper.RoleMapper; @@ -107,6 +108,7 @@ public class RoleSearchApi extends PrivateApiComponentBase { List roleList = roleMapper.searchRole(roleVo); roleService.setRoleTeamCountAndRoleUserCount(roleList); returnObj.put("tbodyList", roleList); + returnObj.put("prefix", Config.HEADER_RULE_PREFIX()); return returnObj; } } diff --git a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java index b4aba7e758c46d9908a1c071b05bdaafe2a7e3bd..2b0700ea7df0a0c012107d26ed37ac06097f9d2f 100755 --- a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java +++ b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSaveApi.java @@ -79,11 +79,12 @@ public class RunnerGroupSaveApi extends PrivateApiComponentBase { @Input({ - @Param(name = "id", type = ApiParamType.LONG, isRequired = false, desc = "id"), - @Param(name = "name", type = ApiParamType.STRING, isRequired = true, desc = "runner 分组名"), - @Param(name = "description", type = ApiParamType.STRING, isRequired = false, desc = "描述"), - @Param(name = "groupNetworkList", type = ApiParamType.JSONARRAY, isRequired = false, desc = "runner组 网段列表"), - @Param(name = "runnerList", type = ApiParamType.JSONARRAY, isRequired = false, desc = "关联的runner列表"), + @Param(name = "id", type = ApiParamType.LONG, desc = "id"), + @Param(name = "name", type = ApiParamType.STRING, isRequired = true, desc = "nmtar.runnergroupsaveapi.input.param.desc.name"), + @Param(name = "rule", type = ApiParamType.STRING, desc = "nmtar.runnergroupsaveapi.input.param.desc.rule"), + @Param(name = "description", type = ApiParamType.STRING, desc = "common.description"), + @Param(name = "groupNetworkList", type = ApiParamType.JSONARRAY, desc = "nmtar.runnergroupsaveapi.input.param.desc.groupnetworklist"), + @Param(name = "runnerList", type = ApiParamType.JSONARRAY, desc = "nmtar.runnergroupsaveapi.input.param.desc.runnerlist"), }) @Output({ }) diff --git a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java index eeefca30b2f7c43b1777a774441b061758f19227..50c928965f165498f4f32e69d62bd96b55d2c12c 100644 --- a/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java +++ b/src/main/java/neatlogic/module/tenant/api/runner/RunnerGroupSearchApi.java @@ -17,6 +17,7 @@ package neatlogic.module.tenant.api.runner; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.common.config.Config; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.dao.mapper.runner.RunnerMapper; import neatlogic.framework.dto.runner.RunnerGroupVo; @@ -72,7 +73,9 @@ public class RunnerGroupSearchApi extends PrivateApiComponentBase { if (rowNum > 0) { runnerGroupVoList = runnerMapper.searchRunnerGroup(groupVo); } - return TableResultUtil.getResult(runnerGroupVoList, groupVo); + JSONObject result = TableResultUtil.getResult(runnerGroupVoList, groupVo); + result.put("prefix", Config.HEADER_RULE_PREFIX()); + return result; }