diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index fb61b522e..c07761514 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -116,29 +116,11 @@ public class DimensionServiceImpl extends ServiceImpl a, (k1, k2) -> k1)); List dimensionToInsert = Lists.newArrayList(); - List dimensionToUpdate = Lists.newArrayList(); - List dimensionToDelete = Lists.newArrayList(); // look for which dimension need to insert, update, delete - dimensionReqs.stream().forEach(dimension -> { + dimensionReqs.forEach(dimension -> { if (!bizNameMap.containsKey(dimension.getBizName())) { dimensionToInsert.add(dimension); - } else { - DimensionResp dimensionRespByBizName = bizNameMap.get(dimension.getBizName()); - if (null != dimensionRespByBizName && isChange(dimension, dimensionRespByBizName)) { - dimension.setId(dimensionRespByBizName.getId()); - dimension.updatedBy(user.getName()); - dimensionToUpdate.add(dimension); - } - } - }); - - // the bizNames from alter dimensions - List bizNames = - dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList()); - bizNameMap.keySet().forEach(bizNameInDb -> { - if (!bizNames.contains(bizNameInDb)) { - dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId()); } }); @@ -147,16 +129,6 @@ public class DimensionServiceImpl extends ServiceImpl .collect(Collectors.toMap(MetricResp::getBizName, a -> a, (k1, k2) -> k1)); List metricToInsert = Lists.newArrayList(); - List metricToUpdate = Lists.newArrayList(); - List metricToDelete = Lists.newArrayList(); - - metricReqs.stream().forEach(metric -> { + metricReqs.forEach(metric -> { if (!bizNameMap.containsKey(metric.getBizName())) { metricToInsert.add(metric); - } else { - MetricResp metricRespByBizName = bizNameMap.get(metric.getBizName()); - if (null != metricRespByBizName && isChange(metric, metricRespByBizName)) { - metric.setId(metricRespByBizName.getId()); - metric.updatedBy(user.getName()); - metricToUpdate.add(metric); - } - } - }); - - // the bizNames from alter dimensions - List bizNames = - metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList()); - bizNameMap.keySet().forEach(bizNameInDb -> { - if (!bizNames.contains(bizNameInDb)) { - metricToDelete.add(bizNameMap.get(bizNameInDb).getId()); } }); @@ -187,16 +168,6 @@ public class MetricServiceImpl extends ServiceImpl createMetricBatch(metricToInsert, user); } - // update - if (!CollectionUtils.isEmpty(metricToUpdate)) { - updateMetricBatch(metricToUpdate, user); - } - - // delete - if (!CollectionUtils.isEmpty(metricToDelete)) { - deleteMetricBatch(metricToDelete, user); - } - } @Override