From 56336fadbd59257a5f526f6240de5d4b2fbde2ef Mon Sep 17 00:00:00 2001 From: zmyYYDS <864398951@qq.com> Date: Thu, 21 Dec 2023 14:56:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E4=B8=80=E7=89=883.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- srt-cloud-data-governance/pom.xml | 5 +++++ .../srt/controller/MetamodelController.java | 14 +++++++++++++ .../net/srt/convert/MetamodelConvert.java | 3 ++- .../net/srt/convert/QualityRuleConvert.java | 2 +- .../net/srt/service/MetamodelService.java | 4 ++++ .../service/impl/MetamodelServiceImpl.java | 20 +++++++++++++++++++ .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- 14 files changed, 54 insertions(+), 10 deletions(-) diff --git a/srt-cloud-data-governance/pom.xml b/srt-cloud-data-governance/pom.xml index 21c482a..974b825 100644 --- a/srt-cloud-data-governance/pom.xml +++ b/srt-cloud-data-governance/pom.xml @@ -32,6 +32,11 @@ mapstruct-processor 1.5.0.Beta1 + + org.mapstruct + mapstruct-jdk8 + 1.5.0.Beta1 + org.springframework.boot diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java index 3fc145a..2ed2a7f 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java @@ -42,4 +42,18 @@ public class MetamodelController { metamodelService.save(vo); return Result.ok(); } + + @PutMapping + @Operation(summary = "修改") + public Result update(@RequestBody MetamodelVO vo){ + metamodelService.update(vo); + return Result.ok(); + } + + @DeleteMapping("/{id}") + @Operation(summary = "删除") + public Result delete(@PathVariable Long id){ + metamodelService.delete(id); + return Result.ok(); + } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java index 7360eb4..87e1f5f 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java @@ -2,11 +2,12 @@ package net.srt.convert; import net.srt.entity.MetamodelEntity; import net.srt.vo.MetamodelVO; +import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import org.springframework.stereotype.Component; import java.util.List; -@Component +@Mapper public interface MetamodelConvert { MetamodelConvert INSTANCE = Mappers.getMapper(MetamodelConvert.class); diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java index 91111b2..83bc7f9 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java @@ -14,7 +14,7 @@ import java.util.List; * @Author: jpz * @CreateTime: 2023/12/20 19:50 */ -@Component +@Mapper public interface QualityRuleConvert { QualityRuleConvert INSTANCE = Mappers.getMapper(QualityRuleConvert.class); diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java index f33d1d6..1d50845 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java @@ -11,4 +11,8 @@ public interface MetamodelService extends BaseService { List listTree(); void save(MetamodelVO vo); + + void update(MetamodelVO vo); + + void delete(Long id); } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java index 9ddb155..93f13d8 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import net.srt.convert.MetamodelConvert; import net.srt.dao.MetamodelDao; import net.srt.entity.MetamodelEntity; +import net.srt.framework.common.exception.ServerException; import net.srt.framework.common.utils.BeanUtil; import net.srt.framework.common.utils.BuildTreeUtils; import net.srt.framework.common.utils.TreeNodeVo; @@ -46,6 +47,25 @@ public class MetamodelServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MetamodelEntity::getParentId,id).last("limit 1"); + if(baseMapper.selectOne(wrapper)!=null){ + throw new ServerException("存在子节点，不可删除！"); + } + } + private void buildField(MetamodelEntity entity) { if(entity.getIfLeaf() == 0){ entity.setIcon("/src/assets/model.png"); diff --git a/srt-cloud-data-governance/src/main/resources/bootstrap.yml b/srt-cloud-data-governance/src/main/resources/bootstrap.yml index 13ac274..97a4fb9 100644 --- a/srt-cloud-data-governance/src/main/resources/bootstrap.yml +++ b/srt-cloud-data-governance/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-data-integrate/src/main/resources/bootstrap.yml b/srt-cloud-data-integrate/src/main/resources/bootstrap.yml index edd03e2..a0f7c10 100644 --- a/srt-cloud-data-integrate/src/main/resources/bootstrap.yml +++ b/srt-cloud-data-integrate/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-gateway/src/main/resources/bootstrap.yml b/srt-cloud-gateway/src/main/resources/bootstrap.yml index 25859c0..79d8278 100644 --- a/srt-cloud-gateway/src/main/resources/bootstrap.yml +++ b/srt-cloud-gateway/src/main/resources/bootstrap.yml @@ -95,7 +95,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 diff --git a/srt-cloud-module/srt-cloud-datax-service/src/main/resources/bootstrap.yml b/srt-cloud-module/srt-cloud-datax-service/src/main/resources/bootstrap.yml index 4d5aac0..3d3ff59 100644 --- a/srt-cloud-module/srt-cloud-datax-service/src/main/resources/bootstrap.yml +++ b/srt-cloud-module/srt-cloud-datax-service/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml b/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml index 3a1e9f5..b80012b 100644 --- a/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml +++ b/srt-cloud-module/srt-cloud-datax/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-module/srt-cloud-message/src/main/resources/bootstrap.yml b/srt-cloud-module/srt-cloud-message/src/main/resources/bootstrap.yml index af0321c..bea8430 100644 --- a/srt-cloud-module/srt-cloud-message/src/main/resources/bootstrap.yml +++ b/srt-cloud-module/srt-cloud-message/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-module/srt-cloud-quartz/src/main/resources/bootstrap.yml b/srt-cloud-module/srt-cloud-quartz/src/main/resources/bootstrap.yml index 7de59f1..24f7217 100644 --- a/srt-cloud-module/srt-cloud-quartz/src/main/resources/bootstrap.yml +++ b/srt-cloud-module/srt-cloud-quartz/src/main/resources/bootstrap.yml @@ -11,7 +11,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: diff --git a/srt-cloud-system/src/main/resources/bootstrap.yml b/srt-cloud-system/src/main/resources/bootstrap.yml index aeb7ad8..b6d5c86 100644 --- a/srt-cloud-system/src/main/resources/bootstrap.yml +++ b/srt-cloud-system/src/main/resources/bootstrap.yml @@ -14,7 +14,7 @@ spring: discovery: server-addr: 101.34.77.101:8848 # 命名空间，默认：public - namespace: 7e1e997d-5fa4-4f84-9f48-3e0adf830a37 + namespace: 7e34f104-f333-4828-b36a-02146e521c9a service: ${spring.application.name} group: srt2.0 config: