Bläddra i källkod

规则管理,通知管理 删除

wangzhuo 1 år sedan
förälder
incheckning
ceb452471f

+ 7 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GroupingController.java

@@ -73,7 +73,7 @@ public class GroupingController extends BaseController {
      * 删除参数配置
      */
     @DeleteMapping("/{groupingIds}")
-    public AjaxResult remove(@PathVariable Long[] groupingIds) {
+    public AjaxResult remove(@PathVariable Long groupingIds) {
         groupingService.deleteGroupingByIds(groupingIds);
         return success();
     }
@@ -93,4 +93,10 @@ public class GroupingController extends BaseController {
     public AjaxResult addRuleConfiguration(@Validated @RequestBody Rule rule) {
         return toAjax(groupingService.insertRuleConfiguration(rule));
     }
+
+    @DeleteMapping("/ruleConfiguration/{groupingIds}")
+    public AjaxResult removeRuleConfigurationById(@PathVariable Long groupingIds) {
+        groupingService.removeRuleConfigurationById(groupingIds);
+        return success();
+    }
 }

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/GroupingMapper.java

@@ -25,4 +25,8 @@ public interface GroupingMapper {
     int updateRuleConfiguration(Rule rule);
 
     int insertRuleConfiguration(Rule rule);
+
+    void deleteGroupingByIds(Long id);
+
+    void removeRuleConfigurationById(Long id);
 }

+ 3 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/GroupingService.java

@@ -45,11 +45,13 @@ public interface GroupingService {
      *
      * @param configIds 需要删除的参数ID
      */
-    public void deleteGroupingByIds(Long[] configIds);
+    public void deleteGroupingByIds(Long configIds);
 
     List<Rule> listRuleConfiguration(Rule grouping);
 
     int updateRuleConfiguration(Rule grouping);
 
     int insertRuleConfiguration(Rule rule);
+
+    void removeRuleConfigurationById(Long groupingIds);
 }

+ 7 - 5
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GroupingServiceImpl.java

@@ -77,12 +77,9 @@ public class GroupingServiceImpl implements GroupingService {
      * @param configIds 需要删除的参数ID
      */
     @Override
-    public void deleteGroupingByIds(Long[] configIds)
+    public void deleteGroupingByIds(Long id)
     {
-        for (Long configId : configIds)
-        {
-//            groupingMapper.deleteGroupingById(configId);
-        }
+        groupingMapper.deleteGroupingByIds(id);
     }
 
     @Override
@@ -101,4 +98,9 @@ public class GroupingServiceImpl implements GroupingService {
         int row = groupingMapper.insertRuleConfiguration(rule);
         return row;
     }
+
+    @Override
+    public void removeRuleConfigurationById(Long id) {
+        groupingMapper.removeRuleConfigurationById(id);
+    }
 }

+ 6 - 0
ruoyi-system/src/main/resources/mapper/system/GroupingMapper.xml

@@ -56,6 +56,12 @@
         </set>
         where id = #{id}
     </update>
+    <delete id="deleteGroupingByIds">
+        delete from grouping where id = #{id}
+    </delete>
+    <delete id="removeRuleConfigurationById">
+        delete from rule where id = #{id}
+    </delete>
 
 
     <select id="selectGroupingList" resultType="com.ruoyi.system.domain.Grouping">