diff --git a/pom.xml b/pom.xml index 7810bb8..b3ef1ab 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ srt-cloud-system srt-cloud-gateway srt-data-development + srt-cloud-data-governance 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 new file mode 100644 index 0000000..8fda7dc --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/GovernanceApplication.java @@ -0,0 +1,21 @@ +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; + +/** + * @ClassName : GovernanceApplication + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 11:16 + */ +@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/standard/controller/DatastandardController.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java new file mode 100644 index 0000000..5f6d00b --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/DatastandardController.java @@ -0,0 +1,60 @@ +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 new file mode 100644 index 0000000..ca038bd --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/controller/StandardController.java @@ -0,0 +1,38 @@ +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 new file mode 100644 index 0000000..94d48c1 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/dto/StandardManagementRequest.java @@ -0,0 +1,18 @@ +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/entity/DatagovernanceEntity.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/entity/DatagovernanceEntity.java new file mode 100644 index 0000000..1d66b6f --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/entity/DatagovernanceEntity.java @@ -0,0 +1,57 @@ +package net.srt.standard.domain.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import net.srt.framework.mybatis.entity.BaseEntity; + +/** + * 文件分组表 + * + * @author zrx 985134801@qq.com + * @since 1.0.0 2022-11-12 + */ +@EqualsAndHashCode(callSuper = true) +@SuperBuilder +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("data_file_category") +public class DatagovernanceEntity extends BaseEntity { + + /** + * 父级id（顶级为0） + */ + private Long parentId; + + /** + * 分组名称 + */ + private String name; + + /** + * 分组序号 + */ + private Integer orderNo; + + /** + * 描述 + */ + private String description; + + /** + * 分组路径 + */ + private String path; + + private Integer type; + + /** + * 项目id + */ + private Long projectId; + +} 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 new file mode 100644 index 0000000..124fd2c --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/query/Query.java @@ -0,0 +1,33 @@ +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/domain/vo/StandardManagementVo.java b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/vo/StandardManagementVo.java new file mode 100644 index 0000000..59998d7 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/domain/vo/StandardManagementVo.java @@ -0,0 +1,49 @@ +package net.srt.standard.domain.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.util.Date; + +/** + * @ClassName : StandardManagementVo + * @Description : 标准管理表 + * @Author : FJJ + * @Date: 2023-12-20 11:24 + */ +@Data +@Schema(description = "标准管理查询") +@TableName(value = "standard_management") +public class StandardManagementVo { + private static final long serialVersionUID = 1L; + @TableId("id") + private Long id; + private Integer categoryId; + private String engName; + private String cnName; + private Integer codeNum; + private String dataType; + private Integer dataLength; + private Integer dataPrecision; + private Integer nullable; + private Integer standardCodeId; + private Integer type; + private String note; + private Integer projectId; + private Integer status; + private Integer version; + private Integer deleted; + private String creator; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String updater; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date updateTime; + private Integer ifStandardRel; +} 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/standard/mapper/StandardMapper.java new file mode 100644 index 0000000..bb79705 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/mapper/StandardMapper.java @@ -0,0 +1,15 @@ +package net.srt.standard.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import net.srt.standard.domain.entity.DatagovernanceEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * @ClassName : standardMapper + * @Description : + * @Author : FJJ + * @Date: 2023-12-20 11:30 + */ +@Mapper +public interface StandardMapper extends BaseMapper { +} 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 new file mode 100644 index 0000000..b4cdaf1 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/service/StandardService.java @@ -0,0 +1,35 @@ +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 new file mode 100644 index 0000000..4b2a967 --- /dev/null +++ b/srt-cloud-data-governance/src/main/java/net/srt/standard/service/impl/StandardServiceImpl.java @@ -0,0 +1,79 @@ +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/MetamodelTreeVo.java b/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelTreeVo.java deleted file mode 100644 index ad7f025..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelTreeVo.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.srt.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import net.srt.framework.common.utils.DateUtils; -import net.srt.framework.common.utils.TreeNodeVo; - -import java.util.Date; -import java.util.List; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(description = "数据治理-元数据-元模型-树目录") -public class MetamodelTreeVo { - private Long id; - private Long parentId; - private Integer ifLeaf; - //作业类型 - private Long taskId; - private Integer taskType; - private String parentPath; - private String path; - private Integer orderNo; - private String label; - private Long metamodelId; - private String name; - private String icon; - private String code; - private Integer builtin; - private String description; - private Long projectId; - private Long creator; - @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN) - private Date createTime; - private List children; - private boolean disabled; - private Boolean leaf; - /** - * 自定义属性 - */ - private Object attributes; - /** - * 自定义类型 - */ - private Object type; - private Object value; -} 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 deleted file mode 100644 index af1cd18..0000000 --- a/srt-cloud-data-governance/src/main/java/net/srt/vo/MetamodelVo.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.srt.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Schema(description = "数据治理-元数据-元模型") -public class MetamodelVo { - -} diff --git a/srt-cloud-data-governance/src/main/resources/log4j2.xml b/srt-cloud-data-governance/src/main/resources/log4j2.xml index ba24b09..14461eb 100644 --- a/srt-cloud-data-governance/src/main/resources/log4j2.xml +++ b/srt-cloud-data-governance/src/main/resources/log4j2.xml @@ -3,7 +3,7 @@ ./logs/ - srt-cloud-data-integrate + srt-cloud-system @@ -34,7 +34,7 @@ - + diff --git a/srt-cloud-data-governance/src/main/resources/mapper/StandardMapper.xml b/srt-cloud-data-governance/src/main/resources/mapper/StandardMapper.xml new file mode 100644 index 0000000..97a3eee --- /dev/null +++ b/srt-cloud-data-governance/src/main/resources/mapper/StandardMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + 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 238e10e..f9d3cd6 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 6836e31..8c251f1 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 9e0aab7..a219e3c 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