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/standard/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java similarity index 67% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java rename to srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java index 5f6d00b..ad918dd 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/DatastandardController.java @@ -1,17 +1,14 @@ -package net.srt.standard.controller; +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.vo.StandardManagementParam; 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 net.srt.vo.StandardManagementVo; +import net.srt.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; @@ -24,26 +21,26 @@ import javax.validation.Valid; */ @RestController @RequestMapping("/data-standard") +@Tag(name = "数据治理-标准管理") +@AllArgsConstructor public class DatastandardController { @Autowired private StandardService standardService; @GetMapping("page") @Operation(summary = "分页") - public Result> page(@Valid StandardManagementRequest query){ + public Result> page(@Valid StandardManagementParam 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 + @PutMapping @Operation(summary = "修改") - @PreAuthorize("hasAuthority('data-standard:fileCategory:update')") public Result update(@RequestBody @Valid StandardManagementVo standardManagementVo){ standardService.updateStand(standardManagementVo); return Result.ok(); @@ -51,7 +48,6 @@ public class DatastandardController { @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/controller/MetamodelController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java new file mode 100644 index 0000000..01dc863 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetamodelController.java @@ -0,0 +1,41 @@ +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.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; + +@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)); + } +} 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/controller/StandardController.java similarity index 68% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java rename to srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java index ca038bd..fb9550f 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/StandardController.java @@ -1,15 +1,10 @@ -package net.srt.standard.controller; +package net.srt.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 net.srt.service.StandardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; 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..7360eb4 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/MetamodelConvert.java @@ -0,0 +1,18 @@ +package net.srt.convert; + +import net.srt.entity.MetamodelEntity; +import net.srt.vo.MetamodelVO; +import org.mapstruct.factory.Mappers; +import org.springframework.stereotype.Component; + +import java.util.List; +@Component +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/QualityRuleConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityRuleConvert.java index 01ec4a6..91111b2 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; @@ -13,7 +14,7 @@ import java.util.List; * @Author: jpz * @CreateTime: 2023/12/20 19:50 */ -@Mapper +@Component public interface QualityRuleConvert { QualityRuleConvert INSTANCE = Mappers.getMapper(QualityRuleConvert.class); 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/standard/mapper/StandardMapper.java b/srt-cloud-data-governance/src/main/java/net/srt/dao/StandardDao.java similarity index 54% 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..9a16555 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,8 @@ -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.DatagovernanceEntity; +import net.srt.framework.mybatis.dao.BaseDao; import org.apache.ibatis.annotations.Mapper; /** @@ -11,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; * @Date: 2023-12-20 11:30 */ @Mapper -public interface StandardMapper extends BaseMapper { +public interface StandardDao extends BaseDao { } 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/QualityQueryEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/entity/QualityQueryEntity.java index af55316..d05a328 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") public class QualityQueryEntity extends BaseEntity { /** * 名称 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..41b376b --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/MetamodelService.java @@ -0,0 +1,11 @@ +package net.srt.service; + +import net.srt.entity.MetamodelEntity; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.framework.mybatis.service.BaseService; + +import java.util.List; + +public interface MetamodelService extends BaseService { + List listTree(); +} 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/service/StandardService.java similarity index 52% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java rename to srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java index b4cdaf1..7d75ae3 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/StandardService.java @@ -1,12 +1,11 @@ -package net.srt.standard.service; +package net.srt.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 net.srt.vo.StandardManagementVo; +import net.srt.entity.DatagovernanceEntity; +import net.srt.vo.StandardManagementParam; import java.util.List; @@ -17,7 +16,7 @@ import java.util.List; * @Date: 2023-12-20 11:31 */ public interface StandardService extends BaseService { -// Page listpage(StandardManagementRequest standardManagementRequest); +// Page listpage(StandardManagementParam standardManagementRequest); List listTree(); @@ -27,9 +26,9 @@ public interface StandardService extends BaseService { void delete(Long id); - PageResult pagea(StandardManagementRequest query); + PageResult pagea(StandardManagementParam query); -// PageResult list(StandardManagementRequest standardManagementRequest); +// PageResult list(StandardManagementParam standardManagementRequest); // // void add(StandardManagementVo standardManagement); } 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..b5929a6 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetamodelServiceImpl.java @@ -0,0 +1,35 @@ +package net.srt.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import net.srt.dao.MetamodelDao; +import net.srt.entity.MetamodelEntity; +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 org.springframework.stereotype.Service; + +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); + } +} 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/service/impl/StandardServiceImpl.java similarity index 79% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/service/impl/StandardServiceImpl.java rename to srt-cloud-data-governance/src/main/java/net/srt/service/impl/StandardServiceImpl.java index 4b2a967..4af8553 100644 --- 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/service/impl/StandardServiceImpl.java @@ -1,18 +1,16 @@ -package net.srt.standard.service.impl; +package net.srt.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.dao.StandardDao; +import net.srt.vo.StandardManagementParam; 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 net.srt.vo.StandardManagementVo; +import net.srt.entity.DatagovernanceEntity; +import net.srt.service.StandardService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -25,9 +23,9 @@ import java.util.List; * @Date: 2023-12-20 11:31 */ @Service -public class StandardServiceImpl extends BaseServiceImpl implements StandardService { +public class StandardServiceImpl extends BaseServiceImpl implements StandardService { @Autowired - private StandardMapper standardMapper; + private StandardDao standardDao; @Override @@ -63,7 +61,7 @@ public class StandardServiceImpl extends BaseServiceImpl pagea(StandardManagementRequest query) { + public PageResult pagea(StandardManagementParam query) { return null; } 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/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..4c65882 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; 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/vo/StandardManagementParam.java similarity index 56% rename from srt-cloud-data-governance/src/main/java/net/srt/standard/domain/dto/StandardManagementRequest.java rename to srt-cloud-data-governance/src/main/java/net/srt/vo/StandardManagementParam.java index 94d48c1..f817bdf 100644 --- 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/vo/StandardManagementParam.java @@ -1,18 +1,18 @@ -package net.srt.standard.domain.dto; +package net.srt.vo; import lombok.Data; import lombok.EqualsAndHashCode; -import net.srt.standard.domain.query.Query; +import net.srt.framework.common.query.Query; /** - * @ClassName : StandardManagementRequest + * @ClassName : StandardManagementParam * @Description : * @Author : FJJ * @Date: 2023-12-20 14:40 */ @Data @EqualsAndHashCode(callSuper = false) -public class StandardManagementRequest extends Query { +public class StandardManagementParam extends Query { private String cnName; private String engName; } 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 97% 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..7128d76 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,4 +1,4 @@ -package net.srt.standard.domain.vo; +package net.srt.vo; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; 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-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-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: