diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java index 3c83a67450..018efca7a9 100644 --- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java +++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-backend/src/main/java/io/dataease/plugins/view/official/handler/SymbolMapRSHandler.java @@ -11,10 +11,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; import javax.annotation.PostConstruct; @@ -124,7 +122,7 @@ public class SymbolMapRSHandler implements PluginViewRSHandler { ChartQuotaDTO chartQuotaDTO = new ChartQuotaDTO(); chartQuotaDTO.setId(curY.getId()); axisChartDataDTO.getQuotaList().add(chartQuotaDTO); - axisChartDataDTO.getProperties().put(curY.getName(), row[i + step]); + axisChartDataDTO.getProperties().put(curY.getName(), formatLabel(curY, row[i + step])); axisChartDataDTO.setLongitude(dimensionList.get(0).getValue()); axisChartDataDTO.setLatitude(dimensionList.get(1).getValue()); if (StringUtils.equals(curY.getTypeField(), "yAxis") && !valueFilled) { @@ -139,4 +137,13 @@ public class SymbolMapRSHandler implements PluginViewRSHandler { map.put("data", datalist); return map; } + + private String formatLabel(PluginViewField field, String val) { + if (StringUtils.isBlank(val)) return val; + String typeField = field.getTypeField(); + if (StringUtils.isNotBlank(typeField) && trans2Ykeys.contains(typeField)) { + return Arrays.stream(val.split(",")).distinct().collect(Collectors.joining(",")); + } + return val; + } }