diff --git a/pom.xml b/pom.xml index 9003ee4..48cbdf3 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ srt-cloud-gateway srt-data-development srt-cloud-data-governance + srt-cloud-data-service srt-cloud-data-server diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java index bd2506e..a9568ce 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/MetadataController.java @@ -1,104 +1,104 @@ -//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.framework.common.cache.bean.Neo4jInfo; -//import net.srt.framework.common.utils.Result; -//import net.srt.framework.common.utils.TreeNodeVo; -//import net.srt.service.MetadataService; -//import net.srt.vo.MetadataVo; -//import org.springframework.web.bind.annotation.*; -// -//import javax.validation.Valid; -//import java.util.List; -// -///** -// * @BelongsProject: srt_cloud -// * @BelongsPackage: net.srt.controller -// * @Author: jpz -// * @CreateTime: 2023/12/24 14:24 -// */ -//import io.swagger.v3.oas.annotations.tags.Tag; -//import lombok.AllArgsConstructor; -//import net.srt.service.MetadataService; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//@RestController -//@RequestMapping("metadata") -//@Tag(name = "数据治理-元数据") -//@AllArgsConstructor -//public class MetadataController { -// private final MetadataService metadataService; -// @GetMapping("/list-chlid") -// @Operation(summary = "根据父类id获取信息") -// public Result> listByPatenId(@RequestParam Long parentId){ -// List list=metadataService.listByPatenId(parentId); -// return Result.ok(list); -// } -// @GetMapping("/list-floder") -// @Operation(summary = "获取目录树") -// public Result> listFloder(){ -// List list=metadataService.listFloder(); -// return Result.ok(list); -// } -// @GetMapping("/list-db") -// @Operation(summary = "获取库表目录树") -// public Result> listDb() { -// List list=metadataService.listDb(); -// return Result.ok(list); -// } -// -// @GetMapping("/list-keyword") -// @Operation(summary = "模糊查询") -// public Result> listKeyword( String keyword) { -// List list=metadataService.listKeyword(keyword); -// return Result.ok(list); -// } -// -// @GetMapping("{id}") -// @Operation(summary = "信息") -// public Result get(@PathVariable("id") Long id){ -// return Result.ok(metadataService.get(id)); -// } -// -// @PostMapping -// @Operation(summary = "保存") -// public Result save(@RequestBody MetadataVo vo){ -// metadataService.save(vo); -// return Result.ok(); -// } -// -// @PutMapping -// @Operation(summary = "修改") -// public Result update(@RequestBody @Valid MetadataVo vo){ -// metadataService.update(vo); -// return Result.ok(); -// } -// -// @DeleteMapping("{id}") -// @Operation(summary = "删除") -// public Result delete(@PathVariable Long id){ -// metadataService.delete(id); -// return Result.ok(); -// } -// -// @PostMapping("{neo4j}") -// @Operation(summary = "更新neo4路径") -// public Result updateNeo4j(@PathVariable Neo4jInfo neo4jInfo){ -// metadataService.updateNeo4j(neo4jInfo); -// return Result.ok(); -// } -// -// @GetMapping("/neo4j") -// @Operation(summary = "获取neo4的路径") -// public Result getNeo4j(){ -// return Result.ok(metadataService.getNeo4j()); -// } -// -// -// -// -//} +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.framework.common.cache.bean.Neo4jInfo; +import net.srt.framework.common.utils.Result; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.service.MetadataService; +import net.srt.vo.MetadataVO; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.controller + * @Author: jpz + * @CreateTime: 2023/12/24 14:24 + */ +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import net.srt.service.MetadataService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("metadata") +@Tag(name = "数据治理-元数据") +@AllArgsConstructor +public class MetadataController { + private final MetadataService metadataService; + @GetMapping("/list-chlid") + @Operation(summary = "根据父类id获取信息") + public Result> listByPatenId(@RequestParam Long parentId){ + List list=metadataService.listByPatenId(parentId); + return Result.ok(list); + } + @GetMapping("/list-floder") + @Operation(summary = "获取目录树") + public Result> listFloder(){ + List list=metadataService.listFloder(); + return Result.ok(list); + } + @GetMapping("/list-db") + @Operation(summary = "获取库表目录树") + public Result> listDb() { + List list=metadataService.listDb(); + return Result.ok(list); + } + + @GetMapping("/list-keyword") + @Operation(summary = "模糊查询") + public Result> listKeyword( String keyword) { + List list=metadataService.listKeyword(keyword); + return Result.ok(list); + } + + @GetMapping("{id}") + @Operation(summary = "信息") + public Result get(@PathVariable("id") Long id){ + return Result.ok(metadataService.get(id)); + } + + @PostMapping + @Operation(summary = "保存") + public Result save(@RequestBody MetadataVO vo){ + metadataService.save(vo); + return Result.ok(); + } + + @PutMapping + @Operation(summary = "修改") + public Result update(@RequestBody @Valid MetadataVO vo){ + metadataService.update(vo); + return Result.ok(); + } + + @DeleteMapping("{id}") + @Operation(summary = "删除") + public Result delete(@PathVariable Long id){ + metadataService.delete(id); + return Result.ok(); + } + + @PostMapping("{neo4j}") + @Operation(summary = "更新neo4路径") + public Result updateNeo4j(@PathVariable Neo4jInfo neo4jInfo){ + metadataService.updateNeo4j(neo4jInfo); + return Result.ok(); + } + + @GetMapping("/neo4j") + @Operation(summary = "获取neo4的路径") + public Result getNeo4j(){ + return Result.ok(metadataService.getNeo4j()); + } + + + + +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityConfigController.java b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityConfigController.java index 1bc216a..ffc1fdb 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityConfigController.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/controller/QualityConfigController.java @@ -7,7 +7,7 @@ import net.srt.framework.common.page.PageResult; import net.srt.framework.common.utils.Result; import net.srt.query.QualityConfigQuery; import net.srt.service.QualityConfigService; -import net.srt.vo.QualityConfigVo; +import net.srt.vo.QualityConfigVO; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -28,26 +28,26 @@ public class QualityConfigController { @GetMapping("page") @Operation(summary = "分页") - public Result> page(@Valid QualityConfigQuery query){ - PageResult page= qualityConfigService.page(query); + public Result> page(@Valid QualityConfigQuery query){ + PageResult page= qualityConfigService.page(query); return Result.ok(page); } @GetMapping("{id}") @Operation(summary = "信息") - public Result get(@PathVariable("id") Long id){ + public Result get(@PathVariable("id") Long id){ return Result.ok(qualityConfigService.get(id)); } @PostMapping @Operation(summary = "保存") - public Result save(@RequestBody QualityConfigVo vo){ + public Result save(@RequestBody QualityConfigVO vo){ qualityConfigService.save(vo); return Result.ok(); } @PutMapping @Operation(summary = "修改") - public Result update(@RequestBody @Valid QualityConfigVo vo){ + public Result update(@RequestBody @Valid QualityConfigVO vo){ qualityConfigService.update(vo); return Result.ok(); } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityConfigConvert.java b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityConfigConvert.java index 9e07e73..6e4456d 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityConfigConvert.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/convert/QualityConfigConvert.java @@ -1,7 +1,7 @@ package net.srt.convert; import net.srt.entity.QualityConfigEntity; -import net.srt.vo.QualityConfigVo; +import net.srt.vo.QualityConfigVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -17,9 +17,9 @@ import java.util.List; public interface QualityConfigConvert { QualityConfigConvert INSTANCE = Mappers.getMapper(QualityConfigConvert.class); - QualityConfigVo convert(QualityConfigEntity entity); + QualityConfigVO convert(QualityConfigEntity entity); - QualityConfigEntity convert(QualityConfigVo vo); + QualityConfigEntity convert(QualityConfigVO vo); - List convertList(List list); + List convertList(List list); } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java b/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java index 947e95a..cf0c336 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/init/BusinessInitializer.java @@ -25,10 +25,10 @@ public class BusinessInitializer implements ApplicationRunner { * init task monitor */ private void initScheduleMonitor() { - //处理没执行完的采集任务 - metadataCollectRecordService.dealNotFinished(); - //处理没执行完的质量检测任务 - qualityTaskService.dealNotFinished(); +// //处理没执行完的采集任务 +// metadataCollectRecordService.dealNotFinished(); +// //处理没执行完的质量检测任务 +// qualityTaskService.dealNotFinished(); } } diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/MetadataService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/MetadataService.java index 13dce44..b414aa5 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/MetadataService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/MetadataService.java @@ -1,38 +1,38 @@ -//package net.srt.service; -// -//import net.srt.entity.MetadataEntity; -//import net.srt.framework.common.cache.bean.Neo4jInfo; -//import net.srt.framework.common.utils.TreeNodeVo; -//import net.srt.framework.mybatis.service.BaseService; -//import net.srt.vo.MetadataVo; -// -//import java.util.List; -// -///** -// * @BelongsProject: srt_cloud -// * @BelongsPackage: net.srt.service -// * @Author: jpz -// * @CreateTime: 2023/12/24 14:35 -// */ -// -//public interface MetadataService extends BaseService { -// List listByPatenId(Long parentId); -// -// List listFloder(); -// -// List listDb(); -// -// List listKeyword(String keyword); -// -// MetadataVo get(Long id); -// -// void save(MetadataVo vo); -// -// void update(MetadataVo vo); -// -// void delete(Long id); -// -// void updateNeo4j(Neo4jInfo neo4jInfo); -// -// Neo4jInfo getNeo4j(); -//} +package net.srt.service; + +import net.srt.entity.MetadataEntity; +import net.srt.framework.common.cache.bean.Neo4jInfo; +import net.srt.framework.common.utils.TreeNodeVo; +import net.srt.framework.mybatis.service.BaseService; +import net.srt.vo.MetadataVO; + +import java.util.List; + +/** + * @BelongsProject: srt_cloud + * @BelongsPackage: net.srt.service + * @Author: jpz + * @CreateTime: 2023/12/24 14:35 + */ + +public interface MetadataService extends BaseService { + List listByPatenId(Long parentId); + + List listFloder(); + + List listDb(); + + List listKeyword(String keyword); + + MetadataVO get(Long id); + + void save(MetadataVO vo); + + void update(MetadataVO vo); + + void delete(Long id); + + void updateNeo4j(Neo4jInfo neo4jInfo); + + Neo4jInfo getNeo4j(); +} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/QualityConfigService.java b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityConfigService.java index 553e11e..3d89e28 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/QualityConfigService.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/QualityConfigService.java @@ -4,7 +4,7 @@ import net.srt.entity.QualityConfigEntity; import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.BaseService; import net.srt.query.QualityConfigQuery; -import net.srt.vo.QualityConfigVo; +import net.srt.vo.QualityConfigVO; import java.util.List; @@ -15,13 +15,13 @@ import java.util.List; * @CreateTime: 2023/12/24 19:33 */ public interface QualityConfigService extends BaseService { - PageResult page(QualityConfigQuery query); + PageResult page(QualityConfigQuery query); - QualityConfigVo get(Long id); + QualityConfigVO get(Long id); - void save(QualityConfigVo vo); + void save(QualityConfigVO vo); - void update(QualityConfigVo vo); + void update(QualityConfigVO vo); void online(Long id); diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java index 9dd5d33..e07adbb 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/MetadataServiceImpl.java @@ -38,7 +38,7 @@ public class MetadataServiceImpl extends BaseServiceImpl listByParentId(Long parentId) { + public List listByPatenId(Long parentId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MetadataEntity::getParentId,parentId) .orderByAsc(MetadataEntity::getOrderNo); @@ -93,9 +93,9 @@ public class MetadataServiceImpl extends BaseServiceImpl listByKeyword(String keyword) { + public List listKeyword(String keyword) { if(StringUtil.isBlank(keyword)){ - return listByParentId(0L); + return listByPatenId(0L); } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(MetadataEntity::getName,keyword) @@ -171,12 +171,12 @@ public class MetadataServiceImpl extends BaseServiceImpl implements MetadataService { -//} diff --git a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java index 785a0c7..c18f816 100644 --- a/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java +++ b/srt-cloud-data-governance/src/main/java/net/srt/service/impl/QualityConfigServiceimpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.sun.org.apache.bcel.internal.generic.LADD; import lombok.AllArgsConstructor; import net.srt.api.module.data.governance.constant.BuiltInQualityRule; import net.srt.api.module.data.governance.dto.quality.QualityConfigParam; @@ -19,8 +18,7 @@ import net.srt.framework.common.page.PageResult; import net.srt.framework.mybatis.service.impl.BaseServiceImpl; import net.srt.query.QualityConfigQuery; import net.srt.service.QualityConfigService; -import net.srt.vo.QualityConfigVo; -import org.springframework.security.core.parameters.P; +import net.srt.vo.QualityConfigVO; import org.springframework.stereotype.Service; import srt.cloud.framework.dbswitch.common.util.StringUtil; @@ -39,39 +37,39 @@ public class QualityConfigServiceimpl extends BaseServiceImpl page(QualityConfigQuery query) { + public PageResult page(QualityConfigQuery query) { IPage page=baseMapper.selectPage(getPage(query),getWrapper(query)); return new PageResult<>(QualityConfigConvert.INSTANCE.convertList(page.getRecords()),page.getTotal()); } @Override - public QualityConfigVo get(Long id) { - QualityConfigVo qualityConfigvo= QualityConfigConvert.INSTANCE.convert(baseMapper.selectById(id)); - List metadataIds=qualityConfigvo.getMetadataIds(); + public QualityConfigVO get(Long id) { + QualityConfigVO QualityConfigVO= QualityConfigConvert.INSTANCE.convert(baseMapper.selectById(id)); + List metadataIds=QualityConfigVO.getMetadataIds(); LambdaQueryWrapper metadataWrapper= Wrappers.lambdaQuery(); metadataWrapper.in(MetadataEntity::getId,metadataIds); List metadataEntities=metadataDao.selectList(metadataWrapper); if (CollectionUtils.isEmpty(metadataEntities)){ - qualityConfigvo.setMetadataStrs("检测字段已删除,请检查数据信息"); + QualityConfigVO.setMetadataStrs("检测字段已删除,请检查数据信息"); }else { - qualityConfigvo.setMetadataStrs(metadataEntities.stream().map(MetadataEntity::getPath).collect(Collectors.joining(";"))); + QualityConfigVO.setMetadataStrs(metadataEntities.stream().map(MetadataEntity::getPath).collect(Collectors.joining(";"))); } - if (BuiltInQualityRule.ASSOCIATION_CONSISTENCY.getId().equals(qualityConfigvo.getRuleId())){ - QualityConfigParam param = qualityConfigvo.getParam(); + if (BuiltInQualityRule.ASSOCIATION_CONSISTENCY.getId().equals(QualityConfigVO.getRuleId())){ + QualityConfigParam param = QualityConfigVO.getParam(); Integer columnMetaId = param.getColumnMetaId(); MetadataEntity entity = metadataDao.selectById(columnMetaId); if (entity!= null){ - qualityConfigvo.setRelMetadataStr(entity.getPath()); + QualityConfigVO.setRelMetadataStr(entity.getPath()); }else { - qualityConfigvo.setMetadataStrs("关联字段已被删除,请检查元数据信息"); + QualityConfigVO.setMetadataStrs("关联字段已被删除,请检查元数据信息"); } } - return qualityConfigvo; + return QualityConfigVO; } @Override - public void save(QualityConfigVo vo) { + public void save(QualityConfigVO vo) { QualityConfigEntity entity=QualityConfigConvert.INSTANCE.convert(vo); entity.setProjectId(getProjectId()); if (!BuiltInQualityRule.UNIQUENESS.getId().equals(entity.getRuleId())&&!BuiltInQualityRule.LENGTH_CHECK.getId().equals(entity.getRuleId())&& !BuiltInQualityRule.ASSOCIATION_CONSISTENCY.getId().equals(entity.getRuleId())&&!BuiltInQualityRule.TIMELINESS.getId().equals(entity.getRuleId())){ @@ -81,7 +79,7 @@ public class QualityConfigServiceimpl extends BaseServiceImpl> listResult(){ + public Result> listResult(@RequestParam String t){ List dispositionVos=dataProductionService.dataTreeList(); return Result.ok(dispositionVos); } @PostMapping - public Result add(@RequestBody DataProductionTreeDto dataProductionTreeDto){ + public Result add(@RequestBody DataProductionTreeDto dataProductionTreeDto){ dataProductionService.add(dataProductionTreeDto); return Result.ok(); } diff --git a/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java b/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java index 15c512c..0b1c1b8 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java +++ b/srt-data-development/src/main/java/net/srt/disposition/mapper/DataProductionMapper.java @@ -2,6 +2,8 @@ package net.srt.disposition.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import net.srt.disposition.entity.DataProductionTreeEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface DataProductionMapper extends BaseMapper { } diff --git a/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java b/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java index cc3cb28..d7cf138 100644 --- a/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java +++ b/srt-data-development/src/main/java/net/srt/disposition/mapper/DispositionMapper.java @@ -2,6 +2,8 @@ package net.srt.disposition.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import net.srt.disposition.entity.DispositionEntity; +import org.apache.ibatis.annotations.Mapper; +@Mapper public interface DispositionMapper extends BaseMapper { } diff --git a/srt-data-development/src/main/resources/auth.yml b/srt-data-development/src/main/resources/auth.yml index 0e6a006..2d05014 100644 --- a/srt-data-development/src/main/resources/auth.yml +++ b/srt-data-development/src/main/resources/auth.yml @@ -1,7 +1,3 @@ auth: ignore_urls: - - /auth/captcha - - /auth/login - - /auth/send/code - - /auth/mobile - - /upload/** \ No newline at end of file + - /data-development/**