From b3f16d2c8f7b111ae0229386269dfc355d66a5db Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Thu, 16 Oct 2025 19:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8D=A2=E6=9C=BA=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E7=AD=96=E7=95=A5bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java | 2 +- .../com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java | 2 +- .../rocketmq/service/impl/RmMonitorPolicyServiceImpl.java | 8 ++++---- .../resources/mapper/rocketmq/RmTemplateLinuxMapper.xml | 2 +- .../resources/mapper/rocketmq/RmTemplateSwitchMapper.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java index 6804a02..7b04c40 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateLinuxMapper.java @@ -52,7 +52,7 @@ public interface RmTemplateLinuxMapper * @return 结果 */ public int deleteRmTemplateLinuxById(Long id); - public int deleteRmTemplateLinuxByPolicyId(Long policyId); + public int deleteByPolicyId(Long policyId); /** * 批量删除Linux系统监控项 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java index 632e90f..bd1bcdf 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmTemplateSwitchMapper.java @@ -52,7 +52,7 @@ public interface RmTemplateSwitchMapper * @return 结果 */ public int deleteRmTemplateSwitchById(Long id); - public int deleteRmTemplateSwitchByPolicyId(Long policyId); + public int deleteByPolicyId(Long policyId); /** * 批量删除交换机监控模板 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java index 6d455d0..3a1b7e9 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmMonitorPolicyServiceImpl.java @@ -184,8 +184,8 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService rmTemplateLinuxMapper.updateByTemplateId(templateId); rmTemplateSwitchMapper.updateByTemplateId(templateId); if(rmMonitorPolicy.getTemplateId()==null){ - rmTemplateLinuxMapper.deleteRmTemplateLinuxByPolicyId(id); - rmTemplateSwitchMapper.deleteRmTemplateSwitchByPolicyId(id); + rmTemplateLinuxMapper.deleteByPolicyId(id); + rmTemplateSwitchMapper.deleteByPolicyId(id); } } return rmMonitorPolicyMapper.deleteRmMonitorPolicyByIds(ids); @@ -306,7 +306,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService if(!collectionAndIdList.isEmpty()){ if("linux".equals(rmMonitorPolicy.getResourceType())){ // 修改之前先删除 - rmTemplateLinuxMapper.deleteRmTemplateLinuxByPolicyId(rmMonitorPolicy.getId()); + rmTemplateLinuxMapper.deleteByPolicyId(rmMonitorPolicy.getId()); for (RmMonitorPolicyVo rmMonitorPolicyVo : collectionAndIdList) { RmInitialMonitorItem monitorItems = rmInitialMonitorItemMapper.selectRmInitialMonitorItemById(rmMonitorPolicyVo.getId()); RmTemplateLinux linuxItem = new RmTemplateLinux(); @@ -320,7 +320,7 @@ public class RmMonitorPolicyServiceImpl implements IRmMonitorPolicyService } }else if("switch".equals(rmMonitorPolicy.getResourceType())){ // 修改之前先置空所有采集周期 - rmTemplateSwitchMapper.deleteRmTemplateSwitchByPolicyId(rmMonitorPolicy.getId()); + rmTemplateSwitchMapper.deleteByPolicyId(rmMonitorPolicy.getId()); for (RmMonitorPolicyVo rmMonitorPolicyVo : collectionAndIdList) { // 添加采集周期 RmInitialMonitorItem monitorItems = rmInitialMonitorItemMapper.selectRmInitialMonitorItemById(rmMonitorPolicyVo.getId()); diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml index 05d9a0c..af0dbe4 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateLinuxMapper.xml @@ -134,7 +134,7 @@ update rm_template_linux set collection_cycle = null where template_id = #{templateId} - + delete from rm_template_linux where policy_id = #{policyId} diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml index 7559c78..0385bc0 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmTemplateSwitchMapper.xml @@ -165,7 +165,7 @@ update rm_template_switch set collection_cycle = null where template_id = #{templateId} - + delete from rm_template_switch where policy_id = #{policyId}