[manager] bugfix: fix multiple monitorId and monitorName tags when im… (

#979)
apache · May 25, 2023 · cf32ea8 · cf32ea8
1 parent 64ba484
commit cf32ea8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java b/...src/main/java/org/dromara/hertzbeat/manager/service/impl/AbstractImExportServiceImpl.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.hertzbeat.common.constants.CommonConstants;
 import org.dromara.hertzbeat.common.entity.manager.Monitor;
 import org.dromara.hertzbeat.common.entity.manager.Param;
 import org.dromara.hertzbeat.common.entity.manager.Tag;
@@ -124,7 +125,10 @@ private MonitorDto convert(ExportMonitorDTO exportMonitor) {
         var monitor = new Monitor();
         log.debug("exportMonitor.monitor{}", exportMonitor.monitor);
         BeanUtils.copyProperties(exportMonitor.monitor, monitor);
-        monitor.setTags(tagService.listTag(new HashSet<>(exportMonitor.monitor.tags)));
+        monitor.setTags(tagService.listTag(new HashSet<>(exportMonitor.monitor.tags))
+                .stream().
+                filter(tag -> !(tag.getName().equals(CommonConstants.TAG_MONITOR_ID) || tag.getName().equals(CommonConstants.TAG_MONITOR_NAME)))
+                .collect(Collectors.toList()));
         monitorDto.setMonitor(monitor);
         monitorDto.setMetrics(exportMonitor.metrics);
         monitorDto.setParams(exportMonitor.params.stream()