From 9f2a6ac0d5d17c706e8c58abef81324dc99f5bc0 Mon Sep 17 00:00:00 2001 From: weijing <> Date: Fri, 30 Dec 2022 11:53:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AttrTransformTableService.java | 10 +++--- .../impl/AttrDefinitionCustomServiceImpl.java | 13 +++++++ .../impl/AttrTransformTableServiceImpl.java | 35 ++++++++++++------- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrTransformTableService.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrTransformTableService.java index 5fd5c5aa..41eb1942 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrTransformTableService.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/AttrTransformTableService.java @@ -20,12 +20,14 @@ import java.util.Map; */ public interface AttrTransformTableService extends SkyeyeBusinessService { - void saveAttrTransformTable(String serviceClassName, String parentAttrKey, List attrTransformTableList); + void saveAttrTransformTable(String parentServiceClassName, String parentAttrKey, List attrTransformTableList); - void deleteAttrTransformTable(String serviceClassName, String parentAttrKey); + void deleteAttrTransformTable(String parentServiceClassName, String parentAttrKey); - List queryAttrTransformTable(String serviceClassName, String parentAttrKey); + List queryAttrTransformTable(String parentServiceClassName, String parentAttrKey); - Map> queryAttrTransformTable(String serviceClassName, List parentAttrKey); + Map> queryAttrTransformTable(String parentServiceClassName, List parentAttrKey); + + List queryParentServiceName(String serviceClassName, String attrKey); } diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java index 41b8c0e7..ae4d449d 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrDefinitionCustomServiceImpl.java @@ -4,6 +4,7 @@ package com.skyeye.attr.service.impl; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.skyeye.attr.dao.AttrDefinitionCustomDao; @@ -11,6 +12,7 @@ import com.skyeye.attr.entity.AttrDefinition; import com.skyeye.attr.entity.AttrDefinitionCustom; import com.skyeye.attr.service.AttrDefinitionCustomService; import com.skyeye.attr.service.AttrDefinitionService; +import com.skyeye.attr.service.AttrTransformTableService; import com.skyeye.attr.service.IAttrTransformService; import com.skyeye.base.business.service.impl.SkyeyeBusinessServiceImpl; import com.skyeye.common.constans.CommonNumConstants; @@ -41,11 +43,22 @@ public class AttrDefinitionCustomServiceImpl extends SkyeyeBusinessServiceImpl list = attrTransformTableService.queryParentServiceName(entity.getClassName(), entity.getAttrKey()); + if (CollectionUtil.isNotEmpty(list)) { + list.forEach(str -> { + jedisClientService.delKeys(iAttrTransformService.getCacheKey(str, "*")); + }); + } } @Override diff --git a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrTransformTableServiceImpl.java b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrTransformTableServiceImpl.java index c3d8c09e..4b1b3569 100644 --- a/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrTransformTableServiceImpl.java +++ b/skyeye-promote/skyeye-common/src/main/java/com/skyeye/attr/service/impl/AttrTransformTableServiceImpl.java @@ -39,15 +39,15 @@ public class AttrTransformTableServiceImpl extends SkyeyeBusinessServiceImpl attrTransformTableList) { - deleteAttrTransformTable(serviceClassName, parentAttrKey); + public void saveAttrTransformTable(String parentServiceClassName, String parentAttrKey, List attrTransformTableList) { + deleteAttrTransformTable(parentServiceClassName, parentAttrKey); attrTransformTableList.forEach(attrTransformTable -> { - attrTransformTable.setParentClassName(serviceClassName); + attrTransformTable.setParentClassName(parentServiceClassName); attrTransformTable.setParentAttrKey(parentAttrKey); }); String userId = InputObject.getLogParamsStatic().get("id").toString(); @@ -57,13 +57,13 @@ public class AttrTransformTableServiceImpl extends SkyeyeBusinessServiceImpl queryWrapper = new QueryWrapper(); - queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), serviceClassName); + queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), parentServiceClassName); queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentAttrKey), parentAttrKey); remove(queryWrapper); } @@ -71,14 +71,14 @@ public class AttrTransformTableServiceImpl extends SkyeyeBusinessServiceImpl queryAttrTransformTable(String serviceClassName, String parentAttrKey) { + public List queryAttrTransformTable(String parentServiceClassName, String parentAttrKey) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc(MybatisPlusUtil.toColumns(AttrTransformTable::getOrderBy)); - queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), serviceClassName); + queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), parentServiceClassName); queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentAttrKey), parentAttrKey); return list(queryWrapper); } @@ -86,14 +86,14 @@ public class AttrTransformTableServiceImpl extends SkyeyeBusinessServiceImpl> queryAttrTransformTable(String serviceClassName, List parentAttrKey) { + public Map> queryAttrTransformTable(String parentServiceClassName, List parentAttrKey) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.orderByAsc(MybatisPlusUtil.toColumns(AttrTransformTable::getOrderBy)); - queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), serviceClassName); + queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getParentClassName), parentServiceClassName); queryWrapper.in(MybatisPlusUtil.toColumns(AttrTransformTable::getParentAttrKey), parentAttrKey); List attrTransformTableList = list(queryWrapper); if (CollectionUtil.isEmpty(attrTransformTableList)) { @@ -114,4 +114,13 @@ public class AttrTransformTableServiceImpl extends SkyeyeBusinessServiceImpl queryParentServiceName(String serviceClassName, String attrKey) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getClassName), serviceClassName); + queryWrapper.eq(MybatisPlusUtil.toColumns(AttrTransformTable::getAttrKey), attrKey); + List attrTransformTableList = list(queryWrapper); + return attrTransformTableList.stream().map(AttrTransformTable::getParentClassName).distinct().collect(Collectors.toList()); + } + }