Add query buttons of selectorName and ruleName in PluginList/plugin p…

…age.(apache#1328) (apache#1392)
MarcusJiang1306 · May 6, 2021 · c6f8154 · c6f8154
1 parent bf237db
commit c6f8154
Show file tree

Hide file tree

Showing 19 changed files with 212 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ Release Notes.
 * Add  default values and rule checks in plugin handler. #1112
 * Add resource management to allow user to add plugin, adjust menu and button resource and so on  in  soul-dashboard and soul-admin.  #1034
 * Add menu and data permission in soul-admin. #917
-* Add H2 stroe for soul-admin #918
+* Add H2 store for soul-admin #918
 
 ### soul-bootstrap
 

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/controller/DataPermissionController.java b/soul-admin/src/main/java/org/dromara/soul/admin/controller/DataPermissionController.java
@@ -60,15 +60,17 @@ public DataPermissionController(final DataPermissionService dataPermissionServic
      * @param pageSize page size
      * @param userId user id
      * @param pluginId plugin id
+     * @param name selector name
      * @return {@linkplain SoulAdminResult}
      */
     @GetMapping("/selector")
     public SoulAdminResult listPageSelectorDataPermissions(@RequestParam("currentPage") final Integer currentPage,
                                                            @RequestParam("pageSize") final Integer pageSize,
                                                            @RequestParam("userId") final String userId,
-                                                           @RequestParam("pluginId") final String pluginId) {
+                                                           @RequestParam("pluginId") final String pluginId,
+                                                           @RequestParam(value = "name", required = false) final String name) {
         CommonPager<DataPermissionPageVO> selectorList = dataPermissionService.listSelectorsByPage(
-                new SelectorQuery(pluginId, new PageParameter(currentPage, pageSize)), userId);
+                new SelectorQuery(pluginId, name, new PageParameter(currentPage, pageSize)), userId);
         return SoulAdminResult.success(SoulResultMessage.QUERY_SUCCESS, selectorList);
     }
 
@@ -79,15 +81,17 @@ public SoulAdminResult listPageSelectorDataPermissions(@RequestParam("currentPag
      * @param pageSize page size
      * @param userId  user id
      * @param selectorId selector id
+     * @param name  rule name
      * @return {@linkplain SoulAdminResult}
      */
     @GetMapping("/rules")
     public SoulAdminResult listPageRuleDataPermissions(@RequestParam("currentPage") final Integer currentPage,
                                                          @RequestParam("pageSize") final Integer pageSize,
                                                          @RequestParam("userId") final String userId,
-                                                         @RequestParam("selectorId") final String selectorId) {
+                                                         @RequestParam("selectorId") final String selectorId,
+                                                         @RequestParam(value = "name", required = false) final String name) {
         CommonPager<DataPermissionPageVO> selectorList = dataPermissionService.listRulesByPage(
-                new RuleQuery(selectorId, new PageParameter(currentPage, pageSize)), userId);
+                new RuleQuery(selectorId, name, new PageParameter(currentPage, pageSize)), userId);
         return SoulAdminResult.success(SoulResultMessage.QUERY_SUCCESS, selectorList);
     }
 

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/controller/RuleController.java b/soul-admin/src/main/java/org/dromara/soul/admin/controller/RuleController.java
@@ -58,13 +58,14 @@ public RuleController(final RuleService ruleService) {
      * query rules.
      *
      * @param selectorId  selector id.
+     * @param name        rule name.
      * @param currentPage current page.
      * @param pageSize    page size.
      * @return {@linkplain SoulAdminResult}
      */
     @GetMapping("")
-    public SoulAdminResult queryRules(final String selectorId, final Integer currentPage, final Integer pageSize) {
-        CommonPager<RuleVO> commonPager = ruleService.listByPage(new RuleQuery(selectorId, new PageParameter(currentPage, pageSize)));
+    public SoulAdminResult queryRules(final String selectorId, final String name, final Integer currentPage, final Integer pageSize) {
+        CommonPager<RuleVO> commonPager = ruleService.listByPage(new RuleQuery(selectorId, name, new PageParameter(currentPage, pageSize)));
         return SoulAdminResult.success(SoulResultMessage.QUERY_SUCCESS, commonPager);
 
     }

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/controller/SelectorController.java b/soul-admin/src/main/java/org/dromara/soul/admin/controller/SelectorController.java
@@ -58,15 +58,15 @@ public SelectorController(final SelectorService selectorService) {
      * query Selectors.
      *
      * @param pluginId    plugin id.
+     * @param name        selector name.
      * @param currentPage current page.
      * @param pageSize    page size.
      * @return {@linkplain SoulAdminResult}
      */
     @GetMapping("")
-    public SoulAdminResult querySelectors(final String pluginId, final Integer currentPage, final Integer pageSize) {
-        CommonPager<SelectorVO> commonPager = selectorService.listByPage(new SelectorQuery(pluginId, new PageParameter(currentPage, pageSize)));
+    public SoulAdminResult querySelectors(final String pluginId, final String name, final Integer currentPage, final Integer pageSize) {
+        CommonPager<SelectorVO> commonPager = selectorService.listByPage(new SelectorQuery(pluginId, name, new PageParameter(currentPage, pageSize)));
         return SoulAdminResult.success(SoulResultMessage.QUERY_SUCCESS, commonPager);
-
     }
 
     /**

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/model/query/RuleQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/model/query/RuleQuery.java
@@ -41,6 +41,11 @@ public class RuleQuery extends FilterQuery {
      */
     private String selectorId;
 
+    /**
+     * rule name.
+     */
+    private String name;
+
     /**
      * page parameter.
      */

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/model/query/SelectorQuery.java b/soul-admin/src/main/java/org/dromara/soul/admin/model/query/SelectorQuery.java
@@ -41,6 +41,11 @@ public class SelectorQuery extends FilterQuery {
      */
     private String pluginId;
 
+    /**
+     * selector name.
+     */
+    private String name;
+
     /**
      * page parameter.
      */

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/PluginServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/PluginServiceImpl.java
@@ -150,9 +150,9 @@ public String delete(final List<String> ids) {
             }
             pluginMapper.delete(id);
             deletePluginDataFromResourceAndPermission(pluginDO.getName());
-            final List<SelectorDO> selectorDOList = selectorMapper.selectByQuery(new SelectorQuery(id, null));
+            final List<SelectorDO> selectorDOList = selectorMapper.selectByQuery(new SelectorQuery(id, null, null));
             selectorDOList.forEach(selectorDO -> {
-                final List<RuleDO> ruleDOS = ruleMapper.selectByQuery(new RuleQuery(selectorDO.getId(), null));
+                final List<RuleDO> ruleDOS = ruleMapper.selectByQuery(new RuleQuery(selectorDO.getId(), null, null));
                 ruleDOS.forEach(ruleDO -> {
                     ruleMapper.delete(ruleDO.getId());
                     ruleConditionMapper.deleteByQuery(new RuleConditionQuery(ruleDO.getId()));
@@ -280,9 +280,11 @@ private void insertPluginDataToResource(final PluginDTO pluginDTO) {
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.SELECTOR, AdminPluginOperateEnum.ADD);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.SELECTOR, AdminPluginOperateEnum.DELETE);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.SELECTOR, AdminPluginOperateEnum.EDIT);
+        insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.SELECTOR, AdminPluginOperateEnum.QUERY);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.RULE, AdminPluginOperateEnum.ADD);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.RULE, AdminPluginOperateEnum.DELETE);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.RULE, AdminPluginOperateEnum.EDIT);
+        insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.RULE, AdminPluginOperateEnum.QUERY);
         insertPluginButtonResource(resourceDO.getId(), pluginDTO.getName(), ConfigGroupEnum.PLUGIN, AdminPluginOperateEnum.SYNCHRONIZE);
     }
 

diff --git a/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/SelectorServiceImpl.java b/soul-admin/src/main/java/org/dromara/soul/admin/service/impl/SelectorServiceImpl.java
@@ -199,7 +199,7 @@ public int delete(final List<String> ids) {
                     Collections.singletonList(SelectorDO.transFrom(selectorDO, pluginDO.getName(), null))));
 
             // delete rule and ruleCondition
-            final List<RuleDO> ruleDOList = ruleMapper.selectByQuery(new RuleQuery(id, null));
+            final List<RuleDO> ruleDOList = ruleMapper.selectByQuery(new RuleQuery(id, null, null));
             if (CollectionUtils.isNotEmpty(ruleDOList)) {
                 for (RuleDO ruleDO : ruleDOList) {
                     ruleMapper.delete(ruleDO.getId());