diff --git a/pom.xml b/pom.xml index fc9854e1b2573447d2f560b69a0c3e23a791d26d..237718e2a49a05f52a9b6d769b24d5808fa0a64c 100644 --- a/pom.xml +++ b/pom.xml @@ -247,4 +247,17 @@ + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 21 + 21 + + + + \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSourceController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSourceController.java new file mode 100644 index 0000000000000000000000000000000000000000..e500a260f9530f1dafc0bf1a520ede97f7d52f75 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSourceController.java @@ -0,0 +1,65 @@ +package com.ediagnosis.cdr.dataIntegration; + +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; +import com.ediagnosis.cdr.context.values.Response; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceQueryDTO; +import com.ediagnosis.cdr.dataIntegration.inner.BizSourceRepository; +import com.ediagnosis.cdr.dataIntegration.value.BizDataSourceVo; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSourceAddOrUpdateParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSourceQueryParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemDeleteParam; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author monojun + * @description 数据源 + * @createTime 2025年08月06日 + */ +@RestController +@RequestMapping("/bizSource") +@RequiredArgsConstructor +public class BizSourceController { + + private final BizSourceRepository sourceRepository; + + + @PostMapping("/addOrUpdate") + public Response addOrUpdate(@RequestBody BizSourceAddOrUpdateParam addOrUpdateParam) { + BizDataSourceDTO addDTO = new BizDataSourceDTO(); + BeanUtils.copyProperties(addOrUpdateParam, addDTO); + Integer id = sourceRepository.addDataSource(addDTO); + return Response.success(id); + } + + + @PostMapping("/page") + public Response> page(@RequestBody BizSourceQueryParam queryParam) { + BizDataSourceQueryDTO queryDTO = new BizDataSourceQueryDTO(); + BeanUtils.copyProperties(queryParam, queryDTO); + Page dataSystemPage = sourceRepository.queryPage(queryDTO); + PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { + BizDataSourceVo vo = new BizDataSourceVo(); + BeanUtils.copyProperties(dataSystem, vo); + return vo; + }); + return Response.success(systemVoPageInfo); + } + + + @PostMapping("/delete") + public Response> delete(@RequestBody BizSystemDeleteParam deleteParam) { + sourceRepository.deleteDataSource(deleteParam.getIds()); + return Response.success(deleteParam.getIds()); + } + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSystemController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSystemController.java new file mode 100644 index 0000000000000000000000000000000000000000..339e3fff5cf82b3e8b8adb96262c2afda9a58388 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizSystemController.java @@ -0,0 +1,67 @@ +package com.ediagnosis.cdr.dataIntegration; + +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; + +import com.ediagnosis.cdr.context.values.Response; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem; +import com.ediagnosis.cdr.dataIntegration.inner.BizSystemRepository; +import com.ediagnosis.cdr.dataIntegration.value.BizSystemVo; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemAddOrUpdateParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemDeleteParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemQueryParam; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author monojun + * @description 业务系统 + * @createTime 2025年08月06日 + */ +@RestController +@RequestMapping("/bizSystem") +@RequiredArgsConstructor +public class BizSystemController { + + private final BizSystemRepository systemRepository; + + @PostMapping("/addOrUpdate") + public Response addOrUpdate(@RequestBody BizSystemAddOrUpdateParam addOrUpdateParam) { + BizSystemDTO addDTO = new BizSystemDTO(); + BeanUtils.copyProperties(addOrUpdateParam, addDTO); + Integer id = systemRepository.addBizSystem(addDTO); + return Response.success(id); + } + + + @PostMapping("/page") + public Response> page(@RequestBody BizSystemQueryParam queryParam) { + BizSystemQueryDTO queryDTO = new BizSystemQueryDTO(); + BeanUtils.copyProperties(queryParam, queryDTO); + Page dataSystemPage = systemRepository.queryPage(queryDTO); + PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { + BizSystemVo vo = new BizSystemVo(); + BeanUtils.copyProperties(dataSystem, vo); + return vo; + }); + return Response.success(systemVoPageInfo); + } + + + @PostMapping("/delete") + public Response> delete(@RequestBody BizSystemDeleteParam deleteParam) { + systemRepository.deleteDataSystem(deleteParam.getIds()); + return Response.success(deleteParam.getIds()); + } + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableController.java new file mode 100644 index 0000000000000000000000000000000000000000..36d398d5d6f7f77c2deb5880b768df56cc99e281 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableController.java @@ -0,0 +1,63 @@ +package com.ediagnosis.cdr.dataIntegration; + +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; +import com.ediagnosis.cdr.context.values.Response; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableQueryDTO; +import com.ediagnosis.cdr.dataIntegration.inner.BizTableRepository; +import com.ediagnosis.cdr.dataIntegration.value.BizTableVo; +import com.ediagnosis.cdr.dataIntegration.value.param.BizTableAddOrUpdateParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizTableDeleteParam; +import com.ediagnosis.cdr.dataIntegration.value.param.BizTableQueryParam; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author monojun + * @description 源数据表controller + * @createTime 2025年08月06日 + */ +@RestController +@RequestMapping("/bizTable") +@RequiredArgsConstructor +public class BizTableController { + + private final BizTableRepository tableRepository; + + @PostMapping("/addOrUpdate") + public Response addOrUpdate(@RequestBody BizTableAddOrUpdateParam addOrUpdateParam) { + BizTableDTO addDTO = new BizTableDTO(); + BeanUtils.copyProperties(addOrUpdateParam, addDTO); + Integer id = tableRepository.addOrUpdateDataTable(addDTO); + return Response.success(id); + } + + + @PostMapping("/page") + public Response> page(@RequestBody BizTableQueryParam queryParam) { + BizTableQueryDTO queryDTO = new BizTableQueryDTO(); + BeanUtils.copyProperties(queryParam, queryDTO); + Page dataSystemPage = tableRepository.queryPage(queryDTO); + PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataTableDTO -> { + BizTableVo vo = new BizTableVo(); + BeanUtils.copyProperties(dataTableDTO, vo); + return vo; + }); + return Response.success(systemVoPageInfo); + } + + + @PostMapping("/delete") + public Response> delete(@RequestBody BizTableDeleteParam deleteParam) { + tableRepository.deleteDataSystem(deleteParam.getIds()); + return Response.success(deleteParam.getIds()); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableFieldController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableFieldController.java new file mode 100644 index 0000000000000000000000000000000000000000..921af648c378753fbb5b4a500a4a925f748ab9de --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableFieldController.java @@ -0,0 +1,46 @@ +package com.ediagnosis.cdr.dataIntegration; + + +import com.ediagnosis.cdr.context.PageConvertUtils; +import com.ediagnosis.cdr.context.values.PageVo; +import com.ediagnosis.cdr.context.values.Response; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDefinitionQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition; +import com.ediagnosis.cdr.dataIntegration.inner.BizTableDefinitionRepository; +import com.ediagnosis.cdr.dataIntegration.value.BizTableFieldVo; +import com.ediagnosis.cdr.dataIntegration.value.param.BizTableDefinitionQueryParam; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author monojun + * @description 数据表字段定义 + * @createTime 2025年08月06日 + */ +@RestController +@RequestMapping("/tableField") +@RequiredArgsConstructor +public class BizTableFieldController { + + private final BizTableDefinitionRepository definitionRepository; + + @PostMapping("/page") + public Response> page(@RequestBody BizTableDefinitionQueryParam queryParam) { + BizTableDefinitionQueryDTO queryDTO = new BizTableDefinitionQueryDTO(); + BeanUtils.copyProperties(queryParam, queryDTO); + Page dataTableFieldPage = definitionRepository.queryPage(queryDTO); + PageVo tableFieldVoPageInfo = PageConvertUtils.copyPageInfo(dataTableFieldPage, dataTableField -> { + BizTableFieldVo vo = new BizTableFieldVo(); + BeanUtils.copyProperties(dataTableField, vo); + return vo; + }); + return Response.success(tableFieldVoPageInfo); + } + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java deleted file mode 100644 index b1a99b059f113b0b75f21491c6c711aacd1acdea..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration; - - -import com.ediagnosis.cdr.context.values.Response; -import com.ediagnosis.cdr.dataIntegration.dao.dto.*; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSourceQueryParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataTableFieldQueryParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataTableQueryParam; -import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSourceVo; -import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableFieldVo; -import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableVo; -import com.ediagnosis.cdr.dataIntegration.inner.BusinessDataRepository; -import com.ediagnosis.cdr.context.PageConvertUtils; -import com.ediagnosis.cdr.context.values.PageVo; - -import com.mybatisflex.core.paginate.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author monojun - * @description 业务系统controller - * @createTime 2025年08月04日 - */ -@RestController -@RequiredArgsConstructor -public class BusinessDataController { - - private final BusinessDataRepository dataRepository; - - - @PostMapping("/dataSource/page") - public Response> page(@RequestBody DataSourceQueryParam queryParam) { - BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSourcePage = dataRepository.querySourcePage(queryDTO); - PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSourcePage, dataSourceDTO -> { - BusinessDataSourceVo vo = new BusinessDataSourceVo(); - BeanUtils.copyProperties(dataSourceDTO, vo); - vo.setBizSystemId(dataSourceDTO.getBusinessId()); - vo.setBizSystemName(dataSourceDTO.getBusinessName()); - return vo; - }); - return Response.success(systemVoPageInfo); - } - - @PostMapping("/dataTable/page") - public Response> page(@RequestBody DataTableQueryParam queryParam) { - BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataTablePage = dataRepository.queryTablePage(queryDTO); - PageVo dataTableVoPageInfo = PageConvertUtils.copyPageInfo(dataTablePage, dataTable -> { - BusinessDataTableVo vo = new BusinessDataTableVo(); - BeanUtils.copyProperties(dataTable, vo); - return vo; - }); - return Response.success(dataTableVoPageInfo); - } - - @PostMapping("/dataTableField/page") - public Response> page(@RequestBody DataTableFieldQueryParam queryParam) { - BusinessDataTableFieldQueryDTO queryDTO = new BusinessDataTableFieldQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataTableFieldPage = dataRepository.queryFieldPage(queryDTO); - PageVo tableFieldVoPageInfo = PageConvertUtils.copyPageInfo(dataTableFieldPage, dataTableField -> { - BusinessDataTableFieldVo vo = new BusinessDataTableFieldVo(); - BeanUtils.copyProperties(dataTableField, vo); - return vo; - }); - return Response.success(tableFieldVoPageInfo); - } - - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java deleted file mode 100644 index a90106bbab70557eeddf8107a0baff18150d289d..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration; - -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam; -import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo; -import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository; -import com.ediagnosis.cdr.context.PageConvertUtils; -import com.ediagnosis.cdr.context.values.PageVo; -import com.ediagnosis.cdr.value.Response; -import com.mybatisflex.core.paginate.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author monojun - * @description TODO - * @createTime 2025年08月05日 - */ -@RestController -@RequestMapping("/dataSource") -@RequiredArgsConstructor -public class BusinessSourceController { - - private final BusinessSystemRepository systemRepository; - - - @PostMapping("/add") - public Response page(@RequestBody DataSystemAddParam addParam) { - BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); - BeanUtils.copyProperties(addParam, addDTO); - Long id = systemRepository.addDataSystem(addDTO); - return Response.success(id); - } - - @PostMapping("/update") - public Response update(@RequestBody DataSystemUpdateParam updateParam) { - BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); - BeanUtils.copyProperties(updateParam, addDTO); - Long id = systemRepository.updateDataSystem(addDTO); - return Response.success(id); - } - - - @PostMapping("/page") - public Response> page(@RequestBody DataSystemQueryParam queryParam) { - BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSystemPage = systemRepository.queryPage(queryDTO); - PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { - BusinessDataSystemVo vo = new BusinessDataSystemVo(); - BeanUtils.copyProperties(dataSystem, vo); - return vo; - }); - return Response.success(systemVoPageInfo); - } - - - @PostMapping("/delete") - public Response delete(@RequestBody DataSystemDeleteParam deleteParam) { - systemRepository.deleteDataSystem(deleteParam.getId()); - return Response.success(deleteParam.getId()); - } - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java deleted file mode 100644 index de1e61a3191fabd451d79c4a0da20fd26224a05d..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration; - -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam; -import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam; -import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo; -import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository; -import com.ediagnosis.cdr.context.PageConvertUtils; -import com.ediagnosis.cdr.context.values.PageVo; -import com.ediagnosis.cdr.value.Response; -import com.mybatisflex.core.paginate.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author monojun - * @description 业务系统controller - * @createTime 2025年08月04日 - */ -@RestController -@RequestMapping("/bizSystem") -@RequiredArgsConstructor -public class BusinessSystemController { - - private final BusinessSystemRepository systemRepository; - - - @PostMapping("/add") - public Response page(@RequestBody DataSystemAddParam addParam) { - BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); - BeanUtils.copyProperties(addParam, addDTO); - Long id = systemRepository.addDataSystem(addDTO); - return Response.success(id); - } - - @PostMapping("/update") - public Response update(@RequestBody DataSystemUpdateParam updateParam) { - BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); - BeanUtils.copyProperties(updateParam, addDTO); - Long id = systemRepository.updateDataSystem(addDTO); - return Response.success(id); - } - - - @PostMapping("/page") - public Response> page(@RequestBody DataSystemQueryParam queryParam) { - BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSystemPage = systemRepository.queryPage(queryDTO); - PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { - BusinessDataSystemVo vo = new BusinessDataSystemVo(); - BeanUtils.copyProperties(dataSystem, vo); - return vo; - }); - return Response.success(systemVoPageInfo); - } - - - @PostMapping("/delete") - public Response delete(@RequestBody DataSystemDeleteParam deleteParam) { - systemRepository.deleteDataSystem(deleteParam.getId()); - return Response.success(deleteParam.getId()); - } - - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java deleted file mode 100644 index 2e217c32c4d644b288d4e8e9669ab15b340733a3..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration; - -/** - * @author monojun - * @description TODO - * @createTime 2025年08月05日 - */ -public class BusinessTableController { -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BizDataDao.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BizDataDao.java new file mode 100644 index 0000000000000000000000000000000000000000..df7b3ab77947bd0e4c4d9de5815bcfab7bfa2ee2 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BizDataDao.java @@ -0,0 +1,208 @@ +package com.ediagnosis.cdr.dataIntegration.dao; + +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizDataSource; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTable; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizDataSourceMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizSystemMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableDefinitionMapper; +import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableMapper; +import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; +import lombok.RequiredArgsConstructor; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.List; + +/** + * @author monojun + * @description 业务dao + * @createTime 2025年08月06日 + */ +@Component +@RequiredArgsConstructor +public class BizDataDao { + + private final BizSystemMapper systemMapper; + + private final BizDataSourceMapper dataSourceMapper; + + private final BizTableMapper tableMapper; + + private final BizTableDefinitionMapper tableDefinitionMapper; + + /** + * 新增or更新业务系统 + * + * @param bizSystemDTO 业务系统dto + * @return 业务系统主键id + */ + public Integer addOrUpdateBizSystem(BizSystemDTO bizSystemDTO) { + BizSystem bizSystem = new BizSystem(); + BeanUtils.copyProperties(bizSystemDTO, bizSystem); + bizSystem.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + systemMapper.insertOrUpdate(bizSystem); + return bizSystem.getId(); + } + + /** + * 删除业务系统 + * + * @param dataSystemIds 业务系统id列表 + */ + public void deleteBatchBizSystem(List dataSystemIds) { + systemMapper.deleteBatchByIds(dataSystemIds); + } + + /** + * 分页查询业务系统信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page querySystemPage(BizSystemQueryDTO queryDTO) { + QueryWrapper queryWrapper = QueryWrapper.create(); + if (StringUtils.hasText(queryDTO.getName())) { + queryWrapper.like(BizSystem::getName, queryDTO.getName()); + } + queryWrapper.orderBy(BizSystem::getUpdateTime, false); + queryWrapper.orderBy(BizSystem::getId, false); + return systemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); + } + + /** + * 新增or更新业务数据源 + * + * @param dataSourceDTO dataSourceDTO + * @return 数据源主键id + */ + public Integer addOrUpdateDataSource(BizDataSourceDTO dataSourceDTO) { + BizDataSource dataSource = new BizDataSource(); + BeanUtils.copyProperties(dataSourceDTO, dataSource); + dataSource.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + dataSourceMapper.insertOrUpdate(dataSource); + return dataSource.getId(); + } + + + /** + * 删除数据源 + * + * @param dataSourceIds 数据源id列表 + */ + public void deleteBatchDataSource(List dataSourceIds) { + dataSourceMapper.deleteBatchByIds(dataSourceIds); + } + + /** + * 分页查询业务数据源信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page querySourcePage(BizDataSourceQueryDTO queryDTO) { + QueryWrapper queryWrapper = QueryWrapper.create() + .select("d.*", "ds.name as bizSystemName") + .from(BizDataSource.class).as("d") + .leftJoin(BizSystem.class).as("ds") + .on(BizDataSource::getBizSystemId, BizSystem::getId) + .orderBy(BizDataSource::getUpdateTime, false) + .orderBy(BizDataSource::getId, false); + if (!CollectionUtils.isEmpty(queryDTO.getBizSystemIds())) { + queryWrapper.in(BizDataSource::getBizSystemId, queryDTO.getBizSystemIds()); + } + if (StringUtils.hasText(queryDTO.getName())) { + queryWrapper.like(BizDataSource::getName, queryDTO.getName()); + } + if (StringUtils.hasText(queryDTO.getIp())) { + queryWrapper.like(BizDataSource::getIp, queryDTO.getIp()); + } + if (StringUtils.hasText(queryDTO.getType())) { + queryWrapper.eq(BizDataSource::getType, queryDTO.getType()); + } + return dataSourceMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BizDataSourceDTO.class); + } + + /** + * 新增or更新业务表信息 + * + * @param tableDTO tableDTO + * @return 数据表主键id + */ + public Integer addOrUpdateDataTable(BizTableDTO tableDTO) { + BizTable bizTable = new BizTable(); + BeanUtils.copyProperties(tableDTO, bizTable); + bizTable.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + tableMapper.insertOrUpdate(bizTable); + return bizTable.getId(); + } + + + /** + * 删除业务表信息 + * + * @param dataTableIds 业务表id列表 + */ + public void deleteBatchDataTable(List dataTableIds) { + tableMapper.deleteBatchByIds(dataTableIds); + } + + /** + * 分页查询业务表信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryTablePage(BizTableQueryDTO queryDTO) { + QueryWrapper queryWrapper = QueryWrapper.create() + .select("t.*, d.id as bizDataSourceId, d.name as bizDataSourceName, ds.id as bizSystemId, ds.name as bizSystemName") + .from(BizTable.class).as("t") + .leftJoin(BizDataSource.class).as("d") + .on(BizTable::getBizDataSourceId, BizDataSource::getId) + .leftJoin(BizSystem.class).as("ds") + .on(BizTable::getBizSystemId, BizSystem::getId) + .orderBy(BizTable::getUpdateTime, false) + .orderBy(BizTable::getId, false); + if (!CollectionUtils.isEmpty(queryDTO.getBizSystemIds())) { + queryWrapper.in(BizTable::getBizSystemId, queryDTO.getBizSystemIds()); + } + if (!CollectionUtils.isEmpty(queryDTO.getBizDataSourceIds())) { + queryWrapper.in(BizTable::getBizDataSourceId, queryDTO.getBizDataSourceIds()); + } + if (StringUtils.hasText(queryDTO.getTableName())) { + queryWrapper.like(BizTable::getTableName, queryDTO.getTableName()); + } + if (StringUtils.hasText(queryDTO.getTableCode())) { + queryWrapper.like(BizTable::getTableCode, queryDTO.getTableCode()); + } + return tableMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BizTableDTO.class); + } + + /** + * 分页查询业务表字段信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryFieldPage(BizTableDefinitionQueryDTO queryDTO) { + QueryWrapper queryWrapper = QueryWrapper.create(); + if (StringUtils.hasText(queryDTO.getFieldName())) { + queryWrapper.like(BizTableDefinition::getFieldName, queryDTO.getFieldName()); + } + if (StringUtils.hasText(queryDTO.getFieldType())) { + queryWrapper.eq(BizTableDefinition::getFieldType, queryDTO.getFieldType()); + } + if (queryDTO.getTableId() != null) { + queryWrapper.eq(BizTableDefinition::getTableId, queryDTO.getTableId()); + } + queryWrapper.orderBy(BizTableDefinition::getId, false); + return tableDefinitionMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java deleted file mode 100644 index d4d7f3019a2bfd6a5fa3392f60266746f22910bc..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.dao; - - -import com.ediagnosis.cdr.dataCollect.dao.dto.*; -import com.ediagnosis.cdr.dataIntegration.dao.dto.*; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper; -import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSystemMapper; -import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableFieldMapper; -import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableMapper; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import lombok.RequiredArgsConstructor; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.Date; - -/** - * @author monojun - * @description 业务dao - * @createTime 2025年08月04日 - */ -@Component -@RequiredArgsConstructor -public class BusinessDataDao { - - private final BusinessDataSystemMapper dataSystemMapper; - - private final BusinessDataSourceMapper dataSourceMapper; - - private final BusinessDataTableMapper dataTableMapper; - - private final BusinessDataTableFieldMapper dataTableFieldMapper; - - /** - * 新增业务系统 - * - * @param dataSystemDTO dataSystemDTO - * @return 业务系统主键id - */ - public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) { - BusinessDataSystem dataSystem = new BusinessDataSystem(); - BeanUtils.copyProperties(dataSystemDTO, dataSystem); - dataSystem.setCreateTime(new Date()); - dataSystem.setUpdateTime(new Date()); - dataSystemMapper.insert(dataSystem); - return dataSystem.getId(); - } - - /** - * 更新业务系统 - * - * @param dataSystemDTO dataSystemDTO - * @return 业务系统主键id - */ - public Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO) { - BusinessDataSystem dataSystem = new BusinessDataSystem(); - BeanUtils.copyProperties(dataSystemDTO, dataSystem); - dataSystem.setUpdateTime(new Date()); - dataSystemMapper.update(dataSystem); - return dataSystem.getId(); - } - - /** - * 删除业务系统 - * - * @param dataSystemId 业务系统id - */ - public void deleteDataSystem(Long dataSystemId) { - dataSystemMapper.deleteById(dataSystemId); - } - - /** - * 分页查询业务系统信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page querySystemPage(BusinessDataSystemQueryDTO queryDTO) { - QueryWrapper queryWrapper = QueryWrapper.create(); - if (StringUtils.hasText(queryDTO.getName())) { - queryWrapper.like(BusinessDataSystem::getName, queryDTO.getName()); - } - queryWrapper.orderBy(BusinessDataSystem::getUpdateTime, false); - queryWrapper.orderBy(BusinessDataSystem::getId, false); - return dataSystemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); - } - - /** - * 分页查询业务数据源信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page querySourcePage(BusinessDataSourceQueryDTO queryDTO) { - QueryWrapper queryWrapper = QueryWrapper.create() - .select("d.*", "ds.name as businessName") - .from(BusinessDataSource.class).as("d") - .leftJoin(BusinessDataSystem.class).as("ds") - .on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId) - .orderBy(BusinessDataSource::getUpdateTime, false) - .orderBy(BusinessDataSource::getId, false); - if (!CollectionUtils.isEmpty(queryDTO.getBusinessIds())) { - queryWrapper.in(BusinessDataSource::getBusinessId, queryDTO.getBusinessIds()); - } - if (StringUtils.hasText(queryDTO.getName())) { - queryWrapper.like(BusinessDataSource::getName, queryDTO.getName()); - } - if (StringUtils.hasText(queryDTO.getIpAddress())) { - queryWrapper.like(BusinessDataSource::getIpAddress, queryDTO.getIpAddress()); - } - if (StringUtils.hasText(queryDTO.getType())) { - queryWrapper.eq(BusinessDataSource::getType, queryDTO.getType()); - } - if (queryDTO.getStatus() != null) { - queryWrapper.eq(BusinessDataSource::getStatus, queryDTO.getStatus()); - } - return dataSourceMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BusinessDataSourceDTO.class); - } - - /** - * 分页查询业务表信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryTablePage(BusinessDataTableQueryDTO queryDTO) { - QueryWrapper queryWrapper = QueryWrapper.create() - .select("t.*, d.id as sourceId, d.name as sourceName, ds.id as businessId, ds.name as businessName") - .from(BusinessDataTable.class).as("t") - .leftJoin(BusinessDataSource.class).as("d") - .on(BusinessDataTable::getSourceId, BusinessDataSource::getId) - .leftJoin(BusinessDataSystem.class).as("ds") - .on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId) - .orderBy(BusinessDataTable::getUpdateTime, false) - .orderBy(BusinessDataTable::getId, false); - if (StringUtils.hasText(queryDTO.getName())) { - queryWrapper.like(BusinessDataTable::getName, queryDTO.getName()); - } - if (!CollectionUtils.isEmpty(queryDTO.getBusinessIds())) { - queryWrapper.in(BusinessDataTable::getBusinessId, queryDTO.getBusinessIds()); - } - if (!CollectionUtils.isEmpty(queryDTO.getSourceIds())) { - queryWrapper.in(BusinessDataTable::getSourceId, queryDTO.getSourceIds()); - } - if (StringUtils.hasText(queryDTO.getTableNo())) { - queryWrapper.like(BusinessDataTable::getTableNo, queryDTO.getTableNo()); - } - return dataTableMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BusinessDataTableDTO.class); - } - - /** - * 分页查询业务表字段信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryFieldPage(BusinessDataTableFieldQueryDTO queryDTO) { - QueryWrapper queryWrapper = QueryWrapper.create(); - if (StringUtils.hasText(queryDTO.getFieldName())) { - queryWrapper.like(BusinessDataTableField::getFieldName, queryDTO.getFieldName()); - } - if (StringUtils.hasText(queryDTO.getFieldType())) { - queryWrapper.like(BusinessDataTableField::getFieldType, queryDTO.getFieldType()); - } - if (queryDTO.getTableId() != null) { - queryWrapper.eq(BusinessDataTableField::getTableId, queryDTO.getTableId()); - } - queryWrapper.orderBy(BusinessDataTableField::getUpdateTime, false); - queryWrapper.orderBy(BusinessDataTableField::getId, false); - return dataTableFieldMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); - } - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceDTO.java similarity index 59% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceDTO.java index d2da22e7a69e0a0bb4b10f3abc876c0b145aed3a..0511059d75d1b6165b8d127ef828880c160eb865 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun @@ -12,14 +11,14 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataSourceDTO implements Serializable { +public class BizDataSourceDTO implements Serializable { @Serial private static final long serialVersionUID = -447329639545048136L; /** * 主键id */ - private Long id; + private Integer id; /** * 数据源名称 @@ -34,52 +33,31 @@ public class BusinessDataSourceDTO implements Serializable { /** * IP地址 */ - private String ipAddress; + private String ip; /** * 属性信息 */ private String properties; - /** - * 业务系统id - */ - private Long businessId; - - /** - * 业务系统名称 - */ - private String businessName; - /** * 描述 */ private String description; /** - * 连接状态: 0-未知 1-已连接 2-未连接 - */ - private Integer status; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 + * 更新时间 */ - private Long createUserId; + private String updateTime; /** - * 更新时间 + * 业务系统id */ - private Date updateTime; + private Integer bizSystemId; /** - * 更新人 + * 业务系统名称 */ - private Long updateUserId; - + private String bizSystemName; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceQueryDTO.java similarity index 84% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceQueryDTO.java index 486afe768440bf4a3ed7de1584340afa334b4305..ff04a4c4a428defc23b0f0eb7ee43d1d39ec7474 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceQueryDTO.java @@ -12,14 +12,14 @@ import java.util.List; * @createTime 2025年07月31日 */ @Data -public class BusinessDataSourceQueryDTO extends PageQuery { +public class BizDataSourceQueryDTO extends PageQuery { @Serial private static final long serialVersionUID = 4373837873599613512L; /** * 业务系统id列表 */ - private List businessIds; + private List bizSystemIds; /** * 数据源名称 @@ -29,7 +29,7 @@ public class BusinessDataSourceQueryDTO extends PageQuery { /** * ip地址 */ - private String ipAddress; + private String ip; /** * 数据源类型 diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemDTO.java similarity index 63% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemDTO.java index a811f0230c88580b06946e66a12aad485f5eb105..60e64937ab778a8c5a17649796af1b6d7f259746 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemDTO.java @@ -12,14 +12,14 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataSystemDTO implements Serializable { +public class BizSystemDTO implements Serializable { @Serial private static final long serialVersionUID = 8024021126762424795L; /** * 主键id */ - private Long id; + private Integer id; /** * 业务系统名称 @@ -31,23 +31,8 @@ public class BusinessDataSystemDTO implements Serializable { */ private String description; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 - */ - private Long createUserId; - /** * 更新时间 */ - private Date updateTime; - - /** - * 更新人 - */ - private Long updateUserId; + private String updateTime; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemQueryDTO.java similarity index 51% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemQueryDTO.java index 438c0b67d7f4b28508684ab2c5fcb98b0d5fc4c9..74ac82e4cfccc8c1afb7aa29966f38dd63ff1125 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemQueryDTO.java @@ -3,19 +3,20 @@ package com.ediagnosis.cdr.dataIntegration.dao.dto; import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; import lombok.Data; +import java.io.Serial; + /** * @author monojun - * @description 业务系统查询参数 - * @createTime 2025年07月31日 + * @description 业务系统查询dto + * @createTime 2025年08月06日 */ @Data -public class BusinessDataSystemQueryDTO extends PageQuery { - private static final long serialVersionUID = -725393158125223566L; +public class BizSystemQueryDTO extends PageQuery { + @Serial + private static final long serialVersionUID = -5610198422339477569L; /** * 业务系统名称 */ private String name; - - } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDTO.java similarity index 56% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDTO.java index dd83db357bbb0719f433ac2c3e9977ca43c98594..3ec3a87451412ca9c6d9661b8feae0815452dd7b 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun @@ -12,68 +11,52 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataTableDTO implements Serializable { +public class BizTableDTO implements Serializable { @Serial private static final long serialVersionUID = -1723613352839697417L; /** * 主键id */ - private Long id; + private Integer id; /** * 业务表名称 */ - private String name; + private String tableName; /** - * 业务表编号 + * 业务表编码 */ - private String tableNo; + private String tableCode; /** * 业务系统id */ - private Long businessId; + private Integer bizSystemId; /** * 业务系统名称 */ - private String businessName; + private String bizSystemName; /** * 业务数据源id */ - private Long sourceId; + private Integer bizDataSourceId; /** * 业务数据源名称 */ - private String sourceName; + private String bizDataSourceName; /** * 描述 */ private String description; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 - */ - private Long createUserId; - /** * 更新时间 */ - private Date updateTime; - - /** - * 更新人 - */ - private Long updateUserId; - + private String updateTime; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDefinitionQueryDTO.java similarity index 79% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDefinitionQueryDTO.java index 60f8ba8e818339e5a47723da4d61386b60000299..ac152b69300b0c8fce632ec78ca4f2e93ffd75db 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDefinitionQueryDTO.java @@ -1,6 +1,7 @@ package com.ediagnosis.cdr.dataIntegration.dao.dto; import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery; +import com.mybatisflex.annotation.Column; import lombok.Data; import java.io.Serial; @@ -11,7 +12,7 @@ import java.io.Serial; * @createTime 2025年07月31日 */ @Data -public class BusinessDataTableFieldQueryDTO extends PageQuery { +public class BizTableDefinitionQueryDTO extends PageQuery { @Serial private static final long serialVersionUID = -7409716170936124466L; @@ -28,5 +29,5 @@ public class BusinessDataTableFieldQueryDTO extends PageQuery { /** * 业务表id */ - private Long tableId; + private Integer tableId; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableQueryDTO.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableQueryDTO.java index 81c006fbfc5d634cc5f574c4dbdd52ef4bb9a888..c396141404ec4427480587285711cbd5f439ea0c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableQueryDTO.java @@ -12,27 +12,28 @@ import java.util.List; * @createTime 2025年07月31日 */ @Data -public class BusinessDataTableQueryDTO extends PageQuery { +public class BizTableQueryDTO extends PageQuery { @Serial private static final long serialVersionUID = 2568845339056229745L; /** * 业务系统id */ - private List businessIds; + private List bizSystemIds; /** * 业务数据源id列表 */ - private List sourceIds; + private List bizDataSourceIds; + /** * 业务表名称 */ - private String name; + private String tableName; /** * 业务表编号 */ - private String tableNo; + private String tableCode; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizDataSource.java similarity index 51% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizDataSource.java index 94252dc2faa51637c434efc8899a72f7d19f1401..4e1fad61267158844be20f8c9c38629eb0485c32 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizDataSource.java @@ -6,26 +6,23 @@ import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.Data; -import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun * @description 业务系统数据源表 - * @createTime 2025年08月01日 + * @createTime 2025年08月06日 */ @Data -@Table(value = "business_data_source") -public class BusinessDataSource implements Serializable { - @Serial +@Table(value = "biz_data_source") +public class BizDataSource implements Serializable { private static final long serialVersionUID = 1L; /** * 主键id */ @Id(value = "id", keyType = KeyType.Auto) - private Long id; + private Integer id; /** * 数据源名称 @@ -42,8 +39,8 @@ public class BusinessDataSource implements Serializable { /** * IP地址 */ - @Column(value = "ip_address") - private String ipAddress; + @Column(value = "ip") + private String ip; /** * 属性信息 @@ -54,8 +51,8 @@ public class BusinessDataSource implements Serializable { /** * 业务系统id */ - @Column(value = "business_id") - private Long businessId; + @Column(value = "biz_system_id") + private Integer bizSystemId; /** * 描述 @@ -63,39 +60,9 @@ public class BusinessDataSource implements Serializable { @Column(value = "description") private String description; - /** - * 连接状态: 0-未知 1-已连接 2-未连接 - */ - @Column(value = "status") - private Integer status; - - /** - * 创建时间 - */ - @Column(value = "create_time") - private Date createTime; - - /** - * 创建人 - */ - @Column(value = "create_user_id") - private Long createUserId; - /** * 更新时间 */ @Column(value = "update_time") - private Date updateTime; - - /** - * 更新人 - */ - @Column(value = "update_user_id") - private Long updateUserId; - - /** - * 是否删除: 0-未删除 1-已删除 - */ - @Column(value = "is_deleted", isLogicDelete = true) - private Integer isDeleted; + private String updateTime; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizSystem.java similarity index 50% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizSystem.java index d98419e072269df2a047db740bb98d3df4f1f15a..3615a85538627fefdbc84639d39c5ed1e8d52520 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizSystem.java @@ -1,26 +1,28 @@ package com.ediagnosis.cdr.dataIntegration.dao.entity; +import java.io.Serializable; + import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.Data; -import java.util.Date; - /** * @author monojun * @description 业务系统表 - * @createTime 2025年08月01日 + * @createTime 2025年08月06日 */ @Data -@Table("business_data_system") -public class BusinessDataSystem { +@Table(value = "biz_system") +public class BizSystem implements Serializable { + private static final long serialVersionUID = 1L; + /** * 主键id */ @Id(value = "id", keyType = KeyType.Auto) - private Long id; + private Integer id; /** * 业务系统名称 @@ -34,33 +36,9 @@ public class BusinessDataSystem { @Column(value = "description") private String description; - /** - * 创建时间 - */ - @Column(value = "create_time") - private Date createTime; - - /** - * 创建人 - */ - @Column(value = "create_user_id") - private Long createUserId; - /** * 更新时间 */ @Column(value = "update_time") - private Date updateTime; - - /** - * 更新人 - */ - @Column(value = "update_user_id") - private Long updateUserId; - - /** - * 是否删除 0-未删除 1-已删除 - */ - @Column(value = "is_deleted", isLogicDelete = true) - private Integer isDeleted; + private String updateTime; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTable.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTable.java new file mode 100644 index 0000000000000000000000000000000000000000..aaec48e7626042f61899d7fea834d486471a81cb --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTable.java @@ -0,0 +1,62 @@ +package com.ediagnosis.cdr.dataIntegration.dao.entity; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import com.mybatisflex.annotation.Table; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author monojun + * @description 业务表信息表 + * @createTime 2025年08月06日 + */ +@Data +@Table(value = "biz_table") +public class BizTable implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @Id(value = "id", keyType = KeyType.Auto) + private Integer id; + + /** + * 业务表名称 + */ + @Column(value = "table_name") + private String tableName; + + /** + * 业务表编码 + */ + @Column(value = "table_code") + private String tableCode; + + /** + * 业务系统id + */ + @Column(value = "biz_system_id") + private Integer bizSystemId; + + /** + * 业务数据源id + */ + @Column(value = "biz_data_source_id") + private Integer bizDataSourceId; + + /** + * 描述 + */ + @Column(value = "description") + private String description; + + /** + * 更新时间 + */ + @Column(value = "update_time") + private String updateTime; +} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTableDefinition.java similarity index 51% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTableDefinition.java index 2beac5575c16ac8d5eaee28471cbc8c367763209..6f85b7316dd60eda5ebda6f569c028d9721b5b15 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTableDefinition.java @@ -6,26 +6,23 @@ import com.mybatisflex.annotation.KeyType; import com.mybatisflex.annotation.Table; import lombok.Data; -import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun * @description 业务字段信息表 - * @createTime 2025年08月01日 + * @createTime 2025年08月06日 */ @Data -@Table(value = "business_data_table_field") -public class BusinessDataTableField implements Serializable { - @Serial +@Table(value = "biz_table_definition") +public class BizTableDefinition implements Serializable { private static final long serialVersionUID = 1L; /** * 主键id */ @Id(value = "id", keyType = KeyType.Auto) - private Long id; + private Integer id; /** * 字段名称 @@ -43,41 +40,11 @@ public class BusinessDataTableField implements Serializable { * 业务表id */ @Column(value = "table_id") - private Long tableId; + private Integer tableId; /** * 描述 */ @Column(value = "description") private String description; - - /** - * 创建时间 - */ - @Column(value = "create_time") - private Date createTime; - - /** - * 创建人 - */ - @Column(value = "create_user_id") - private Long createUserId; - - /** - * 更新时间 - */ - @Column(value = "update_time") - private Date updateTime; - - /** - * 更新人 - */ - @Column(value = "update_user_id") - private Long updateUserId; - - /** - * 是否删除: 0-未删除 1-已删除 - */ - @Column(value = "is_deleted", isLogicDelete = true) - private Byte isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java deleted file mode 100644 index a778f7c5105186f99c5790f9994c8c3098bac292..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.dao.entity; - -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; -import com.mybatisflex.annotation.Table; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - -/** - * @author monojun - * @description 业务表信息表 - * @createTime 2025年08月01日 - */ -@Data -@Table(value = "business_data_table") -public class BusinessDataTable implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键id - */ - @Id(value = "id", keyType = KeyType.Auto) - private Long id; - - /** - * 业务表名称 - */ - @Column(value = "name") - private String name; - - /** - * 业务表编号 - */ - @Column(value = "table_no") - private String tableNo; - - /** - * 业务系统id - */ - @Column(value = "business_id") - private Long businessId; - - /** - * 业务数据源id - */ - @Column(value = "source_id") - private Long sourceId; - - /** - * 描述 - */ - @Column(value = "description") - private String description; - - /** - * 创建时间 - */ - @Column(value = "create_time") - private Date createTime; - - /** - * 创建人 - */ - @Column(value = "create_user_id") - private Long createUserId; - - /** - * 更新时间 - */ - @Column(value = "update_time") - private Date updateTime; - - /** - * 更新人 - */ - @Column(value = "update_user_id") - private Long updateUserId; - - /** - * 是否删除: 0-未删除 1-已删除 - */ - @Column(value = "is_deleted", isLogicDelete = true) - private Byte isDeleted; -} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizDataSourceMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..9624cb500bde04792e3e3300a550c2fc0162d458 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizDataSourceMapper.java @@ -0,0 +1,19 @@ +package com.ediagnosis.cdr.dataIntegration.dao.mapper; + +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizDataSource; + +import java.util.List; + +import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author monojun + * @description 业务系统数据源mapper + * @createTime 2025年08月06日 + */ +@Mapper +public interface BizDataSourceMapper extends BaseMapper { + int batchInsert(@Param("list") List list); +} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizSystemMapper.java similarity index 52% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizSystemMapper.java index fd410991970039dfe7b5eb955c7cddb6e9c515ce..f583ace2ad10b5a344275acca86a59f0e59573ec 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizSystemMapper.java @@ -1,19 +1,21 @@ package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem; + +import java.util.List; + import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @author monojun * @description 业务系统mapper - * @createTime 2025年08月01日 + * @createTime 2025年08月06日 */ @Mapper -public interface BusinessDataSystemMapper extends BaseMapper { +public interface BizSystemMapper extends BaseMapper { + + int batchInsert(@Param("list") List list); - int batchInsert(@Param("list") List list); } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableDefinitionMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableDefinitionMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..7e3f90361d4c29773bb5f19f5b25c83dfc9084f9 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableDefinitionMapper.java @@ -0,0 +1,20 @@ +package com.ediagnosis.cdr.dataIntegration.dao.mapper; + +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition; + +import java.util.List; + +import com.mybatisflex.core.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author monojun + * @description 业务字段信息mapper + * @createTime 2025年08月06日 + */ +@Mapper +public interface BizTableDefinitionMapper extends BaseMapper { + + int batchInsert(@Param("list") List list); +} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableMapper.java similarity index 52% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableMapper.java index eda203813d949759015376ff58814033d85211b8..0b7f6b3bace550a8c62ba03a6e88dadb4c4fe699 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableMapper.java @@ -1,18 +1,19 @@ package com.ediagnosis.cdr.dataIntegration.dao.mapper; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTable; + +import java.util.List; + import com.mybatisflex.core.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * @author monojun * @description 业务表mapper - * @createTime 2025年08月01日 + * @createTime 2025年08月06日 */ @Mapper -public interface BusinessDataTableMapper extends BaseMapper { - int batchInsert(@Param("list") List list); +public interface BizTableMapper extends BaseMapper { + int batchInsert(@Param("list") List list); } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java deleted file mode 100644 index a9885562b92c2823116bbc2b45708d2d824b8408..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.dao.mapper; - -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; -import com.mybatisflex.core.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author monojun - * @description 数据源mapper - * @createTime 2025年08月01日 - */ -@Mapper -public interface BusinessDataSourceMapper extends BaseMapper { - - int batchInsert(@Param("list") List list); - -} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java deleted file mode 100644 index af158af38690fdfa734b3e5637d678af8a0e93c0..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.dao.mapper; - -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; -import com.mybatisflex.core.BaseMapper; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author monojun - * @description 业务表字段mapper - * @createTime 2025年08月01日 - */ -@Mapper -public interface BusinessDataTableFieldMapper extends BaseMapper { - - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSourceRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSourceRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..140c46075bf32fc0a57f15a8da3f6d74e270138b --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSourceRepository.java @@ -0,0 +1,51 @@ +package com.ediagnosis.cdr.dataIntegration.inner; + +import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceQueryDTO; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author monojun + * @description 数据源Repository + * @createTime 2025年08月05日 + */ +@Repository +@RequiredArgsConstructor +public class BizSourceRepository { + + private final BizDataDao bizDataDao; + + /** + * 新增or更新数据源 + * + * @param dataSourceDTO 数据源dto + * @return 数据源主键id + */ + public Integer addDataSource(BizDataSourceDTO dataSourceDTO) { + return bizDataDao.addOrUpdateDataSource(dataSourceDTO); + } + + /** + * 分页查询数据源信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BizDataSourceQueryDTO queryDTO) { + return bizDataDao.querySourcePage(queryDTO); + } + + /** + * 删除业务系统 + * + * @param dataSourceIds 数据源id列表 + */ + public void deleteDataSource(List dataSourceIds) { + bizDataDao.deleteBatchDataSource(dataSourceIds); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSystemRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSystemRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..48b9b16d7cc3bcd96cc8d076ce0a0a288c4865a7 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSystemRepository.java @@ -0,0 +1,54 @@ +package com.ediagnosis.cdr.dataIntegration.inner; + +import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author monojun + * @description BizSystemRepository + * @createTime 2025年08月05日 + */ +@Repository +@RequiredArgsConstructor +public class BizSystemRepository { + + private final BizDataDao bizDataDao; + + /** + * 新增or更新业务系统 + * + * @param bizSystemDTO 业务系统dto + * @return 业务系统主键id + */ + public Integer addBizSystem(BizSystemDTO bizSystemDTO) { + return bizDataDao.addOrUpdateBizSystem(bizSystemDTO); + } + + + /** + * 分页查询业务系统信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BizSystemQueryDTO queryDTO) { + return bizDataDao.querySystemPage(queryDTO); + } + + /** + * 删除业务系统 + * + * @param dataSystemIds 业务系统id列表 + */ + public void deleteDataSystem(List dataSystemIds) { + bizDataDao.deleteBatchBizSystem(dataSystemIds); + } + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableDefinitionRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableDefinitionRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..37fa01abfc87a120b172cf46bdd1be68da3bce9b --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableDefinitionRepository.java @@ -0,0 +1,30 @@ +package com.ediagnosis.cdr.dataIntegration.inner; + +import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDefinitionQueryDTO; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * @author monojun + * @description BizTableDefinitionRepository + * @createTime 2025年08月06日 + */ +@Repository +@RequiredArgsConstructor +public class BizTableDefinitionRepository { + + private final BizDataDao bizDataDao; + + /** + * 分页查询源业务表字段信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BizTableDefinitionQueryDTO queryDTO) { + return bizDataDao.queryFieldPage(queryDTO); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..0200d9e84344791aec37cf293270ac0877ac6a59 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableRepository.java @@ -0,0 +1,52 @@ +package com.ediagnosis.cdr.dataIntegration.inner; + +import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDTO; +import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableQueryDTO; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author monojun + * @description 数据表Repository + * @createTime 2025年08月05日 + */ +@Repository +@RequiredArgsConstructor +public class BizTableRepository { + + private final BizDataDao bizDataDao; + + /** + * 新增or更新源业务表 + * + * @param tableDTO 源业务表dto + * @return 源业务表主键id + */ + public Integer addOrUpdateDataTable(BizTableDTO tableDTO) { + return bizDataDao.addOrUpdateDataTable(tableDTO); + } + + + /** + * 分页查询源业务表信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BizTableQueryDTO queryDTO) { + return bizDataDao.queryTablePage(queryDTO); + } + + /** + * 删除源业务表 + * + * @param dataTableIds 源数据表id + */ + public void deleteDataSystem(List dataTableIds) { + bizDataDao.deleteBatchDataTable(dataTableIds); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java deleted file mode 100644 index 27301ebf2252bb6dfd93956dcbc2e5796eef843a..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.inner; - - -import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataIntegration.dao.dto.*; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField; -import com.mybatisflex.core.paginate.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -/** - * @author monojun - * @description BusinessDataRepository - * @createTime 2025年08月04日 - */ -@Repository -@RequiredArgsConstructor -public class BusinessDataRepository { - - private final BusinessDataDao businessDataDao; - - /** - * 分页查询业务系统信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryPage(BusinessDataSystemQueryDTO queryDTO) { - return businessDataDao.querySystemPage(queryDTO); - } - - /** - * 分页查询业务数据源信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page querySourcePage(BusinessDataSourceQueryDTO queryDTO) { - return businessDataDao.querySourcePage(queryDTO); - } - - /** - * 分页查询业务表信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryTablePage(BusinessDataTableQueryDTO queryDTO) { - return businessDataDao.queryTablePage(queryDTO); - } - - /** - * 分页查询业务表字段信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryFieldPage(BusinessDataTableFieldQueryDTO queryDTO) { - return businessDataDao.queryFieldPage(queryDTO); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java deleted file mode 100644 index f57836f8718e7c8d39877322ebf99d66170bd2c4..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.inner; - -import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.mybatisflex.core.paginate.Page; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -/** - * @author monojun - * @description BusinessSystemRepository - * @createTime 2025年08月05日 - */ -@Repository -@RequiredArgsConstructor -public class BusinessSystemRepository { - - private final BusinessDataDao businessDataDao; - - /** - * 新增业务系统 - * - * @param dataSystemDTO 业务系统dto - * @return 业务系统主键id - */ - public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) { - businessDataDao.addDataSystem(dataSystemDTO); - return businessDataDao.addDataSystem(dataSystemDTO); - } - - - /** - * 更新业务系统 - * - * @param dataSystemDTO 业务系统dto - * @return 业务系统主键id - */ - public Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO) { - return businessDataDao.updateDataSystem(dataSystemDTO); - } - - /** - * 分页查询业务系统信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - public Page queryPage(BusinessDataSystemQueryDTO queryDTO) { - return businessDataDao.querySystemPage(queryDTO); - } - - /** - * 删除业务系统 - * - * @param dataSystemId 业务系统id - */ - public void deleteDataSystem(Long dataSystemId) { - businessDataDao.deleteDataSystem(dataSystemId); - } - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizDataSourceVo.java similarity index 62% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizDataSourceVo.java index e466155a9a0c367c74867124274dfbb9558d7e36..14f3f3ac68d34ec8ea4268df641d165588df02c8 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizDataSourceVo.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun @@ -12,14 +11,14 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataSourceVo implements Serializable { +public class BizDataSourceVo implements Serializable { @Serial private static final long serialVersionUID = -4205114103165887164L; /** * 主键id */ - private Long id; + private Integer id; /** * 数据源名称 @@ -27,24 +26,19 @@ public class BusinessDataSourceVo implements Serializable { private String name; /** - * 数据源类型（mysql、oracle、postgreSQL、sqlserver、h2、sqlite） + * 数据源类型 */ private String type; /** * IP地址 */ - private String ipAddress; + private String ip; /** - * 业务系统id - */ - private Long bizSystemId; - - /** - * 业务系统名称 + * 属性信息 */ - private String bizSystemName; + private String properties; /** * 描述 @@ -52,32 +46,23 @@ public class BusinessDataSourceVo implements Serializable { private String description; /** - * 属性 - */ - private String properties; - - /** - * 连接状态 + * 更新时间 */ - private Integer status; + private String updateTime; /** - * 创建时间 + * 业务系统id */ - private Date createTime; + private Integer bizSystemId; /** - * 创建人 + * 业务系统名称 */ - private Long createUserId; + private String bizSystemName; /** - * 更新时间 + * 连接状态 */ - private Date updateTime; + private Integer status; - /** - * 更新人 - */ - private Long updateUserId; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizSystemVo.java similarity index 60% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizSystemVo.java index fe5a0f5a2c6d36ea593cf3361f40b16d9e833847..4aeb2c7f8b2bb13f586cd31048a8af382b885046 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizSystemVo.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun @@ -12,13 +11,14 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataSystemVo implements Serializable { +public class BizSystemVo implements Serializable { @Serial private static final long serialVersionUID = 1995094555769215993L; + /** * 主键id */ - private Long id; + private Integer id; /** * 业务系统名称 @@ -30,24 +30,9 @@ public class BusinessDataSystemVo implements Serializable { */ private String description; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 - */ - private Long createUserId; - /** * 更新时间 */ - private Date updateTime; - - /** - * 更新人 - */ - private Long updateUserId; + private String updateTime; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableFieldVo.java similarity index 59% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableFieldVo.java index 95abbb65a7e2e600bf4ba26ee59a785c0422c99a..a53661dbb04dbfb6b9be2139a5b81c6bdf9e8def 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableFieldVo.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; -import java.util.Date; /** * @author monojun @@ -12,14 +11,14 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataTableFieldVo implements Serializable { +public class BizTableFieldVo implements Serializable { @Serial private static final long serialVersionUID = 3062177923173755855L; /** * 主键id */ - private Long id; + private Integer id; /** * 字段名称 @@ -34,30 +33,10 @@ public class BusinessDataTableFieldVo implements Serializable { /** * 业务表id */ - private Long tableId; + private Integer tableId; /** * 描述 */ private String description; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 - */ - private Long createUserId; - - /** - * 更新时间 - */ - private Date updateTime; - - /** - * 更新人 - */ - private Long updateUserId; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableVo.java similarity index 57% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableVo.java index 20dd72cfb614d16f28a0d86d32b6eac8896f2ebe..587ececd6094e97b61433547a9a41a812ae8ac63 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableVo.java @@ -12,67 +12,52 @@ import java.util.Date; * @createTime 2025年07月31日 */ @Data -public class BusinessDataTableVo implements Serializable { +public class BizTableVo implements Serializable { @Serial private static final long serialVersionUID = 8791629491093128048L; /** * 主键id */ - private Long id; + private Integer id; /** * 业务表名称 */ - private String name; + private String tableName; /** - * 业务表编号 + * 业务表编码 */ - private String tableNo; + private String tableCode; /** * 业务系统id */ - private Long businessId; + private Integer bizSystemId; /** * 业务系统名称 */ - private String businessName; + private String bizSystemName; /** * 业务数据源id */ - private Long sourceId; + private Integer bizDataSourceId; /** * 业务数据源名称 */ - private String sourceName; + private String bizDataSourceName; /** * 描述 */ private String description; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 创建人 - */ - private Long createUserId; - /** * 更新时间 */ - private Date updateTime; - - /** - * 更新人 - */ - private Long updateUserId; + private String updateTime; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceAddOrUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceAddOrUpdateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..88ac27a97f6471c3953bb2382525f4c2891ddd7d --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceAddOrUpdateParam.java @@ -0,0 +1,61 @@ +package com.ediagnosis.cdr.dataIntegration.value.param; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 数据源新增参数 + * @createTime 2025年08月05日 + */ +@Data +public class BizSourceAddOrUpdateParam implements Serializable { + @Serial + private static final long serialVersionUID = 5282468723403441092L; + + /** + * 主键id + */ + private Integer id; + + /** + * 数据源名称 + */ + @Column(value = "name") + private String name; + + /** + * 数据源类型 + */ + @Column(value = "type") + private String type; + + /** + * IP地址 + */ + @Column(value = "ip") + private String ip; + + /** + * 属性信息 + */ + @Column(value = "properties") + private String properties; + + /** + * 业务系统id + */ + @Column(value = "biz_system_id") + private Integer bizSystemId; + + /** + * 描述 + */ + @Column(value = "description") + private String description; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceDeleteParam.java similarity index 74% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceDeleteParam.java index 8c7ec4ced902a59d8510c36d813a2d8610d6ec92..b239fe6bf97cc5e408f7b5269b45706f4d4bb548 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceDeleteParam.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serial; import java.io.Serializable; +import java.util.List; /** * @author monojun @@ -11,9 +12,9 @@ import java.io.Serializable; * @createTime 2025年08月05日 */ @Data -public class DataSystemDeleteParam implements Serializable { +public class BizSourceDeleteParam implements Serializable { @Serial private static final long serialVersionUID = -5941215912179720671L; - private Long id; + private List ids; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceQueryParam.java similarity index 76% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceQueryParam.java index 2ef44a0895bcb2383ca68b1baf3324e148132f59..ce125a8efd3dda65ea9a0b68cb7e7c8d64854033 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceQueryParam.java @@ -11,14 +11,14 @@ import java.util.List; * @createTime 2025年08月01日 */ @Data -public class DataSourceQueryParam extends PageQuery { +public class BizSourceQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 4384878864788101913L; /** - * 业务系统id列表 + * 业务系统id */ - private List businessIds; + private List bizSystemIds; /** * 数据源名称 @@ -28,7 +28,7 @@ public class DataSourceQueryParam extends PageQuery { /** * ip地址 */ - private String ipAddress; + private String ip; /** * 数据源类型 diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemAddOrUpdateParam.java similarity index 78% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemAddOrUpdateParam.java index bbea953607f15ffb5205a009a342d5be4bf55447..91f5ea1f6c94cb7ab67a184d12564a6ec9207e4a 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemAddOrUpdateParam.java @@ -11,10 +11,15 @@ import java.io.Serializable; * @createTime 2025年08月05日 */ @Data -public class DataSystemAddParam implements Serializable { +public class BizSystemAddOrUpdateParam implements Serializable { @Serial private static final long serialVersionUID = 8362821373667292598L; + /** + * 主键id + */ + private Integer id; + /** * 业务系统名称 */ diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemDeleteParam.java new file mode 100644 index 0000000000000000000000000000000000000000..84d60363e53547d54ee697327b67807e1aea2db3 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemDeleteParam.java @@ -0,0 +1,20 @@ +package com.ediagnosis.cdr.dataIntegration.value.param; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * @author monojun + * @description 业务系统删除参数 + * @createTime 2025年08月05日 + */ +@Data +public class BizSystemDeleteParam implements Serializable { + @Serial + private static final long serialVersionUID = -5941215912179720671L; + + private List ids; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemQueryParam.java similarity index 87% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemQueryParam.java index d59c84282d97b374f78acca13463552ef4bdfbac..ede6a67e77385d00492228a36c55d43aac42a3a0 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemQueryParam.java @@ -10,7 +10,7 @@ import java.io.Serial; * @createTime 2025年08月01日 */ @Data -public class DataSystemQueryParam extends PageQuery { +public class BizSystemQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 5408831076545737168L; diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableAddOrUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableAddOrUpdateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..7bac90f82173ed747e2545c65468f6908c22974b --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableAddOrUpdateParam.java @@ -0,0 +1,55 @@ +package com.ediagnosis.cdr.dataIntegration.value.param; + +import com.mybatisflex.annotation.Column; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.KeyType; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 数据表新增参数 + * @createTime 2025年08月05日 + */ +@Data +public class BizTableAddOrUpdateParam implements Serializable { + @Serial + private static final long serialVersionUID = 3378139727731995899L; + + /** + * 主键id + */ + private Integer id; + + /** + * 业务表名称 + */ + @Column(value = "table_name") + private String tableName; + + /** + * 业务表编码 + */ + @Column(value = "table_code") + private String tableCode; + + /** + * 业务系统id + */ + @Column(value = "biz_system_id") + private Integer bizSystemId; + + /** + * 业务数据源id + */ + @Column(value = "biz_data_source_id") + private Integer bizDataSourceId; + + /** + * 描述 + */ + @Column(value = "description") + private String description; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDefinitionQueryParam.java similarity index 83% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDefinitionQueryParam.java index d2ba3c4cf9b80e79d92ce08b71f8ae751eb033d3..e7286930c6fd0aec9996cbba724f7f907684f0d3 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDefinitionQueryParam.java @@ -10,7 +10,7 @@ import java.io.Serial; * @createTime 2025年08月01日 */ @Data -public class DataTableFieldQueryParam extends PageQuery { +public class BizTableDefinitionQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 5419533067070233483L; @@ -27,5 +27,5 @@ public class DataTableFieldQueryParam extends PageQuery { /** * 业务表id */ - private Long tableId; + private Integer tableId; } diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDeleteParam.java new file mode 100644 index 0000000000000000000000000000000000000000..e6c6c92842d3dd2c23d386695154c0b02562e5a0 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDeleteParam.java @@ -0,0 +1,20 @@ +package com.ediagnosis.cdr.dataIntegration.value.param; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.List; + +/** + * @author monojun + * @description 数据表删除参数 + * @createTime 2025年08月05日 + */ +@Data +public class BizTableDeleteParam implements Serializable { + @Serial + private static final long serialVersionUID = 6212775010515528227L; + + private List ids; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableQueryParam.java similarity index 76% rename from src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableQueryParam.java index 03d14eb7a74f81917917fc76c89e38ed27ddcaa8..5cf98dcba4a4b6f37376dc28a0db00a78928ea3d 100644 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableQueryParam.java @@ -11,19 +11,20 @@ import java.util.List; * @createTime 2025年08月01日 */ @Data -public class DataTableQueryParam extends PageQuery { +public class BizTableQueryParam extends PageQuery { @Serial private static final long serialVersionUID = -6012405803243067316L; + /** - * 业务系统id列表 + * 业务系统id */ - private List businessIds; + private List bizSystemIds; /** * 业务数据源id列表 */ - private List sourceIds; + private List bizDataSourceIds; /** * 业务表名称 diff --git a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java deleted file mode 100644 index e3977ca0891ff8f4f15315ef708637c308e11321..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ediagnosis.cdr.dataIntegration.value.param; - -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * @author monojun - * @description 业务系统更新参数 - * @createTime 2025年08月05日 - */ -@Data -public class DataSystemUpdateParam implements Serializable { - @Serial - private static final long serialVersionUID = -7333708471431047394L; - - private Long id; - /** - * 业务系统名称 - */ - private String name; - - /** - * 描述 - */ - private String description; - -} diff --git a/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java index f5b46efa7353b35cd26bfb21849e762f0f48055c..cd3cbaf2a8fe4d9f6920e593eb46bd250abcde24 100644 --- a/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java @@ -1,6 +1,7 @@ package com.ediagnosis.cdr.dataService; +import com.ediagnosis.cdr.context.values.PageVo; import com.mybatisflex.core.row.Row; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java b/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java index 36e6fab3d47bf23086f98d1f1fd700af5754f47f..b57981aa2a42d8e62d2fde9b55d12a4c8c92d5b7 100644 --- a/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java +++ b/src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java @@ -1,37 +1,37 @@ -package com.ediagnosis.cdr.indicator; - -import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity; -import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper; -import com.ediagnosis.cdr.context.TimeUtil; -import com.ediagnosis.cdr.indicator.value.Indicator; -import org.springframework.stereotype.Repository; - -import java.time.LocalDateTime; - -import java.util.Optional; - -@Repository -public class IndicatorRepository { - - private final IndicatorMapper indicatorMapper; - - public IndicatorRepository(IndicatorMapper indicatorMapper) { - this.indicatorMapper = indicatorMapper; - } - - - - - private Optional convertToIndicator(IndicatorEntity entity) { - Optional timeOptional = TimeUtil.toLocalDateTime(entity.getUpdateTime()); - return timeOptional.map(localDateTime -> new Indicator( - entity.getName(), - entity.getCode(), - entity.getValue(), - localDateTime - )); - - } - - -} +//package com.ediagnosis.cdr.indicator; +// +//import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity; +//import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper; +//import com.ediagnosis.cdr.context.TimeUtil; +//import com.ediagnosis.cdr.indicator.value.Indicator; +//import org.springframework.stereotype.Repository; +// +//import java.time.LocalDateTime; +// +//import java.util.Optional; +// +//@Repository +//public class IndicatorRepository { +// +// private final IndicatorMapper indicatorMapper; +// +// public IndicatorRepository(IndicatorMapper indicatorMapper) { +// this.indicatorMapper = indicatorMapper; +// } +// +// +// +// +// private Optional convertToIndicator(IndicatorEntity entity) { +// Optional timeOptional = TimeUtil.toLocalDateTime(entity.getUpdateTime()); +// return timeOptional.map(localDateTime -> new Indicator( +// entity.getName(), +// entity.getCode(), +// entity.getValue(), +// localDateTime +// )); +// +// } +// +// +//} diff --git a/src/main/resources/generator/mapper/BizDataSourceMapper.xml b/src/main/resources/generator/mapper/BizDataSourceMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..43861a579ac75e0365a035cb2f6b197eff226b6c --- /dev/null +++ b/src/main/resources/generator/mapper/BizDataSourceMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + id, `name`, `type`, ip, properties, biz_system_id, description, update_time + + + + insert into biz_data_source + (`name`, `type`, ip, properties, biz_system_id, description, update_time) + values + + (#{item.name,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.ip,jdbcType=VARCHAR}, + #{item.properties,jdbcType=LONGVARCHAR}, #{item.bizSystemId,jdbcType=INTEGER}, + #{item.description,jdbcType=LONGVARCHAR}, #{item.updateTime,jdbcType=VARCHAR}) + + + \ No newline at end of file diff --git a/src/main/resources/generator/mapper/BizSystemMapper.xml b/src/main/resources/generator/mapper/BizSystemMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..d49fcc1fd5331ace824e963dd7c3552e500fcbc4 --- /dev/null +++ b/src/main/resources/generator/mapper/BizSystemMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + id, `name`, description, update_time + + + + insert into biz_system + (`name`, description, update_time) + values + + (#{item.name,jdbcType=VARCHAR}, #{item.description,jdbcType=LONGVARCHAR}, #{item.updateTime,jdbcType=VARCHAR} + ) + + + \ No newline at end of file diff --git a/src/main/resources/generator/mapper/BizTableDefinitionMapper.xml b/src/main/resources/generator/mapper/BizTableDefinitionMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..f0ee9dbeea0a6880063dfbec2686421356e86665 --- /dev/null +++ b/src/main/resources/generator/mapper/BizTableDefinitionMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + id, field_name, field_type, table_id, description + + + + insert into biz_table_definition + (field_name, field_type, table_id, description) + values + + (#{item.fieldName,jdbcType=VARCHAR}, #{item.fieldType,jdbcType=VARCHAR}, #{item.tableId,jdbcType=INTEGER}, + #{item.description,jdbcType=LONGVARCHAR}) + + + \ No newline at end of file diff --git a/src/main/resources/generator/mapper/BizTableMapper.xml b/src/main/resources/generator/mapper/BizTableMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c7700221465e13d458a61ce1c30dbf1a4ed02612 --- /dev/null +++ b/src/main/resources/generator/mapper/BizTableMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + id, `table_name`, table_code, biz_system_id, biz_data_source_id, description, update_time + + + + insert into biz_table + (`table_name`, table_code, biz_system_id, biz_data_source_id, description, update_time + ) + values + + (#{item.tableName,jdbcType=VARCHAR}, #{item.tableCode,jdbcType=VARCHAR}, #{item.bizSystemId,jdbcType=BIGINT}, + #{item.bizDataSourceId,jdbcType=BIGINT}, #{item.description,jdbcType=LONGVARCHAR}, + #{item.updateTime,jdbcType=VARCHAR}) + + + \ No newline at end of file diff --git a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java deleted file mode 100644 index a36bf4010aeade6eef53fbf4c278e12587457bce..0000000000000000000000000000000000000000 --- a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.ediagnosis.cdr.dao; - -import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceQueryDTO; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @author monojun - * @description MapperTest - * @createTime 2025年07月31日 - */ -@SpringBootTest(classes = CdrApplication.class) -public class MapperTest { - - @Autowired - private BusinessDataSourceMapper dataSourceMapper; - - @Test - public void test1() { - BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); - QueryWrapper queryWrapper = QueryWrapper.create() - .select("d.*, ds.name as businessName") - .from("business_data_source").as("d") - .leftJoin("business_data_system").as("ds") - .on("d.business_id = ds.id"); - Page dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); - System.out.println(dataSourceDTOPage); - } - - @Test - public void test2() { - QueryWrapper queryWrapper = QueryWrapper.create() - .select("d.*", "ds.id as businessId, ds.name as businessName") - .from(BusinessDataSource.class).as("d") - .leftJoin(BusinessDataSystem.class).as("ds") - .on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId); - queryWrapper.in(BusinessDataSource::getBusinessId, 1); - - Page dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); - System.out.println(dataSourceDTOPage); - } -} diff --git a/src/test/java/com/ediagnosis/cdr/dataIntegration/DemoTest.java b/src/test/java/com/ediagnosis/cdr/dataIntegration/DemoTest.java new file mode 100644 index 0000000000000000000000000000000000000000..c97eda3d548812f1eae32c7231f082c93f2bd9bb --- /dev/null +++ b/src/test/java/com/ediagnosis/cdr/dataIntegration/DemoTest.java @@ -0,0 +1,58 @@ +package com.ediagnosis.cdr.dataIntegration; + +import com.ediagnosis.cdr.CdrApplication; +import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao; +import com.ediagnosis.cdr.dataIntegration.dao.dto.*; +import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem; +import com.mybatisflex.core.paginate.Page; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +/** + * @author monojun + * @description TODO + * @createTime 2025年08月06日 + */ +@SpringBootTest(classes = CdrApplication.class) +public class DemoTest { + + @Autowired + private BizDataDao bizDataDao; + + @Test + public void test1() { + BizTableQueryDTO queryDTO = new BizTableQueryDTO(); + Page businessDataTableDTOPage = bizDataDao.queryTablePage(queryDTO); + System.out.println(businessDataTableDTOPage); + } + + @Test + public void test2() { + BizSystemQueryDTO queryDTO = new BizSystemQueryDTO(); + Page dataSystemPage = bizDataDao.querySystemPage(queryDTO); + System.out.println(dataSystemPage); + } + + @Test + public void test3() { + Page dataSourceDTOPage = bizDataDao.querySourcePage(new BizDataSourceQueryDTO()); + System.out.println(dataSourceDTOPage); + } + + @Test + public void test4() { + BizSystemDTO systemDTO = new BizSystemDTO(); + systemDTO.setId(4); + systemDTO.setName("test"); + systemDTO.setDescription("test"); + bizDataDao.addOrUpdateBizSystem(systemDTO); + + BizSystemDTO systemDTO1 = new BizSystemDTO(); + systemDTO1.setName("test"); + systemDTO1.setDescription("test"); + bizDataDao.addOrUpdateBizSystem(systemDTO1); + } + + +} diff --git a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java deleted file mode 100644 index 5d8ab5f875d5d2c44b40c1d25ea3a6a42e5fee09..0000000000000000000000000000000000000000 --- a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ediagnosis.cdr.demo; - -import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao; -import com.ediagnosis.cdr.dataIntegration.dao.dto.*; -import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem; -import com.mybatisflex.core.paginate.Page; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @author monojun - * @description ServiceTest - * @createTime 2025年07月31日 - */ -@SpringBootTest(classes = CdrApplication.class) -public class DemoTest { - - @Autowired - private BusinessDataDao businessDataDao; - - @Test - public void test1() { - BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); - Page businessDataTableDTOPage = businessDataDao.queryTablePage(queryDTO); - System.out.println(businessDataTableDTOPage); - } - - @Test - public void test2() { - BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); - Page dataSystemPage = businessDataDao.querySystemPage(queryDTO); - System.out.println(dataSystemPage); - } - - @Test - public void test3() { - Page dataSourceDTOPage = businessDataDao.querySourcePage(new BusinessDataSourceQueryDTO()); - System.out.println(dataSourceDTOPage); - } - - -}