Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,16 @@ public PluginController(final PluginService pluginService) {
*
* @param name plugin name.
* @param enabled plugin enabled.
* @param role plugin role.
* @param currentPage current page.
* @param pageSize page size.
* @return {@linkplain ShenyuAdminResult}
*/
@GetMapping
public ShenyuAdminResult queryPlugins(final String name, final Integer enabled,
public ShenyuAdminResult queryPlugins(final String name, final Integer enabled, final String role,
@NotNull final Integer currentPage,
@NotNull final Integer pageSize) {
CommonPager<PluginVO> commonPager = pluginService.listByPage(new PluginQuery(name, enabled, new PageParameter(currentPage, pageSize)));
CommonPager<PluginVO> commonPager = pluginService.listByPage(new PluginQuery(name, enabled, role, new PageParameter(currentPage, pageSize)));
return ShenyuAdminResult.success(ShenyuResultMessage.QUERY_SUCCESS, commonPager);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ public class PluginQuery implements Serializable {
*/
private String name;

/**
* plugin role.
*/
private String role;

/**
* plugin enabled.
*/
Expand All @@ -53,6 +58,13 @@ public PluginQuery(final String name, final Integer enabled, final PageParameter
this.pageParameter = pageParameter;
}

public PluginQuery(final String name, final Integer enabled, final String role, final PageParameter pageParameter) {
this.name = name;
this.enabled = enabled;
this.role = role;
this.pageParameter = pageParameter;
}

/**
* Gets the value of name.
*
Expand Down Expand Up @@ -89,6 +101,24 @@ public void setEnabled(final Integer enabled) {
this.enabled = enabled;
}

/**
* Gets the value of role.
*
* @return the value of role
*/
public String getRole() {
return role;
}

/**
* Sets the role.
*
* @param role role
*/
public void setRole(final String role) {
this.role = role;
}

/**
* Gets the value of pageParameter.
*
Expand Down
4 changes: 4 additions & 0 deletions shenyu-admin/src/main/resources/mappers/plugin-sqlmap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
<bind name="nameLike" value="('%' + name + '%')"/>
AND name LIKE #{nameLike, jdbcType=VARCHAR}
</if>
<if test="role != null and role != ''">
<bind name="role" value="('%' + role + '%')"/>
AND role LIKE #{role, jdbcType=VARCHAR}
</if>
<if test="enabled != null">
AND enabled = #{enabled, jdbcType=TINYINT}
</if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ public void testQueryPlugins() throws Exception {
this.mockMvc.perform(MockMvcRequestBuilders.get("/plugin-template")
.param("name", "t_n")
.param("enabled", "1")
.param("role", "super")
.param("currentPage", String.valueOf(pageParameter.getCurrentPage()))
.param("pageSize", String.valueOf(pageParameter.getPageSize())))
.andExpect(status().isOk())
Expand Down
Loading