diff --git a/pom.xml b/pom.xml index aa92f6c4706ec644957b1523232c2733a07c041e..0e2cb032c3a3dc50ad8491e0115acac3748f449a 100644 --- a/pom.xml +++ b/pom.xml @@ -45,13 +45,6 @@ - - com.alibaba - fastjson - 1.2.60 - - - org.apache.hive diff --git a/src/main/java/com/ediagnosis/cdr/CdrApplication.java b/src/main/java/com/ediagnosis/cdr/CdrApplication.java index 4ed68fa46c2351ec2ad6b369bf73b71fee4a4e69..d4f33aed2131f422c141e8849107ca7cb8ba775b 100644 --- a/src/main/java/com/ediagnosis/cdr/CdrApplication.java +++ b/src/main/java/com/ediagnosis/cdr/CdrApplication.java @@ -5,7 +5,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("com.ediagnosis.cdr.dao.mapper") +@MapperScan(basePackages = { + "com.ediagnosis.cdr.*.dao.mapper", + "com.ediagnosis.cdr.dao.mapper" +}) public class CdrApplication { public static void main(String[] args) { diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSourceController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSourceController.java deleted file mode 100644 index 852f7b9dfa29a6453d778df1ddd6144a4147552e..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSourceController.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.ediagnosis.cdr.controller; - -import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; -import com.ediagnosis.cdr.model.param.BusinessDataSourceQueryParam; -import com.ediagnosis.cdr.model.vo.BusinessDataSourceVo; -import com.ediagnosis.cdr.service.BusinessDataSourceService; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; -import com.ediagnosis.cdr.value.Response; -import com.mybatisflex.core.paginate.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -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年07月31日 - */ -@RestController -@RequestMapping("/dataSource") -public class BusinessDataSourceController { - - @Autowired - private BusinessDataSourceService dataSourceService; - - @PostMapping("/page") - public Response> page(@RequestBody BusinessDataSourceQueryParam queryParam) { - BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSourcePage = dataSourceService.queryPage(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); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java deleted file mode 100644 index 7783d839c9c17308e89e1c125dc85465362740b3..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataSystemController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ediagnosis.cdr.controller; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.model.param.BusinessDataSystemQueryParam; -import com.ediagnosis.cdr.model.vo.BusinessDataSystemVo; -import com.ediagnosis.cdr.service.BusinessDataSystemService; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.Response; -import com.ediagnosis.cdr.value.PageVo; -import com.mybatisflex.core.paginate.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -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年07月31日 - */ -@RestController -@RequestMapping("/dataSystem") -public class BusinessDataSystemController { - - @Autowired - private BusinessDataSystemService dataSystemService; - - @PostMapping("/page") - public Response> page(@RequestBody BusinessDataSystemQueryParam queryParam) { - BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSystemPage = dataSystemService.queryPage(queryDTO); - PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { - BusinessDataSystemVo vo = new BusinessDataSystemVo(); - BeanUtils.copyProperties(dataSystem, vo); - return vo; - }); - return Response.success(systemVoPageInfo); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableController.java deleted file mode 100644 index 9ba4a9712e2eadbecd2dcf67a5cc2a8ad74151b1..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ediagnosis.cdr.controller; - -import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataTableQueryDTO; -import com.ediagnosis.cdr.model.param.BusinessDataTableQueryParam; -import com.ediagnosis.cdr.model.vo.BusinessDataTableVo; -import com.ediagnosis.cdr.service.BusinessDataTableService; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; -import com.ediagnosis.cdr.value.Response; -import com.mybatisflex.core.paginate.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -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年07月31日 - */ -@RestController -@RequestMapping("/dataTable") -public class BusinessDataTableController { - - @Autowired - private BusinessDataTableService dataTableService; - - @PostMapping("/page") - public Response> page(@RequestBody BusinessDataTableQueryParam queryParam) { - BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataTablePage = dataTableService.queryPage(queryDTO); - PageVo dataTableVoPageInfo = PageConvertUtils.copyPageInfo(dataTablePage, dataTable -> { - BusinessDataTableVo vo = new BusinessDataTableVo(); - BeanUtils.copyProperties(dataTable, vo); - return vo; - }); - return Response.success(dataTableVoPageInfo); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java b/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java deleted file mode 100644 index 56a6f8b690a609e5df48fec7d8d6e60b41f33df5..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/controller/BusinessDataTableFieldController.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.ediagnosis.cdr.controller; - -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; -import com.ediagnosis.cdr.model.param.BusinessDataTableFieldQueryParam; -import com.ediagnosis.cdr.model.vo.BusinessDataTableFieldVo; -import com.ediagnosis.cdr.service.BusinessDataTableFieldService; -import com.ediagnosis.cdr.util.PageConvertUtils; -import com.ediagnosis.cdr.value.PageVo; -import com.ediagnosis.cdr.value.Response; -import com.mybatisflex.core.paginate.Page; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -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年07月31日 - */ -@RestController -@RequestMapping("/dataTableField") -public class BusinessDataTableFieldController { - - @Autowired - private BusinessDataTableFieldService dataTableFieldService; - - @PostMapping("/page") - public Response> page(@RequestBody BusinessDataTableFieldQueryParam queryParam) { - BusinessDataTableFieldQueryDTO queryDTO = new BusinessDataTableFieldQueryDTO(); - BeanUtils.copyProperties(queryParam, queryDTO); - Page dataTableFieldPage = dataTableFieldService.queryPage(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/dao/mapper/BusinessDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSourceMapper.java deleted file mode 100644 index 34ecda879075cacd633c7508ca0870611e8429b3..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSourceMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.ediagnosis.cdr.dao.mapper; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; -import com.mybatisflex.core.BaseMapper; -import com.mybatisflex.core.paginate.Page; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author monojun - * @description 数据源mapper - * @createTime 2025年07月31日 - */ -@Mapper -public interface BusinessDataSourceMapper extends BaseMapper { - - int batchInsert(@Param("list") List list); - - Page queryAll(Page page, @Param("queryDTO")BusinessDataSourceQueryDTO queryDTO); - - -} \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java new file mode 100644 index 0000000000000000000000000000000000000000..b9947dcee51c9a3941c27b26379f6a9fd3ad3d01 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataApi.java @@ -0,0 +1,14 @@ +package com.ediagnosis.cdr.dataCollect; + +import org.springframework.stereotype.Component; + +/** + * @author monojun + * @description BusinessDataApi + * @createTime 2025年08月04日 + */ +@Component +public class BusinessDataApi { + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java new file mode 100644 index 0000000000000000000000000000000000000000..c15626471573ad64cfca48bd1c50787a6364938e --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java @@ -0,0 +1,77 @@ +package com.ediagnosis.cdr.dataCollect; + + +import com.ediagnosis.cdr.dataCollect.dao.dto.*; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataTableFieldQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataTableQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSourceVo; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataTableFieldVo; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataTableVo; +import com.ediagnosis.cdr.dataCollect.inner.BusinessDataRepository; +import com.ediagnosis.cdr.util.PageConvertUtils; +import com.ediagnosis.cdr.value.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.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/dataCollect/BusinessSourceController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java new file mode 100644 index 0000000000000000000000000000000000000000..488ccbbfc0057b7f6c243598b5a0db2cd8656bd2 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java @@ -0,0 +1,73 @@ +package com.ediagnosis.cdr.dataCollect; + +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemAddParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemDeleteParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemUpdateParam; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; +import com.ediagnosis.cdr.dataCollect.inner.BusinessSystemRepository; +import com.ediagnosis.cdr.util.PageConvertUtils; +import com.ediagnosis.cdr.value.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/dataCollect/BusinessSystemController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java new file mode 100644 index 0000000000000000000000000000000000000000..631e867c111983932970cc05725b04c6f589f35c --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSystemController.java @@ -0,0 +1,74 @@ +package com.ediagnosis.cdr.dataCollect; + +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemAddParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemDeleteParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemUpdateParam; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; +import com.ediagnosis.cdr.dataCollect.inner.BusinessSystemRepository; +import com.ediagnosis.cdr.util.PageConvertUtils; +import com.ediagnosis.cdr.value.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/dataCollect/BusinessTableController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java new file mode 100644 index 0000000000000000000000000000000000000000..4c0529cc8f24eac6a9aea7cdf5d4f6269c37a451 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java @@ -0,0 +1,9 @@ +package com.ediagnosis.cdr.dataCollect; + +/** + * @author monojun + * @description TODO + * @createTime 2025年08月05日 + */ +public class BusinessTableController { +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java new file mode 100644 index 0000000000000000000000000000000000000000..0e4e2b0444eb37de4d6ca9f84c2e276bfddef575 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java @@ -0,0 +1,179 @@ +package com.ediagnosis.cdr.dataCollect.dao; + + +import com.ediagnosis.cdr.dataCollect.dao.dto.*; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTableField; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSystemMapper; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataTableFieldMapper; +import com.ediagnosis.cdr.dataCollect.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/model/dto/BusinessDataSourceDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java similarity index 88% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSourceDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java index 011d23de5a35543e79a4be78fbc1a3bd36bce4be..00b9dc0c5a4335ca016f6a6932aa1b583c4edd38 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSourceDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceDTO.java @@ -1,8 +1,5 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSourceQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java similarity index 84% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSourceQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java index c1de65d13c648cce231b94bbffaa139f35902cd0..e2989418e976db65980ab9de06f49356d9fd2ec8 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSourceQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSourceQueryDTO.java @@ -1,7 +1,6 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; -import com.ediagnosis.cdr.model.param.PageQuery; -import com.mybatisflex.annotation.Column; +import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java similarity index 94% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java index 89b383cd4a44863318162886503aa0da4ebd70cc..5e2bc3d063c71eb900eebbc95cacd8f5be92b3bd 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemDTO.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java similarity index 74% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java index ef32dcb2dfb7eb26c61bbba62c40085301b1bcbc..9832247a4079394431ca83cd50ed8c25af0286c3 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataSystemQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataSystemQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; -import com.ediagnosis.cdr.model.param.PageQuery; +import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; import lombok.Data; /** diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java index bfd28f395c3a2c6935f571abfba3ffe53bc68319..935ff83e2978d71cd3b1a212a47f01f6c47e02d4 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableDTO.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableFieldQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java similarity index 81% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableFieldQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java index 2856ccc2f640391400ad17b350b103ef036e6d62..56f52116b0301fe568658bccf9046fdea922db36 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableFieldQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableFieldQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; -import com.ediagnosis.cdr.model.param.PageQuery; +import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableQueryDTO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java similarity index 84% rename from src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableQueryDTO.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java index 0be5861adde3a41af36eff55c932db9a19cfd2a7..f0a49f41ec9ef345db026508c149d5034e3816d8 100644 --- a/src/main/java/com/ediagnosis/cdr/model/dto/BusinessDataTableQueryDTO.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/dto/BusinessDataTableQueryDTO.java @@ -1,6 +1,6 @@ -package com.ediagnosis.cdr.model.dto; +package com.ediagnosis.cdr.dataCollect.dao.dto; -import com.ediagnosis.cdr.model.param.PageQuery; +import com.ediagnosis.cdr.dataCollect.endpoint.param.PageQuery; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java index 2c3ed86f6c7c18412905cbeacf778847f8560d37..79ac5ac1c5afaf6a766faa73044fed14455a9e9a 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSource.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; @@ -13,7 +13,7 @@ import java.util.Date; /** * @author monojun * @description 业务系统数据源表 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data @Table(value = "business_data_source") diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java similarity index 93% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java index a4bfd46d0cdb3f6326effd746ee60ce35be9478d..168199c2052bf83d8bb5448c36a54b399fcafa5a 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataSystem.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; @@ -11,7 +11,7 @@ import java.util.Date; /** * @author monojun * @description 业务系统表 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data @Table("business_data_system") diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java index e328d36ed4c19f2651de9cdc6b44a66f42c7f0f7..597d10d7a8d0caf209a61bb1453ce30f16370d2e 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTable.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; @@ -13,7 +13,7 @@ import java.util.Date; /** * @author monojun * @description 业务表信息表 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data @Table(value = "business_data_table") diff --git a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java similarity index 94% rename from src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java index 8481f4d1d614b16e58d3a14ff14c134c60c331f3..a2509c0a17461ad45043f0543548302e9a648838 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/entity/BusinessDataTableField.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.dao.entity; +package com.ediagnosis.cdr.dataCollect.dao.entity; import com.mybatisflex.annotation.Column; import com.mybatisflex.annotation.Id; @@ -13,7 +13,7 @@ import java.util.Date; /** * @author monojun * @description 业务字段信息表 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data @Table(value = "business_data_table_field") diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..97994e377a0adfc28c92ac0683b4c4ea7c01032d --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSourceMapper.java @@ -0,0 +1,20 @@ +package com.ediagnosis.cdr.dataCollect.dao.mapper; + +import com.ediagnosis.cdr.dataCollect.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/dao/mapper/BusinessDataSystemMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java similarity index 70% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSystemMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java index f655526baf094edcadb9f821746448a25f9a0989..4e56b423d6d0d14bb92e384901bfc84778e6fb64 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataSystemMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataSystemMapper.java @@ -1,21 +1,19 @@ -package com.ediagnosis.cdr.dao.mapper; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; - -import java.util.List; +package com.ediagnosis.cdr.dataCollect.dao.mapper; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; 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年07月31日 + * @createTime 2025年08月01日 */ @Mapper public interface BusinessDataSystemMapper extends BaseMapper { int batchInsert(@Param("list") List list); - } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java similarity index 71% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java index 5c7ed18fe523f48c5a94eba971ca0e53aaccb09f..e886a84c331f9f7c62fdaf0fdfdb41e704524ca8 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableFieldMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableFieldMapper.java @@ -1,17 +1,16 @@ -package com.ediagnosis.cdr.dao.mapper; - -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; - -import java.util.List; +package com.ediagnosis.cdr.dataCollect.dao.mapper; +import com.ediagnosis.cdr.dataCollect.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年07月31日 + * @createTime 2025年08月01日 */ @Mapper public interface BusinessDataTableFieldMapper extends BaseMapper { diff --git a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java similarity index 70% rename from src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java index b54c1ca4d9e870494c4023f6240069d7e4906d46..4320472d8e077e2bbdbad6a48f738bcac0acb397 100644 --- a/src/main/java/com/ediagnosis/cdr/dao/mapper/BusinessDataTableMapper.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/mapper/BusinessDataTableMapper.java @@ -1,16 +1,16 @@ -package com.ediagnosis.cdr.dao.mapper; - -import com.ediagnosis.cdr.dao.entity.BusinessDataTable; -import java.util.List; +package com.ediagnosis.cdr.dataCollect.dao.mapper; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataTable; 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年07月31日 + * @createTime 2025年08月01日 */ @Mapper public interface BusinessDataTableMapper extends BaseMapper { diff --git a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSourceQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java similarity index 77% rename from src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSourceQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java index 302fbd0ebbaaaa37237796f259a23c477956f79a..b21d4c342905ee85297e7661546b949f09c0f561 100644 --- a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSourceQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.param; +package com.ediagnosis.cdr.dataCollect.endpoint.param; import lombok.Data; @@ -8,10 +8,10 @@ import java.util.List; /** * @author monojun * @description 数据源查询参数 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data -public class BusinessDataSourceQueryParam extends PageQuery { +public class DataSourceQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 4384878864788101913L; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java new file mode 100644 index 0000000000000000000000000000000000000000..f7ab46de3c5e3ee62238bff0ffa1b16759a731af --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java @@ -0,0 +1,29 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.param; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 业务系统新增参数 + * @createTime 2025年08月05日 + */ +@Data +public class DataSystemAddParam implements Serializable { + @Serial + private static final long serialVersionUID = 8362821373667292598L; + + /** + * 业务系统名称 + */ + private String name; + + /** + * 描述 + */ + private String description; + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java new file mode 100644 index 0000000000000000000000000000000000000000..3ed8e7edb0819aaa718bf472602c62272f6c9158 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemDeleteParam.java @@ -0,0 +1,19 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.param; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 业务系统删除参数 + * @createTime 2025年08月05日 + */ +@Data +public class DataSystemDeleteParam implements Serializable { + @Serial + private static final long serialVersionUID = -5941215912179720671L; + + private Long id; +} diff --git a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSystemQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java similarity index 66% rename from src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSystemQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java index d7079a972f9503058ba98609e0b93a1ccfb090d8..2424007c5d05200ed05ea0ff00a76f4b9f49c33e 100644 --- a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataSystemQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.param; +package com.ediagnosis.cdr.dataCollect.endpoint.param; import lombok.Data; @@ -7,10 +7,10 @@ import java.io.Serial; /** * @author monojun * @description 业务系统分页查询参数 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data -public class BusinessDataSystemQueryParam extends PageQuery { +public class DataSystemQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 5408831076545737168L; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..bbd50b1f850c662eaeaeefce0fbe8baf7b455523 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemUpdateParam.java @@ -0,0 +1,29 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.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/model/param/BusinessDataTableFieldQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java similarity index 73% rename from src/main/java/com/ediagnosis/cdr/model/param/BusinessDataTableFieldQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java index 37b691e9b494e5fd67c456e07ec127bffd988aa5..e3d0a2af1bbe189567e8083ab2129e16a4167124 100644 --- a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataTableFieldQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableFieldQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.param; +package com.ediagnosis.cdr.dataCollect.endpoint.param; import lombok.Data; @@ -7,10 +7,10 @@ import java.io.Serial; /** * @author monojun * @description 表字段查询参数 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data -public class BusinessDataTableFieldQueryParam extends PageQuery{ +public class DataTableFieldQueryParam extends PageQuery { @Serial private static final long serialVersionUID = 5419533067070233483L; diff --git a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataTableQueryParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java similarity index 78% rename from src/main/java/com/ediagnosis/cdr/model/param/BusinessDataTableQueryParam.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java index dfcb680731c07c709909d95d079a186c4aa49365..6da57c027a2b035be49ec002edf904f4b6a181b9 100644 --- a/src/main/java/com/ediagnosis/cdr/model/param/BusinessDataTableQueryParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableQueryParam.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.param; +package com.ediagnosis.cdr.dataCollect.endpoint.param; import lombok.Data; @@ -8,10 +8,10 @@ import java.util.List; /** * @author monojun * @description 表信息查询参数 - * @createTime 2025年07月31日 + * @createTime 2025年08月01日 */ @Data -public class BusinessDataTableQueryParam extends PageQuery { +public class DataTableQueryParam extends PageQuery { @Serial private static final long serialVersionUID = -6012405803243067316L; diff --git a/src/main/java/com/ediagnosis/cdr/model/param/PageQuery.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java similarity index 89% rename from src/main/java/com/ediagnosis/cdr/model/param/PageQuery.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java index d8eef68f7a6622b183b31ed71c0950bea364e210..739e0a24f09298808f1cb63a5a1a5632c94f2a15 100644 --- a/src/main/java/com/ediagnosis/cdr/model/param/PageQuery.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/PageQuery.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.param; +package com.ediagnosis.cdr.dataCollect.endpoint.param; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSourceVo.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSourceVo.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java index c9eada38f6b656f1f9023687dcea8a1174404fee..10d5bf3ae49825d9e041dc03e7af13a8f23e4f4b 100644 --- a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSourceVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.vo; +package com.ediagnosis.cdr.dataCollect.endpoint.vo; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSystemVo.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java similarity index 83% rename from src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSystemVo.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java index 3b54e29f47ee238d69edfd3e0a4f35056bb05dfe..a3cb847cc47e6793a6ca96b3011dbc3c832493f9 100644 --- a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataSystemVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSystemVo.java @@ -1,8 +1,5 @@ -package com.ediagnosis.cdr.model.vo; +package com.ediagnosis.cdr.dataCollect.endpoint.vo; -import com.mybatisflex.annotation.Column; -import com.mybatisflex.annotation.Id; -import com.mybatisflex.annotation.KeyType; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableFieldVo.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java similarity index 94% rename from src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableFieldVo.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java index 41af7bd7a044cfcbee61c840b08519a944116e75..6a0d2f5839ffa7fef36e5f6b30892d5133db69fa 100644 --- a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableFieldVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableFieldVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.vo; +package com.ediagnosis.cdr.dataCollect.endpoint.vo; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableVo.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java similarity index 95% rename from src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableVo.java rename to src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java index 720c46f4431657f471e769e0c6c28c0c9cf06615..3f814a3ed57fdc54d874b1abff81eee9a443fbc8 100644 --- a/src/main/java/com/ediagnosis/cdr/model/vo/BusinessDataTableVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataTableVo.java @@ -1,4 +1,4 @@ -package com.ediagnosis.cdr.model.vo; +package com.ediagnosis.cdr.dataCollect.endpoint.vo; import lombok.Data; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..b8dc93f6f1144d7a1bcfcb0528e5e1cf7d734b9b --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessDataRepository.java @@ -0,0 +1,62 @@ +package com.ediagnosis.cdr.dataCollect.inner; + + +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataCollect.dao.dto.*; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.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/dataCollect/inner/BusinessSystemRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..83be93bebbec748d5f38e537ccaae7647ab3a836 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java @@ -0,0 +1,63 @@ +package com.ediagnosis.cdr.dataCollect.inner; + +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataCollect.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/service/BusinessDataSourceService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataSourceService.java deleted file mode 100644 index c1c99d78194b9ce1ad2498e712a695c03ba08010..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataSourceService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ediagnosis.cdr.service; - -import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; -import com.mybatisflex.core.paginate.Page; - -/** - * @author monojun - * @description 业务数据源service - * @createTime 2025年07月31日 - */ -public interface BusinessDataSourceService { - - /** - * 分页查询业务数据源信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - Page queryPage(BusinessDataSourceQueryDTO queryDTO); -} diff --git a/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java deleted file mode 100644 index a9c2b2c7308e58796d513aa0ed07211a6d9738ad..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataSystemService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.ediagnosis.cdr.service; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; -import com.mybatisflex.core.paginate.Page; - -/** - * @author monojun - * @description 业务系统service - * @createTime 2025年07月31日 - */ -public interface BusinessDataSystemService { - /** - * 新增业务系统 - * - * @param dataSystemDTO 业务系统dto - * @return 主键id - */ - Long addDataSystem(BusinessDataSystemDTO dataSystemDTO); - - /** - * 更新业务系统 - * - * @param dataSystemDTO 业务系统dto - * @return Long - */ - Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO); - - /** - * 删除业务系统 - * - * @param dataSystemId 任务主键id - */ - void deleteDataSystem(Long dataSystemId); - - /** - * 分页查询业务系统信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - Page queryPage(BusinessDataSystemQueryDTO queryDTO); -} diff --git a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java deleted file mode 100644 index 2d6bc619506d4079990a50e3e4fde3437971b0f2..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableFieldService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ediagnosis.cdr.service; - -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; -import com.mybatisflex.core.paginate.Page; - -/** - * @author monojun - * @description 业务表字段service - * @createTime 2025年07月31日 - */ -public interface BusinessDataTableFieldService { - - /** - * 分页查询业务表字段信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - Page queryPage(BusinessDataTableFieldQueryDTO queryDTO); -} diff --git a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableService.java b/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableService.java deleted file mode 100644 index 3e931b98996a6be47b1dcf0089e9fbbcf3ddde04..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/BusinessDataTableService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ediagnosis.cdr.service; - -import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataTableQueryDTO; -import com.mybatisflex.core.paginate.Page; - -/** - * @author monojun - * @description 业务表service - * @createTime 2025年07月31日 - */ -public interface BusinessDataTableService { - - /** - * 分页查询业务表信息 - * - * @param queryDTO 查询dto - * @return PageInfo - */ - Page queryPage(BusinessDataTableQueryDTO queryDTO); -} diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java deleted file mode 100644 index 8faefe6cf18f5dbbefef0bd45d207a3ccdcacb40..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSourceServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ediagnosis.cdr.service.impl; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSourceMapper; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; -import com.ediagnosis.cdr.service.BusinessDataSourceService; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** - * @author monojun - * @description 业务数据源service - * @createTime 2025年07月31日 - */ -@Service -public class BusinessDataSourceServiceImpl implements BusinessDataSourceService { - - @Autowired - private BusinessDataSourceMapper dataSourceMapper; - - @Override - public Page queryPage(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::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); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java deleted file mode 100644 index 67091b8aa1bf67cb4b6abccdb005aca6140eacc9..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataSystemServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.ediagnosis.cdr.service.impl; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSystemMapper; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.service.BusinessDataSystemService; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -import java.util.Date; - -/** - * @author monojun - * @description 业务系统service - * @createTime 2025年07月31日 - */ -@Service -public class BusinessDataSystemServiceImpl implements BusinessDataSystemService { - - @Autowired - private BusinessDataSystemMapper dataSystemMapper; - - @Override - 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(); - } - - @Override - public Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO) { - BusinessDataSystem dataSystem = new BusinessDataSystem(); - BeanUtils.copyProperties(dataSystemDTO, dataSystem); - dataSystem.setUpdateTime(new Date()); - dataSystemMapper.update(dataSystem); - return dataSystem.getId(); - } - - @Override - public void deleteDataSystem(Long dataSystemId) { - dataSystemMapper.deleteById(dataSystemId); - } - - @Override - public Page queryPage(BusinessDataSystemQueryDTO queryDTO) { - QueryWrapper queryWrapper = QueryWrapper.create(); - if (StringUtils.hasText(queryDTO.getName())) { - queryWrapper.like(BusinessDataSystem::getName, queryDTO.getName()); - } - queryWrapper.orderBy(BusinessDataSystem::getId, false); - return dataSystemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java deleted file mode 100644 index ab398652aed6a3dd5aa68ccbcb58c1d1c5fd8f5f..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableFieldServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.ediagnosis.cdr.service.impl; - -import com.ediagnosis.cdr.dao.entity.BusinessDataTableField; -import com.ediagnosis.cdr.dao.mapper.BusinessDataTableFieldMapper; -import com.ediagnosis.cdr.model.dto.BusinessDataTableFieldQueryDTO; -import com.ediagnosis.cdr.service.BusinessDataTableFieldService; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** - * @author monojun - * @description 业务表字段service - * @createTime 2025年07月31日 - */ -@Service -public class BusinessDataTableFieldServiceImpl implements BusinessDataTableFieldService { - - @Autowired - private BusinessDataTableFieldMapper dataTableFieldMapper; - - @Override - public Page queryPage(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::getId, false); - return dataTableFieldMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); - } -} diff --git a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java b/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java deleted file mode 100644 index b1a2265092bc3a43edd3213abc97c6934002092f..0000000000000000000000000000000000000000 --- a/src/main/java/com/ediagnosis/cdr/service/impl/BusinessDataTableServiceImpl.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.ediagnosis.cdr.service.impl; - -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.entity.BusinessDataTable; -import com.ediagnosis.cdr.dao.mapper.BusinessDataTableMapper; -import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataTableQueryDTO; -import com.ediagnosis.cdr.service.BusinessDataTableService; -import com.mybatisflex.core.paginate.Page; -import com.mybatisflex.core.query.QueryWrapper; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - -/** - * @author monojun - * @description 业务表service - * @createTime 2025年07月31日 - */ -@Service -public class BusinessDataTableServiceImpl implements BusinessDataTableService { - - @Autowired - private BusinessDataTableMapper dataTableMapper; - - @Override - public Page queryPage(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::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); - } -} diff --git a/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml b/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml index c30bc88942398ceb0079ee8f6574d5d19eec8af3..8f93e8ff1ce645cf9c72063984abd13f10d52b85 100644 --- a/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataSourceMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -42,31 +42,4 @@ - - \ No newline at end of file diff --git a/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml b/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml index 2bed50f2e1c1e11a4d3982da21b8cdb55cf4c248..a605d18d7323d870ab0479d534d4910f4e5fddcc 100644 --- a/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataSystemMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml b/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml index 9951e2c504c7a71f77a8d2401a559b2a9894854a..db6c4dfc574ee67e735d900a89cf620fabbce50f 100644 --- a/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataTableFieldMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/main/resources/generator/mapper/BusinessDataTableMapper.xml b/src/main/resources/generator/mapper/BusinessDataTableMapper.xml index df36447a0a4d9e309f37fd902b3b4aeabe5c0600..7685dc7032eb22361618ab55b271ffd70e822f27 100644 --- a/src/main/resources/generator/mapper/BusinessDataTableMapper.xml +++ b/src/main/resources/generator/mapper/BusinessDataTableMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java index 6d75e213379d1293c15c4f55d5da62ec71d1f4ec..3eb473d140181b981d81dff990310c7bc7f84e47 100644 --- a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java +++ b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java @@ -1,12 +1,11 @@ package com.ediagnosis.cdr.dao; -import com.alibaba.fastjson.JSON; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dao.entity.BusinessDataSource; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.dao.mapper.BusinessDataSourceMapper; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSourceQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import org.junit.jupiter.api.Test; @@ -33,7 +32,7 @@ public class MapperTest { .leftJoin("business_data_system").as("ds") .on("d.business_id = ds.id"); Page dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); - System.out.println(JSON.toJSON(dataSourceDTOPage)); + System.out.println(dataSourceDTOPage); } @Test @@ -46,6 +45,6 @@ public class MapperTest { queryWrapper.in(BusinessDataSource::getBusinessId, 1); Page dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); - System.out.println(JSON.toJSON(dataSourceDTOPage)); + System.out.println(dataSourceDTOPage); } } diff --git a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java index dc708ce2a4f79980f9388feb90679b662ade4d0b..5ad7429a9e880c377aa7fbb4e19fa51491f386d2 100644 --- a/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java +++ b/src/test/java/com/ediagnosis/cdr/demo/DemoTest.java @@ -1,14 +1,9 @@ package com.ediagnosis.cdr.demo; -import com.alibaba.fastjson.JSON; import com.ediagnosis.cdr.CdrApplication; -import com.ediagnosis.cdr.dao.entity.BusinessDataSystem; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataSystemQueryDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataTableDTO; -import com.ediagnosis.cdr.model.dto.BusinessDataTableQueryDTO; -import com.ediagnosis.cdr.service.BusinessDataSystemService; -import com.ediagnosis.cdr.service.BusinessDataTableService; +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataCollect.dao.dto.*; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.mybatisflex.core.paginate.Page; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,36 +18,26 @@ import org.springframework.boot.test.context.SpringBootTest; public class DemoTest { @Autowired - private BusinessDataTableService tableService; - - @Autowired - private BusinessDataSystemService dataSystemService; + private BusinessDataDao businessDataDao; @Test public void test1() { BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); - Page businessDataTableDTOPage = tableService.queryPage(queryDTO); - System.out.println(JSON.toJSONString(businessDataTableDTOPage)); + Page businessDataTableDTOPage = businessDataDao.queryTablePage(queryDTO); + System.out.println(businessDataTableDTOPage); } @Test public void test2() { BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); - Page dataSystemPage = dataSystemService.queryPage(queryDTO); - System.out.println(JSON.toJSONString(dataSystemPage)); + Page dataSystemPage = businessDataDao.querySystemPage(queryDTO); + System.out.println(dataSystemPage); } @Test public void test3() { - BusinessDataSystemDTO dataSystemDTO = new BusinessDataSystemDTO(); - dataSystemDTO.setName("业务系统demo3"); - dataSystemDTO.setDescription("业务系统demo3描述"); - Long l = dataSystemService.addDataSystem(dataSystemDTO); - System.out.println(l); - BusinessDataSystemDTO updateDataSystemDTO = new BusinessDataSystemDTO(); - updateDataSystemDTO.setId(l); - updateDataSystemDTO.setDescription("业务系统demo3描述1"); - dataSystemService.updateDataSystem(updateDataSystemDTO); + Page dataSourceDTOPage = businessDataDao.querySourcePage(new BusinessDataSourceQueryDTO()); + System.out.println(dataSourceDTOPage); }