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/GovernanceApplication.java b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java index 8fda7dc..5ac636d 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java @@ -11,9 +11,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients; * @Author : FJJ * @Date: 2023-12-20 11:16 */ +@EnableFeignClients @EnableDiscoveryClient @SpringBootApplication - public class GovernanceApplication { public static void main(String[] args) { SpringApplication.run(GovernanceApplication.class, args); diff --git a/srt-cloud-data-governance/src/main/java/net/srt/QualittRule.java b/srt-cloud-data-governance/src/main/java/net/srt/QualittRule.java deleted file mode 100644 index f20c536..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/QualittRule.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.srt; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; - -/** - * @BelongsProject: Default (Template) Project - * @BelongsPackage: net.srt - * @Author: jpz - * @CreateTime: 2023/12/19 22:05 - */ -@EnableFeignClients -@EnableDiscoveryClient -@SpringBootApplication -@EnableScheduling -@EnableAsync -public class QualittRule { - public static void main(String[] args) { - SpringApplication.run(QualittRule.class); - } -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java new file mode 100644 index 0000000..8dfe1e7 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java @@ -0,0 +1,64 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import lombok.AllArgsConstructor; +import net.srt.convert.DatastandardConvert; +import net.srt.entity.DatastandardEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import net.srt.query.StandardManagementQuery; +import net.srt.service.DatastandardService; +import net.srt.vo.StandardManagementVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + + +/** + * @ClassName : DatastandardController + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 20:36 + */ +@RestController +@RequestMapping("/data-standard") +@AllArgsConstructor +public class DatastandardController { + @Autowired + DatastandardService datastandardService; + + @GetMapping("page") + @Operation(summary = "分页") + public Result> page(@Valid StandardManagementQuery query){ + PageResult page = datastandardService.page(query); + return Result.ok(page); + } + + + @GetMapping("{id}") + @Operation(summary ="信息") + public Result get(@PathVariable("id") Integer categoryId) { + DatastandardEntity entity = datastandardService.getById(categoryId); + return Result.ok(DatastandardConvert.INSTANCE.convert(entity)); + } + + @GetMapping("/table-code/list") + @Operation(summary = "查询表编码") + public Result> getTableCode(){ + List list= datastandardService.getTableCode(); + return Result.ok(list); + } + + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody DatastandardEntity entity) { + datastandardService.save(entity); + return Result.ok(); + } + + + +} 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 new file mode 100644 index 0000000..2ed2a7f --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java @@ -0,0 +1,59 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.tags.Tags; +import lombok.AllArgsConstructor; +import net.srt.convert.MetamodelConvert; +import net.srt.entity.MetamodelEntity; +import net.srt.framework.common.utils.Result; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.service.MetamodelService; +import net.srt.vo.MetamodelVO; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/metamodel") +@Tag(name = "数据治理-元模型") +@AllArgsConstructor +public class MetamodelController { + private final MetamodelService metamodelService; + + @GetMapping("list-tree") + @Operation(summary = "获取元模型列表") + public Result> listTree(){ + List TreeNodeVos = metamodelService.listTree(); + return Result.ok(TreeNodeVos); + } + + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id){ + MetamodelEntity entity = metamodelService.getById(id); + return Result.ok(MetamodelConvert.INSTANCE.convert(entity)); + } + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody MetamodelVO vo){ + 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/controller/MetamodelPropertyController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelPropertyController.java new file mode 100644 index 0000000..d6e9a5d --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelPropertyController.java @@ -0,0 +1,66 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import net.srt.convert.MetamodelPropertyConvert; +import net.srt.entity.MetamodelPropertyEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import net.srt.query.MetamodelpropertyQuery; +import net.srt.service.MetamodelPropertyService; +import net.srt.vo.MetamodelPropertyVO; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +@RestController +@RequestMapping("metamodel-property") +@Tag(name = "数据治理-元模型属性") +@AllArgsConstructor +public class MetamodelPropertyController { + private final MetamodelPropertyService metamodelPropertyService; + + @GetMapping("/properties/{metaModelId}") + @Operation(summary = "根据id获取属性列表") + public Result> properties(@PathVariable Long id){ + List properties = metamodelPropertyService.properties(id); + return Result.ok(properties); + } + + @GetMapping("page") + @Operation(summary = "分页") + public Result> page(@Valid MetamodelpropertyQuery query){ + PageResult page = metamodelPropertyService.page(query); + return Result.ok(page); + } + + @GetMapping("/{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id){ + MetamodelPropertyEntity entity = metamodelPropertyService.getById(id); + return Result.ok(MetamodelPropertyConvert.INSTANCE.convert(entity)); + } + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody MetamodelPropertyVO vo){ + metamodelPropertyService.save(vo); + return Result.ok(); + } + + @PutMapping + @Operation(summary = "修改") + public Result update(@RequestBody MetamodelPropertyVO vo){ + metamodelPropertyService.update(vo); + return Result.ok(); + } + + @DeleteMapping + @Operation(summary = "删除") + public Result delete(@RequestBody List idList){ + metamodelPropertyService.delete(idList); + return Result.ok(); + } +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityRuleController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityRuleController.java index 961e612..87bd0b2 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityRuleController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityRuleController.java @@ -1,18 +1,21 @@ package net.srt.controller; +import cn.hutool.db.Page; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import net.srt.convert.QualityRuleConvert; +import net.srt.entity.QualityQueryEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.common.utils.Result; import net.srt.query.QualityRuleQuery; import net.srt.service.QualityRuleService; import net.srt.vo.QualityRuleVo; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import oracle.ucp.proxy.annotation.Post; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * @BelongsProject: srt_cloud @@ -26,9 +29,24 @@ import javax.validation.Valid; @AllArgsConstructor public class QualityRuleController { private final QualityRuleService dataGovernanceQualityRuleService; + @GetMapping("list") + @Operation(summary = "查询列表") + public Result> list(){ + List list=dataGovernanceQualityRuleService.list(); + return Result.ok(QualityRuleConvert.INSTANCE.convertList(list)); + + } @GetMapping("page") @Operation(summary = "分页") public Result> page(@Valid QualityRuleQuery query){ - return Result.ok(dataGovernanceQualityRuleService.pagea(query)); + PageResult page=dataGovernanceQualityRuleService.page(query); + return Result.ok(page); + } + + @PostMapping + @Operation(summary = "报存") + public Result save(@RequestBody QualityRuleVo vo){ + dataGovernanceQualityRuleService.save(vo); + return Result.ok(); } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityTaskController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityTaskController.java new file mode 100644 index 0000000..68bb3db --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityTaskController.java @@ -0,0 +1,47 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.tags.Tags; +import lombok.AllArgsConstructor; +import net.srt.convert.QualityTaskConvert; +import net.srt.entity.QualityTaskEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.common.utils.Result; +import net.srt.query.QualityTaskQuery; +import net.srt.service.QualityTaskService; +import net.srt.vo.QualityTaskVo; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.validation.Valid; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.controller + * @Author: jpz + * @CreateTime: 2023/12/21 11:29 + */ +@RestController +@RequestMapping("/quality-task") +@Tag(name = "数据治理-数据质量") +@AllArgsConstructor +public class QualityTaskController { + private final QualityTaskService qualityTaskService; + @GetMapping("page") + @Operation(summary = "分页") + public Result> page(@Valid QualityTaskQuery query){ + return Result.ok(qualityTaskService.pagea(query)); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id){ + QualityTaskEntity entity=qualityTaskService.getById(id); + return Result.ok(QualityTaskConvert.INSTANCE.covert(entity)); + } + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java new file mode 100644 index 0000000..705e1db --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java @@ -0,0 +1,48 @@ +package net.srt.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import net.srt.entity.StandardEntity; +import net.srt.framework.common.utils.BeanUtil; +import net.srt.framework.common.utils.Result; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.service.StandardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName : StandardController + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 11:30 + */ +@RestController +@RequestMapping("/standard-category") +@Tag(name = "标准管理列表") +public class StandardController { + @Autowired + private StandardService standardService; + @GetMapping("list-tree") + @Operation(summary = "查询文件分组树") + public Result> listTree() { + return Result.ok(standardService.listTree()); + } + + + @GetMapping("/{id}") + @Operation(summary = "根据id获取") + public Result getById(@PathVariable Integer id) { + StandardEntity entity = standardService.getById(id); + TreeNodeVo nodeVo = BeanUtil.copyProperties(entity, TreeNodeVo::new); + nodeVo.setLabel(entity.getName()); + nodeVo.setParentPath(entity.getPath().contains("/") ? entity.getPath().substring(0, entity.getPath().lastIndexOf("/")) : null); + return Result.ok(nodeVo); + } + + +} 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 new file mode 100644 index 0000000..87e1f5f --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java @@ -0,0 +1,19 @@ +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; +@Mapper +public interface MetamodelConvert { + MetamodelConvert INSTANCE = Mappers.getMapper(MetamodelConvert.class); + + MetamodelEntity convert(MetamodelVO vo); + + MetamodelVO convert(MetamodelEntity entity); + + List convertList(List list); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelPropertyConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelPropertyConvert.java new file mode 100644 index 0000000..7eea507 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelPropertyConvert.java @@ -0,0 +1,20 @@ +package net.srt.convert; + +import net.srt.entity.MetamodelPropertyEntity; +import net.srt.vo.MetamodelPropertyVO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +@Mapper +public interface MetamodelPropertyConvert { + MetamodelPropertyConvert INSTANCE = Mappers.getMapper(MetamodelPropertyConvert.class); + + MetamodelPropertyEntity convert(MetamodelPropertyVO vo); + + MetamodelPropertyVO convert(MetamodelPropertyEntity entity); + + List convertList(List list); + +} 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 01ec4a6..770d9a3 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 @@ -4,6 +4,7 @@ import net.srt.entity.QualityQueryEntity; import net.srt.vo.QualityRuleVo; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; +import org.springframework.stereotype.Component; import java.util.List; @@ -19,4 +20,7 @@ public interface QualityRuleConvert { List convertList(List list); + + QualityQueryEntity conver(QualityRuleVo vo); + } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityTaskConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityTaskConvert.java new file mode 100644 index 0000000..9bc23c4 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityTaskConvert.java @@ -0,0 +1,28 @@ +package net.srt.convert; + +import net.srt.controller.QualityTaskController; +import net.srt.entity.QualityTaskEntity; +import net.srt.vo.QualityTaskVo; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.springframework.stereotype.Component; + +import javax.swing.*; +import java.util.List; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.convert + * @Author: jpz + * @CreateTime: 2023/12/21 11:42 + */ +@Mapper +public interface QualityTaskConvert { + + + QualityTaskConvert INSTANCE = Mappers.getMapper(QualityTaskConvert.class); + + List covertList(List list); + + QualityTaskVo covert(QualityTaskEntity entity); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelDao.java new file mode 100644 index 0000000..b69d226 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelDao.java @@ -0,0 +1,9 @@ +package net.srt.dao; + +import net.srt.entity.MetamodelEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MetamodelDao extends BaseDao { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelPropertyDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelPropertyDao.java new file mode 100644 index 0000000..78fd2cd --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/MetamodelPropertyDao.java @@ -0,0 +1,9 @@ +package net.srt.dao; + +import net.srt.entity.MetamodelPropertyEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import org.mapstruct.Mapper; + +@Mapper +public interface MetamodelPropertyDao extends BaseDao { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/dao/QualityTaskDao.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/QualityTaskDao.java new file mode 100644 index 0000000..30cdd87 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/QualityTaskDao.java @@ -0,0 +1,15 @@ +package net.srt.dao; + +import net.srt.entity.QualityTaskEntity; +import net.srt.framework.mybatis.dao.BaseDao; +import org.apache.ibatis.annotations.Mapper; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.dao + * @Author: jpz + * @CreateTime: 2023/12/21 11:38 + */ +@Mapper +public interface QualityTaskDao extends BaseDao { +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/mapper/StandardMapper.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java similarity index 56% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/mapper/StandardMapper.java rename to srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java index bb79705..b2dcb0f 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/mapper/StandardMapper.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java @@ -1,7 +1,7 @@ -package net.srt.standard.mapper; +package net.srt.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import net.srt.standard.domain.entity.DatagovernanceEntity; +import net.srt.entity.StandardEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; * @Date: 2023-12-20 11:30 */ @Mapper -public interface StandardMapper extends BaseMapper { +public interface StandardDao extends BaseMapper { } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/entity/DatagovernanceEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatagovernanceEntity.java similarity index 95% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/domain/entity/DatagovernanceEntity.java rename to srt-cloud-data-governance/src/main/java/net/srt/entity/DatagovernanceEntity.java index 1d66b6f..c034db7 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/entity/DatagovernanceEntity.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/DatagovernanceEntity.java @@ -1,4 +1,4 @@ -package net.srt.standard.domain.entity; +package net.srt.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelEntity.java new file mode 100644 index 0000000..0ddb7bd --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelEntity.java @@ -0,0 +1,64 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.mybatis.entity.BaseEntity; + +@EqualsAndHashCode(callSuper = false) +@Data +@TableName("data_governance_metamodel") +public class MetamodelEntity extends BaseEntity { + + /** + * 父id（顶级为0） + */ + private Long parentId; + + /** + * 名称 + */ + private String name; + + /** + * 代码 + */ + private String code; + + /** + * 路径 + */ + private String path; + + /** + * 是否内置元模型 0-否，1-是 + */ + private Integer builtin; + + /** + * 图标 + */ + private String icon; + + /** + * 是否是目录 0-否 1-是 + */ + private Integer ifLeaf; + + /** + * 描述 + */ + private String description; + + /** + * 项目id（租户id） + */ + private Long projectId; + + + private Integer orderNo; + + + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelPropertyEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelPropertyEntity.java new file mode 100644 index 0000000..b474e78 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/MetamodelPropertyEntity.java @@ -0,0 +1,70 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = false) +@Data +@TableName("data_governance_metamodel_property") +public class MetamodelPropertyEntity { + + /** + * 元模型id + */ + private Integer metamodelId; + + /** + * 属性名称 + */ + private String name; + + /** + * 属性代码 + */ + private String code; + + /** + * 数据类型 1-数字 2-字符串 + */ + private Integer dataType; + + /** + * 数据长度 + */ + private Integer dataLength; + + /** + * 输入控件，1-文本框 + */ + private Integer inputType; + + /** + * 允许为空 0-否 1-是 + */ + private Integer nullable; + + /** + * 是否内置 0-否 1-是 + */ + private Integer builtin; + + /** + * 项目id（租户id） + */ + private Long projectId; + + /** + * 注释 + */ + private String comment; + + /** + * 序号 + */ + private Integer orderNo; + + + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java index af55316..f205541 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java @@ -18,7 +18,7 @@ import java.util.List; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName(value = "data_governance_quality_rule", autoResultMap = true) +@TableName(value = "data_governance_quality_rule",autoResultMap=true) public class QualityQueryEntity extends BaseEntity { /** * 名称 diff --git a/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityTaskEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityTaskEntity.java new file mode 100644 index 0000000..7be2339 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityTaskEntity.java @@ -0,0 +1,54 @@ +package net.srt.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.entity + * @Author: jpz + * @CreateTime: 2023/12/21 10:46 + */ +@EqualsAndHashCode(callSuper = false) +@Data +@TableName(value = "data_governance_quality_task", autoResultMap = true) +public class QualityTaskEntity { + //id + private Long id; + //规则配置 + private Integer qualityConfigId; + //名称 + private String name; + //运行状态(1-等待中 2-运行中 3-正常结束 4-异常异常) + private Integer status; + //检测条数 + private Integer checkCount; + //检测通过条数 + private Integer passCount; + //未通过条数 + private Integer notPassCount; + //开始时间 + private Date startTime; + //结束时间 + private Date endTime; + //错误日志 + private String errorLog; + //项目id + private Integer projectId; + //版本号 + private Integer version; + //删除标识 0:正常 1:删除 + private Integer deleted; + //创建者 + private Integer creator; + //创建时间 + private Date createTime; + //更新者 + private Integer updater; + //更新时间 + private Date updateTime; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/query/MetamodelpropertyQuery.java b/srt-cloud-data-governance/src/main/java/net/srt/query/MetamodelpropertyQuery.java new file mode 100644 index 0000000..5a15611 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/query/MetamodelpropertyQuery.java @@ -0,0 +1,15 @@ +package net.srt.query; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.common.query.Query; + +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(description = "数据治理-元模型属性查询") +public class MetamodelpropertyQuery extends Query { + private String name; + private String code; + private Long metamodelId; +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/query/QualityTaskQuery.java b/srt-cloud-data-governance/src/main/java/net/srt/query/QualityTaskQuery.java new file mode 100644 index 0000000..8168ab6 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/query/QualityTaskQuery.java @@ -0,0 +1,32 @@ +package net.srt.query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.common.query.Query; +import net.srt.framework.common.utils.DateUtils; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.query + * @Author: jpz + * @CreateTime: 2023/12/21 11:33 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema(description = "数据治理任务查询") +public class QualityTaskQuery extends Query { + private String name; + private Integer status; + @DateTimeFormat(pattern = DateUtils.DATE_TIME_PATTERN) + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date startTime; + @DateTimeFormat(pattern = DateUtils.DATE_TIME_PATTERN) + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date endTime; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java new file mode 100644 index 0000000..98b9180 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/query/StandardManagementQuery.java @@ -0,0 +1,22 @@ +package net.srt.query; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import net.srt.framework.common.query.Query; + +/** + * @ClassName : StandardManagementQuery + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 14:40 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Schema (description = "标准管理列表") +public class StandardManagementQuery extends Query { + private Integer categoryId; + private String t; + private String cnName; + private String engName; +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelPropertyService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelPropertyService.java new file mode 100644 index 0000000..b90f973 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelPropertyService.java @@ -0,0 +1,21 @@ +package net.srt.service; + +import net.srt.entity.MetamodelPropertyEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.query.MetamodelpropertyQuery; +import net.srt.vo.MetamodelPropertyVO; + +import java.util.List; + +public interface MetamodelPropertyService extends BaseService { + List properties(Long id); + + PageResult page(MetamodelpropertyQuery query); + + void save(MetamodelPropertyVO vo); + + void delete(List idList); + + void update(MetamodelPropertyVO vo); +} 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 new file mode 100644 index 0000000..1d50845 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java @@ -0,0 +1,18 @@ +package net.srt.service; + +import net.srt.entity.MetamodelEntity; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.vo.MetamodelVO; + +import java.util.List; + +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/QualityRuleService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityRuleService.java index 458eb04..d6e54a7 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/QualityRuleService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityRuleService.java @@ -13,5 +13,7 @@ import net.srt.vo.QualityRuleVo; * @CreateTime: 2023/12/20 19:53 */ public interface QualityRuleService extends BaseService { - PageResult pagea(QualityRuleQuery query); + PageResult page(QualityRuleQuery query); + + void save(QualityRuleVo vo); } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/QualityTaskService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityTaskService.java new file mode 100644 index 0000000..1a1b010 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityTaskService.java @@ -0,0 +1,17 @@ +package net.srt.service; + +import net.srt.entity.QualityTaskEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.query.QualityTaskQuery; +import net.srt.vo.QualityTaskVo; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.service + * @Author: jpz + * @CreateTime: 2023/12/21 11:36 + */ +public interface QualityTaskService extends BaseService { + PageResult pagea(QualityTaskQuery query); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java new file mode 100644 index 0000000..ee69e54 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java @@ -0,0 +1,18 @@ +package net.srt.service; + +import net.srt.entity.StandardEntity; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.framework.mybatis.service.BaseService; + +import java.util.List; + +/** + * @ClassName : StandardService + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 11:31 + */ +public interface StandardService extends BaseService { + + List listTree(); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java new file mode 100644 index 0000000..c7c125c --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelPropertyServiceImpl.java @@ -0,0 +1,64 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import net.srt.convert.MetamodelPropertyConvert; +import net.srt.dao.MetamodelPropertyDao; +import net.srt.entity.MetamodelPropertyEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.query.MetamodelpropertyQuery; +import net.srt.service.MetamodelPropertyService; +import net.srt.vo.MetamodelPropertyVO; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +import java.util.List; + +@Service +public class MetamodelPropertyServiceImpl extends BaseServiceImpl implements MetamodelPropertyService { + + @Override + public List properties(Long id) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(MetamodelPropertyEntity::getMetamodelId, id).orderByAsc(MetamodelPropertyEntity::getOrderNo); + return MetamodelPropertyConvert.INSTANCE.convertList(baseMapper.selectList(wrapper)); + } + + @Override + public PageResult page(MetamodelpropertyQuery query) { + IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); + return new PageResult<>(MetamodelPropertyConvert.INSTANCE.convertList(page.getRecords()),page.getTotal()); + } + + private LambdaQueryWrapper getWrapper(MetamodelpropertyQuery query) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(MetamodelPropertyEntity::getMetamodelId, query.getMetamodelId()) + .like(StringUtil.isBlank(query.getName()),MetamodelPropertyEntity::getName,query.getName()) + .like(StringUtil.isBlank(query.getCode()),MetamodelPropertyEntity::getCode,query.getCode()) + .orderByAsc(MetamodelPropertyEntity::getOrderNo); + return wrapper; + } + + @Override + public void save(MetamodelPropertyVO vo) { + MetamodelPropertyEntity entity = MetamodelPropertyConvert.INSTANCE.convert(vo); + entity.setBuiltin(0); + entity.setProjectId(getProjectId()); + baseMapper.insert(entity); + } + + @Override + public void update(MetamodelPropertyVO vo) { + + } + + @Override + public void delete(List idList) { + + } + + +} 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 new file mode 100644 index 0000000..93f13d8 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java @@ -0,0 +1,89 @@ +package net.srt.service.impl; + +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; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.service.MetamodelService; +import net.srt.vo.MetamodelVO; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +import java.util.List; +@Service +public class MetamodelServiceImpl extends BaseServiceImpl implements MetamodelService { + @Override + public List listTree() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + //查询当前项目下的元模型和公共的元模型 + wrapper.eq(MetamodelEntity::getProjectId, getProjectId()) + .or() + .eq(MetamodelEntity::getProjectId, 0) + .orderByAsc(MetamodelEntity::getOrderNo); + List dataGovernanceMetamodelEntities = baseMapper.selectList(wrapper); + List treeNodeVos = BeanUtil.copyListProperties(dataGovernanceMetamodelEntities, TreeNodeVo::new, (oldItem, newItem) -> { + newItem.setLabel(oldItem.getName()); + newItem.setValue(oldItem.getId()); + newItem.setDisabled(oldItem.getIfLeaf() == 1); + if (newItem.getPath().contains("/")) { + newItem.setParentPath(newItem.getPath().substring(0, newItem.getPath().lastIndexOf("/"))); + } + }); + return BuildTreeUtils.buildTree(treeNodeVos); + } + + @Override + public void save(MetamodelVO vo) { + MetamodelEntity entity = MetamodelConvert.INSTANCE.convert(vo); + entity.setPath(recursionPath(entity,null)); + entity.setProjectId(getProjectId()); + entity.setBuiltin(0); + buildField(entity); + baseMapper.insert(entity); + } + + @Override + public void update(MetamodelVO vo) { + MetamodelEntity entity = MetamodelConvert.INSTANCE.convert(vo); + entity.setPath(recursionPath(entity,null)); + entity.setProjectId(getProjectId()); + entity.setBuiltin(0); + buildField(entity); + updateById(entity); + } + + @Override + public void delete(Long id) { + LambdaQueryWrapper 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"); + }else { + entity.setIcon("/src/assets/folder.png"); + } + } + + private String recursionPath(MetamodelEntity metamodelEntity,String path){ + if(StringUtil.isBlank(path)){ + path = metamodelEntity.getName(); + } + if(metamodelEntity.getParentId()!=0){ + MetamodelEntity parent = getById(metamodelEntity.getParentId()); + path = parent.getName() + "/" + path; + return recursionPath(parent,path); + } + return path; + } + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityRuleServiceimpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityRuleServiceimpl.java index f6019cf..66fdc52 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityRuleServiceimpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityRuleServiceimpl.java @@ -26,21 +26,23 @@ import srt.cloud.framework.dbswitch.common.util.StringUtil; @AllArgsConstructor public class QualityRuleServiceimpl extends BaseServiceImpl implements QualityRuleService { @Override - public PageResult pagea(QualityRuleQuery query) { - //查询分页 - IPage page =baseMapper.selectPage(getPage(query),getWrapper(query)); - //转换vo + public PageResult page(QualityRuleQuery query) { + IPage page=baseMapper.selectPage(getPage(query),getWrapper(query)); return new PageResult<>(QualityRuleConvert.INSTANCE.convertList(page.getRecords()),page.getTotal()); } + @Override + public void save(QualityRuleVo vo) { + QualityQueryEntity entity=QualityRuleConvert.INSTANCE.conver(vo); + entity.setProjectId(getProjectId()); + baseMapper.insert(entity); + } + private LambdaQueryWrapper getWrapper(QualityRuleQuery query) { - if (query!=null){ - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.like(StringUtil.isNotBlank(query.getName()), QualityQueryEntity::getName, query.getName()) - .like(StringUtil.isNotBlank(query.getEngName()), QualityQueryEntity::getEngName, query.getEngName()); - return wrapper; - } - return null; + LambdaQueryWrapper wrapper=Wrappers.lambdaQuery(); + wrapper.like(StringUtil.isNotBlank(query.getName()),QualityQueryEntity::getName,query.getName()) + .like(StringUtil.isNotBlank(query.getEngName()),QualityQueryEntity::getEngName,query.getName()); + return wrapper; } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityTaskServiceimpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityTaskServiceimpl.java new file mode 100644 index 0000000..708b574 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityTaskServiceimpl.java @@ -0,0 +1,50 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; + +import net.srt.convert.QualityRuleConvert; +import net.srt.convert.QualityTaskConvert; +import net.srt.dao.QualityTaskDao; +import net.srt.entity.QualityQueryEntity; +import net.srt.entity.QualityTaskEntity; +import net.srt.framework.common.page.PageResult; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.query.QualityTaskQuery; +import net.srt.service.QualityTaskService; +import net.srt.vo.QualityTaskVo; +import org.springframework.stereotype.Service; +import srt.cloud.framework.dbswitch.common.util.StringUtil; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.service.impl + * @Author: jpz + * @CreateTime: 2023/12/21 11:38 + */ +@Service +@AllArgsConstructor +public class QualityTaskServiceimpl extends BaseServiceImpl implements QualityTaskService { + @Override + public PageResult pagea(QualityTaskQuery query) { + //查询分页 + IPage page =baseMapper.selectPage(getPage(query),getWrapper(query)); + return new PageResult<>(QualityTaskConvert.INSTANCE.covertList(page.getRecords()),page.getTotal()); + } + + private LambdaQueryWrapper getWrapper(QualityTaskQuery query) { + LambdaQueryWrapper wrapper= Wrappers.lambdaQuery(); + wrapper.like(StringUtil.isNotBlank(query.getName()),QualityTaskEntity::getName,query.getName()) + .eq(query.getStatus()!=null,QualityTaskEntity::getQualityConfigId,query.getStatus()) + .eq(query.getStartTime()!=null,QualityTaskEntity::getStartTime,query.getStartTime()) + .eq(query.getEndTime()!=null,QualityTaskEntity::getEndTime,query.getEndTime()) + .orderByDesc(QualityTaskEntity::getId); + dataScopeWithOrgId(wrapper); + return wrapper; + } + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java new file mode 100644 index 0000000..e3e8fa9 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java @@ -0,0 +1,44 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.AllArgsConstructor; +import net.srt.dao.StandardDao; +import net.srt.entity.StandardEntity; +import net.srt.framework.common.utils.BeanUtil; +import net.srt.framework.common.utils.BuildTreeUtils; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.framework.mybatis.service.impl.BaseServiceImpl; +import net.srt.service.StandardService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName : StandardServiceImpl + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 11:31 + */ +@Service +@AllArgsConstructor +public class StandardServiceImpl extends BaseServiceImpl implements StandardService { + + @Override + public List listTree() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + dataScopeWithoutOrgId(wrapper); + wrapper.orderByAsc(StandardEntity::getOrderNo); + List dataFileCategoryEntities = baseMapper.selectList(wrapper); + List treeNodeVos = BeanUtil.copyListProperties(dataFileCategoryEntities, TreeNodeVo::new, (oldItem, newItem) -> { + newItem.setLabel(oldItem.getName()); + newItem.setValue(oldItem.getId()); + newItem.setDisabled(oldItem.getType() == 0); + if (newItem.getPath().contains("/")) { + newItem.setParentPath(newItem.getPath().substring(0, newItem.getPath().lastIndexOf("/"))); + } + }); + return BuildTreeUtils.buildTree(treeNodeVos); + } + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java deleted file mode 100644 index 5f6d00b..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.srt.standard.controller; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.BeanUtil; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.standard.domain.dto.StandardManagementRequest; -import net.srt.standard.domain.entity.DatagovernanceEntity; -import net.srt.standard.domain.vo.StandardManagementVo; -import net.srt.standard.service.StandardService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; - -/** - * @ClassName : DatastandardController - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 20:36 - */ -@RestController -@RequestMapping("/data-standard") -public class DatastandardController { - @Autowired - private StandardService standardService; - @GetMapping("page") - @Operation(summary = "分页") - public Result> page(@Valid StandardManagementRequest query){ - return Result.ok(standardService.pagea(query)); - } - - @PostMapping - @Operation(summary = "保存") - @PreAuthorize("hasAuthority('data-standard:fileCategory:save')") - public Result add(@RequestBody StandardManagementVo standardManagementVo){ - standardService.addStand(standardManagementVo); - return Result.ok(); - } - - @PostMapping - @Operation(summary = "修改") - @PreAuthorize("hasAuthority('data-standard:fileCategory:update')") - public Result update(@RequestBody @Valid StandardManagementVo standardManagementVo){ - standardService.updateStand(standardManagementVo); - return Result.ok(); - } - - @DeleteMapping - @Operation(summary = "删除") - @PreAuthorize("hasAuthority('data-standard:fileCategory:delete')") - public Result delete(Long id){ - standardService.delete(id); - return Result.ok(); - } - -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java deleted file mode 100644 index ca038bd..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.srt.standard.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import net.srt.framework.common.utils.BeanUtil; -import net.srt.framework.common.utils.Result; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.standard.domain.entity.DatagovernanceEntity; -import net.srt.standard.domain.vo.StandardManagementVo; -import net.srt.standard.domain.dto.StandardManagementRequest; -import net.srt.standard.service.StandardService; -import org.springframework.beans.factory.annotation.Autowired; - -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @ClassName : StandardController - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 11:30 - */ -@RestController -@RequestMapping("/standard-category") -@Tag(name = "标准管理列表") -public class StandardController { - @Autowired - private StandardService standardService; - @GetMapping("list-tree") - @Operation(summary = "查询文件分组树") - public Result> listTree() { - return Result.ok(standardService.listTree()); - } - - -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/dto/StandardManagementRequest.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/dto/StandardManagementRequest.java deleted file mode 100644 index 94d48c1..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/dto/StandardManagementRequest.java +++ /dev/null @@ -1,18 +0,0 @@ -package net.srt.standard.domain.dto; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import net.srt.standard.domain.query.Query; - -/** - * @ClassName : StandardManagementRequest - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 14:40 - */ -@Data -@EqualsAndHashCode(callSuper = false) -public class StandardManagementRequest extends Query { - private String cnName; - private String engName; -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/query/Query.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/query/Query.java deleted file mode 100644 index 124fd2c..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/query/Query.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.srt.standard.domain.query; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.hibernate.validator.constraints.Range; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; - -/** - * @ClassName : Query - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 21:46 - */ -@Data -public class Query { - @NotNull(message = "页码不能为空") - @Min(value = 1, message = "页码最小值为 1") - @Schema(description = "当前页码", required = true) - Integer page; - - @NotNull(message = "每页条数不能为空") - @Range(min = 1, max = 1000, message = "每页条数，取值范围 1-1000") - @Schema(description = "每页条数", required = true) - Integer limit; - - @Schema(description = "排序字段") - String order; - - @Schema(description = "是否升序") - boolean asc; -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java deleted file mode 100644 index b4cdaf1..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.srt.standard.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.BaseService; -import net.srt.standard.domain.vo.StandardManagementVo; -import net.srt.standard.domain.entity.DatagovernanceEntity; -import net.srt.standard.domain.dto.StandardManagementRequest; - -import java.util.List; - -/** - * @ClassName : StandardService - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 11:31 - */ -public interface StandardService extends BaseService { -// Page listpage(StandardManagementRequest standardManagementRequest); - - List listTree(); - - void addStand(StandardManagementVo standardManagementVo); - - void updateStand(StandardManagementVo standardManagementVo); - - void delete(Long id); - - PageResult pagea(StandardManagementRequest query); - -// PageResult list(StandardManagementRequest standardManagementRequest); -// -// void add(StandardManagementVo standardManagement); -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/service/impl/StandardServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/service/impl/StandardServiceImpl.java deleted file mode 100644 index 4b2a967..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/service/impl/StandardServiceImpl.java +++ /dev/null @@ -1,79 +0,0 @@ -package net.srt.standard.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import net.srt.framework.common.page.PageResult; -import net.srt.framework.common.utils.BeanUtil; -import net.srt.framework.common.utils.BuildTreeUtils; -import net.srt.framework.common.utils.TreeNodeVo; -import net.srt.framework.mybatis.service.impl.BaseServiceImpl; -import net.srt.standard.domain.vo.StandardManagementVo; -import net.srt.standard.domain.entity.DatagovernanceEntity; -import net.srt.standard.domain.dto.StandardManagementRequest; -import net.srt.standard.mapper.StandardMapper; -import net.srt.standard.service.StandardService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @ClassName : StandardServiceImpl - * @Description : - * @Author : FJJ - * @Date: 2023-12-20 11:31 - */ -@Service -public class StandardServiceImpl extends BaseServiceImpl implements StandardService { - @Autowired - private StandardMapper standardMapper; - - - @Override - public List listTree() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - dataScopeWithoutOrgId(wrapper); - wrapper.orderByAsc(DatagovernanceEntity::getOrderNo); - List dataFileCategoryEntities = baseMapper.selectList(wrapper); - List treeNodeVos = BeanUtil.copyListProperties(dataFileCategoryEntities, TreeNodeVo::new, (oldItem, newItem) -> { - newItem.setLabel(oldItem.getName()); - newItem.setValue(oldItem.getId()); - newItem.setDisabled(oldItem.getType() == 0); - if (newItem.getPath().contains("/")) { - newItem.setParentPath(newItem.getPath().substring(0, newItem.getPath().lastIndexOf("/"))); - } - }); - return BuildTreeUtils.buildTree(treeNodeVos); - } - - @Override - public void addStand(StandardManagementVo standardManagementVo) { - - } - - @Override - public void updateStand(StandardManagementVo standardManagementVo) { - - } - - @Override - public void delete(Long id) { - - } - - @Override - public PageResult pagea(StandardManagementRequest query) { - return null; - } - - -// -// @Override -// public void add(StandardManagementVo standardManagement) { -// UserDetail user = getUser(); -// standardManagement.setCreator(user.getUsername()); -// standardManagement.setCreateTime(new Date()); -// standardMapper.insert(standardManagement); -// } -} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/MetadataPropertyVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetadataPropertyVo.java new file mode 100644 index 0000000..fb17f62 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetadataPropertyVo.java @@ -0,0 +1,52 @@ +package net.srt.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.srt.framework.common.utils.DateUtils; + +import java.io.Serializable; +import java.util.Date; + +@Data +@Schema(description = "数据治理-元数据属性值") +public class MetadataPropertyVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "属性id") + private Long metamodelPropertyId; + + @Schema(description = "元数据id") + private Long metadataId; + + @Schema(description = "属性值") + private String property; + + @Schema(description = "项目id（租户id）") + private Long projectId; + + @Schema(description = "版本号") + private Integer version; + + @Schema(description = "删除标识 0：正常 1：已删除") + private Integer deleted; + + @Schema(description = "创建者") + private Long creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelPropertyVO.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelPropertyVO.java new file mode 100644 index 0000000..a85fa06 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelPropertyVO.java @@ -0,0 +1,79 @@ +package net.srt.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.srt.framework.common.utils.DateUtils; + +import java.io.Serializable; +import java.util.Date; + +@Data +@Schema(description = "数据治理-元模型属性") +public class MetamodelPropertyVO implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "元模型id") + private Integer metamodelId; + + @Schema(description = "属性名称") + private String name; + + @Schema(description = "属性代码") + private String code; + + @Schema(description = "数据类型 1-数字 2-字符串") + private Integer dataType; + + @Schema(description = "数据长度") + private Integer dataLength; + + @Schema(description = "输入控件，1-文本框") + private Integer inputType; + + @Schema(description = "允许为空 0-否 1-是") + private Integer nullable; + + @Schema(description = "是否内置 0-否 1-是") + private Integer builtin; + + @Schema(description = "项目id（租户id）") + private Long projectId; + + @Schema(description = "注释") + private String comment; + + @Schema(description = "序号") + private Integer orderNo; + + @Schema(description = "版本号") + private Integer version; + + @Schema(description = "删除标识 0：正常 1：已删除") + private Integer deleted; + + @Schema(description = "创建者") + private Long creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + + @Schema(description = "元模型属性id") + private Long metamodelPropertyId; + @Schema(description = "元数据的属性值") + private String value; + @Schema(description = "元数据属性的主键id") + private Long metadataPropertyId; + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelVO.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelVO.java new file mode 100644 index 0000000..5bfc589 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelVO.java @@ -0,0 +1,69 @@ +package net.srt.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.srt.framework.common.utils.DateUtils; + +import java.io.Serializable; +import java.util.Date; + +@Data +@Schema(description = "数据治理-元模型") +public class MetamodelVO implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + + @Schema(description = "父id（顶级为0）") + private Long parentId; + + @Schema(description = "名称") + private String name; + + @Schema(description = "代码") + private String code; + + @Schema(description = "路径") + private String path; + + @Schema(description = "是否内置元模型 0-否，1-是") + private Integer builtin; + + @Schema(description = "图标") + private String icon; + + @Schema(description = "是否是目录 0-否 1-是") + private Integer ifLeaf; + + @Schema(description = "描述") + private String description; + + @Schema(description = "项目id（租户id）") + private Long projectId; + + private Integer orderNo; + + @Schema(description = "版本号") + private Integer version; + + @Schema(description = "删除标识 0：正常 1：已删除") + private Integer deleted; + + @Schema(description = "创建者") + private Long creator; + + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + + @Schema(description = "更新者") + private Long updater; + + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityRuleVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityRuleVo.java index 2e99cd1..68106e9 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityRuleVo.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityRuleVo.java @@ -3,7 +3,6 @@ package net.srt.vo; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import net.srt.QualittRule; import net.srt.framework.common.utils.DateUtils; import java.io.Serializable; @@ -18,7 +17,7 @@ import java.util.List; */ @Data @Schema(description = "数据质量") -public class QualityRuleVo implements Serializable { +public class QualityRuleVo implements Serializable{ private static final long serialVersionUID = 1L; @Schema(description = "主键id") diff --git a/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityTaskVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityTaskVo.java new file mode 100644 index 0000000..c1b8e28 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/QualityTaskVo.java @@ -0,0 +1,62 @@ +package net.srt.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import net.srt.framework.common.utils.DateUtils; + +import java.io.Serializable; +import java.util.Date; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.vo + * @Author: jpz + * @CreateTime: 2023/12/21 10:43 + */ +@Data +@Schema(description = "数据治理-质量任务") +public class QualityTaskVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Schema(description = "主键id") + private Long id; + @Schema(description = "规则配置id") + private Integer qualityConfigId; + @Schema(description = "名称") + private String name; + @Schema(description = "运行状态(1-等待中 2-运行中 3-正常结束 4-异常结束)") + private Integer status; + @Schema(description = "检测条数") + private Integer checkCount; + @Schema(description = "检测通过条数") + private Integer passCount; + @Schema(description = "未通过条数") + private Integer notPassCount; + @Schema(description = "开始时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date startTime; + @Schema(description = "结束时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date endTime; + @Schema(description = "错误日志") + private String errorLog; + @Schema(description = "项目id") + private Integer projectId; + @Schema(description = "版本号") + private Integer version; + @Schema(description = "删除标识 0:正常 1:删除") + private Integer deleted; + @Schema(description = "创建者") + private Integer creator; + @Schema(description = "创建时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date createTime; + @Schema(description = "更新者") + private Integer updater; + @Schema(description = "更新时间") + @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) + private Date updateTime; + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/vo/StandardManagementVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java similarity index 89% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/domain/vo/StandardManagementVo.java rename to srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java index 59998d7..ef6da78 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/vo/StandardManagementVo.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementVo.java @@ -1,12 +1,12 @@ -package net.srt.standard.domain.vo; +package net.srt.vo; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; import java.util.Date; /** @@ -17,8 +17,7 @@ import java.util.Date; */ @Data @Schema(description = "标准管理查询") -@TableName(value = "standard_management") -public class StandardManagementVo { +public class StandardManagementVo implements Serializable { private static final long serialVersionUID = 1L; @TableId("id") private Long id; @@ -46,4 +45,5 @@ public class StandardManagementVo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; private Integer ifStandardRel; + private String group; } 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-governance/src/main/resources/mapper/StandardMapper.xml b/srt-cloud-data-governance/src/main/resources/mapper/StandardMapper.xml deleted file mode 100644 index 97a3eee..0000000 --- a/srt-cloud-data-governance/src/main/resources/mapper/StandardMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - 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-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar index f9d3cd6..18326ec 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar and b/srt-cloud-framework/srt-cloud-flink/build/app/flink-app-1.14-2.0.0-jar-with-dependencies.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar index 8c251f1..92b0d59 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-catalog-mysql-1.14-2.0.0.jar differ diff --git a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar index a219e3c..da5b46b 100644 Binary files a/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar and b/srt-cloud-framework/srt-cloud-flink/build/extends/flink-client-1.14-2.0.0.jar differ 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: diff --git a/srt-data-development/src/main/resources/bootstrap.yml b/srt-data-development/src/main/resources/bootstrap.yml index 0e95544..d03d7f4 100644 --- a/srt-data-development/src/main/resources/bootstrap.yml +++ b/srt-data-development/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 8093 + port: 8094 spring: mvc: