diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java index c15626471573ad64cfca48bd1c50787a6364938e..283dfc22d6205fd21dcf3706decc20b1ef658cdf 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessDataController.java @@ -31,35 +31,6 @@ 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(); diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java index 488ccbbfc0057b7f6c243598b5a0db2cd8656bd2..3b88b199ece8bdd8cdb4a03c6b0f9ae44de9839c 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessSourceController.java @@ -1,14 +1,13 @@ 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.dataCollect.dao.dto.BusinessDataSourceDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceAddParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceDeleteParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceQueryParam; +import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceUpdateParam; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSourceVo; +import com.ediagnosis.cdr.dataCollect.inner.BusinessSourceRepository; import com.ediagnosis.cdr.util.PageConvertUtils; import com.ediagnosis.cdr.value.PageVo; import com.ediagnosis.cdr.value.Response; @@ -20,9 +19,10 @@ 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 + * @description 数据源controller * @createTime 2025年08月05日 */ @RestController @@ -30,34 +30,34 @@ import org.springframework.web.bind.annotation.RestController; @RequiredArgsConstructor public class BusinessSourceController { - private final BusinessSystemRepository systemRepository; + private final BusinessSourceRepository sourceRepository; @PostMapping("/add") - public Response page(@RequestBody DataSystemAddParam addParam) { - BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); + public Response page(@RequestBody DataSourceAddParam addParam) { + BusinessDataSourceDTO addDTO = new BusinessDataSourceDTO(); BeanUtils.copyProperties(addParam, addDTO); - Long id = systemRepository.addDataSystem(addDTO); + Long id = sourceRepository.addDataSource(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); + public Response update(@RequestBody DataSourceUpdateParam updateParam) { + BusinessDataSourceDTO updateDTO = new BusinessDataSourceDTO(); + BeanUtils.copyProperties(updateParam, updateDTO); + Long id = sourceRepository.updateDataSource(updateDTO); return Response.success(id); } @PostMapping("/page") - public Response> page(@RequestBody DataSystemQueryParam queryParam) { - BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); + public Response> page(@RequestBody DataSourceQueryParam queryParam) { + BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); BeanUtils.copyProperties(queryParam, queryDTO); - Page dataSystemPage = systemRepository.queryPage(queryDTO); - PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { - BusinessDataSystemVo vo = new BusinessDataSystemVo(); - BeanUtils.copyProperties(dataSystem, vo); + Page dataSourcePage = sourceRepository.queryPage(queryDTO); + PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSourcePage, dataSource -> { + BusinessDataSourceVo vo = new BusinessDataSourceVo(); + BeanUtils.copyProperties(dataSource, vo); return vo; }); return Response.success(systemVoPageInfo); @@ -65,8 +65,8 @@ public class BusinessSourceController { @PostMapping("/delete") - public Response delete(@RequestBody DataSystemDeleteParam deleteParam) { - systemRepository.deleteDataSystem(deleteParam.getId()); + public Response delete(@RequestBody DataSourceDeleteParam deleteParam) { + sourceRepository.deleteDataSource(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 index 4c0529cc8f24eac6a9aea7cdf5d4f6269c37a451..602af91fc725906a4a23f7c485c4ee1aa091ac47 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/BusinessTableController.java @@ -1,9 +1,70 @@ package com.ediagnosis.cdr.dataCollect; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; +import com.ediagnosis.cdr.dataCollect.endpoint.param.*; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; +import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataTableVo; +import com.ediagnosis.cdr.dataCollect.inner.BusinessTableRepository; +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 + * @description 源数据表controller * @createTime 2025年08月05日 */ +@RestController +@RequestMapping("/dataTable") +@RequiredArgsConstructor public class BusinessTableController { + + private final BusinessTableRepository tableRepository; + + @PostMapping("/add") + public Response page(@RequestBody DataTableAddParam addParam) { + BusinessDataTableDTO addDTO = new BusinessDataTableDTO(); + BeanUtils.copyProperties(addParam, addDTO); + Long id = tableRepository.addDataTable(addDTO); + return Response.success(id); + } + + @PostMapping("/update") + public Response update(@RequestBody DataTableUpdateParam updateParam) { + BusinessDataTableDTO updateDTO = new BusinessDataTableDTO(); + BeanUtils.copyProperties(updateParam, updateDTO); + Long id = tableRepository.updateDataTable(updateDTO); + return Response.success(id); + } + + + @PostMapping("/page") + public Response> page(@RequestBody DataTableQueryParam queryParam) { + BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); + BeanUtils.copyProperties(queryParam, queryDTO); + Page dataSystemPage = tableRepository.queryPage(queryDTO); + PageVo systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataTableDTO -> { + BusinessDataTableVo vo = new BusinessDataTableVo(); + BeanUtils.copyProperties(dataTableDTO, vo); + return vo; + }); + return Response.success(systemVoPageInfo); + } + + + @PostMapping("/delete") + public Response delete(@RequestBody DataTableDeleteParam deleteParam) { + tableRepository.deleteDataSystem(deleteParam.getId()); + return Response.success(deleteParam.getId()); + } } diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java index 0e4e2b0444eb37de4d6ca9f84c2e276bfddef575..24b50179aacedca2fd320bd8bea0820adbca3811 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/BusinessDataDao.java @@ -66,6 +66,20 @@ public class BusinessDataDao { return dataSystem.getId(); } + /** + * 新增or更新业务系统 + * + * @param dataSystemDTO dataSystemDTO + * @return 业务系统主键id + */ + public Long insertOrUpdateSystem(BusinessDataSystemDTO dataSystemDTO) { + BusinessDataSystem dataSystem = new BusinessDataSystem(); + BeanUtils.copyProperties(dataSystemDTO, dataSystem); + dataSystem.setUpdateTime(new Date()); + dataSystemMapper.insertOrUpdate(dataSystem); + return dataSystem.getId(); + } + /** * 删除业务系统 * @@ -91,6 +105,44 @@ public class BusinessDataDao { return dataSystemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); } + /** + * 新增数据源 + * + * @param dataSourceDTO dataSourceDTO + * @return 数据源主键id + */ + public Long addDataSource(BusinessDataSourceDTO dataSourceDTO) { + BusinessDataSource dataSource = new BusinessDataSource(); + BeanUtils.copyProperties(dataSourceDTO, dataSource); + dataSource.setCreateTime(new Date()); + dataSource.setUpdateTime(new Date()); + dataSourceMapper.insert(dataSource); + return dataSource.getId(); + } + + /** + * 更新数据源 + * + * @param dataSourceDTO dataSourceDTO + * @return 数据源主键id + */ + public Long updateDataSource(BusinessDataSourceDTO dataSourceDTO) { + BusinessDataSource dataSource = new BusinessDataSource(); + BeanUtils.copyProperties(dataSourceDTO, dataSource); + dataSource.setUpdateTime(new Date()); + dataSourceMapper.update(dataSource); + return dataSource.getId(); + } + + /** + * 删除数据源 + * + * @param dataSourceId 数据源id + */ + public void deleteDataSource(Long dataSourceId) { + dataSourceMapper.deleteById(dataSourceId); + } + /** * 分页查询业务数据源信息 * @@ -123,6 +175,44 @@ public class BusinessDataDao { return dataSourceMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BusinessDataSourceDTO.class); } + /** + * 新增数据表 + * + * @param dataTableDTO dataTableDTO + * @return 数据表主键id + */ + public Long addDataTable(BusinessDataTableDTO dataTableDTO) { + BusinessDataTable dataTable = new BusinessDataTable(); + BeanUtils.copyProperties(dataTableDTO, dataTable); + dataTable.setCreateTime(new Date()); + dataTable.setUpdateTime(new Date()); + dataTableMapper.insert(dataTable); + return dataTable.getId(); + } + + /** + * 更新业务系统 + * + * @param dataTableDTO dataTableDTO + * @return 数据表主键id + */ + public Long updateDataTable(BusinessDataTableDTO dataTableDTO) { + BusinessDataTable dataTable = new BusinessDataTable(); + BeanUtils.copyProperties(dataTableDTO, dataTable); + dataTable.setUpdateTime(new Date()); + dataTableMapper.update(dataTable); + return dataTable.getId(); + } + + /** + * 删除业务系统 + * + * @param dataTableId 业务系统id + */ + public void deleteDataTable(Long dataTableId) { + dataTableMapper.deleteById(dataTableId); + } + /** * 分页查询业务表信息 * @@ -139,12 +229,12 @@ public class BusinessDataDao { .on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId) .orderBy(BusinessDataTable::getUpdateTime, false) .orderBy(BusinessDataTable::getId, false); + if (!CollectionUtils.isEmpty(queryDTO.getBusinessIds())) { + queryWrapper.in(BusinessDataSource::getBusinessId, queryDTO.getBusinessIds()); + } 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()); } diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java index 79ac5ac1c5afaf6a766faa73044fed14455a9e9a..560750f644422d02d7913bfd7029c64368c7910f 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSource.java @@ -96,6 +96,6 @@ public class BusinessDataSource implements Serializable { /** * 是否删除: 0-未删除 1-已删除 */ - @Column(value = "is_deleted", isLogicDelete = true) + @Column(value = "is_deleted") private Integer isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java index 168199c2052bf83d8bb5448c36a54b399fcafa5a..e6194322606bfcca42ce548c93d5d7d9b1f97953 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataSystem.java @@ -61,6 +61,6 @@ public class BusinessDataSystem { /** * 是否删除 0-未删除 1-已删除 */ - @Column(value = "is_deleted", isLogicDelete = true) + @Column(value = "is_deleted") private Integer isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java index 597d10d7a8d0caf209a61bb1453ce30f16370d2e..a1b0d157775639b936773dc6ed1269482453163d 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTable.java @@ -85,6 +85,6 @@ public class BusinessDataTable implements Serializable { /** * 是否删除: 0-未删除 1-已删除 */ - @Column(value = "is_deleted", isLogicDelete = true) + @Column(value = "is_deleted") private Byte isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java index a2509c0a17461ad45043f0543548302e9a648838..827b4241d212746ccc6f6003b6491cded669f752 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/dao/entity/BusinessDataTableField.java @@ -78,6 +78,6 @@ public class BusinessDataTableField implements Serializable { /** * 是否删除: 0-未删除 1-已删除 */ - @Column(value = "is_deleted", isLogicDelete = true) + @Column(value = "is_deleted") private Byte isDeleted; } \ No newline at end of file diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/bo/BusinessTableBO.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/bo/BusinessTableBO.java new file mode 100644 index 0000000000000000000000000000000000000000..6d3f403d6e6e1e5863d063366b771d700dd42672 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/bo/BusinessTableBO.java @@ -0,0 +1,19 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.bo; + +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 业务表bo + * @createTime 2025年08月05日 + */ +@Data +public class BusinessTableBO implements Serializable { + @Serial + private static final long serialVersionUID = 3274296809089410424L; + + +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceAddParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceAddParam.java new file mode 100644 index 0000000000000000000000000000000000000000..a850eafa8d9885f981641dfa20514dbb98e12cd0 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceAddParam.java @@ -0,0 +1,54 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.param; + +import com.mybatisflex.annotation.Column; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 数据源新增参数 + * @createTime 2025年08月05日 + */ +@Data +public class DataSourceAddParam implements Serializable { + @Serial + private static final long serialVersionUID = 5282468723403441092L; + + /** + * 数据源名称 + */ + @Column(value = "name") + private String name; + + /** + * 数据源类型 + */ + @Column(value = "type") + private String type; + + /** + * IP地址 + */ + @Column(value = "ip_address") + private String ipAddress; + + /** + * 属性信息 + */ + @Column(value = "properties") + private String properties; + + /** + * 业务系统id + */ + @Column(value = "business_id") + private Long businessId; + + /** + * 描述 + */ + @Column(value = "description") + private String description; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceDeleteParam.java new file mode 100644 index 0000000000000000000000000000000000000000..9dae256e52e816967a1eda9c250aad1d2955234d --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceDeleteParam.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 DataSourceDeleteParam implements Serializable { + @Serial + private static final long serialVersionUID = -1494009606397055551L; + + private Long id; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceUpdateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..62eb1960f58a8376d4a4f2d0d65ededdcd7fbfff --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSourceUpdateParam.java @@ -0,0 +1,63 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.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 DataSourceUpdateParam implements Serializable { + @Serial + private static final long serialVersionUID = -7780208261663923172L; + + /** + * 主键id + */ + @Id(value = "id", keyType = KeyType.Auto) + + private Long id; + + /** + * 数据源名称 + */ + @Column(value = "name") + private String name; + + /** + * 数据源类型 + */ + @Column(value = "type") + private String type; + + /** + * IP地址 + */ + @Column(value = "ip_address") + private String ipAddress; + + /** + * 属性信息 + */ + @Column(value = "properties") + private String properties; + + /** + * 业务系统id + */ + @Column(value = "business_id") + private Long businessId; + + /** + * 描述 + */ + @Column(value = "description") + private String description; +} 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 index f7ab46de3c5e3ee62238bff0ffa1b16759a731af..92eb90ba1565084b8221657ed737e8e6c2b2098e 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataSystemAddParam.java @@ -1,5 +1,6 @@ package com.ediagnosis.cdr.dataCollect.endpoint.param; +import jakarta.validation.constraints.NotBlank; import lombok.Data; import java.io.Serial; diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableAddParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableAddParam.java new file mode 100644 index 0000000000000000000000000000000000000000..c9ef29055a3c76085f275e2c13c53c3880312171 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableAddParam.java @@ -0,0 +1,48 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.param; + +import com.mybatisflex.annotation.Column; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + +/** + * @author monojun + * @description 数据表新增参数 + * @createTime 2025年08月05日 + */ +@Data +public class DataTableAddParam implements Serializable { + @Serial + private static final long serialVersionUID = 3378139727731995899L; + + /** + * 业务表名称 + */ + @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; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableDeleteParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableDeleteParam.java new file mode 100644 index 0000000000000000000000000000000000000000..20f306fd2d22466a34e22c839c674548f0b6aca0 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableDeleteParam.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 DataTableDeleteParam implements Serializable { + @Serial + private static final long serialVersionUID = 6212775010515528227L; + + private Long id; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableUpdateParam.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableUpdateParam.java new file mode 100644 index 0000000000000000000000000000000000000000..a7fa247d25227964475514670854b335aa589b59 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/param/DataTableUpdateParam.java @@ -0,0 +1,56 @@ +package com.ediagnosis.cdr.dataCollect.endpoint.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 DataTableUpdateParam implements Serializable { + @Serial + private static final long serialVersionUID = 646168747509610187L; + + /** + * 主键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; +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java index 10d5bf3ae49825d9e041dc03e7af13a8f23e4f4b..f8a18044b73bc630afa9725fa18ad7eb66a1b8a4 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/endpoint/vo/BusinessDataSourceVo.java @@ -39,12 +39,12 @@ public class BusinessDataSourceVo implements Serializable { /** * 业务系统id */ - private Long bizSystemId; + private Long businessId; /** * 业务系统名称 */ - private String bizSystemName; + private String businessName; /** * 描述 diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSourceRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSourceRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..8262bffc50dfad136913e02cf2a4b91d8e8d9de0 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSourceRepository.java @@ -0,0 +1,60 @@ +package com.ediagnosis.cdr.dataCollect.inner; + +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +/** + * @author monojun + * @description 数据源Repository + * @createTime 2025年08月05日 + */ +@Repository +@RequiredArgsConstructor +public class BusinessSourceRepository { + + private final BusinessDataDao businessDataDao; + + /** + * 新增数据源 + * + * @param dataSourceDTO 数据源dto + * @return 数据源主键id + */ + public Long addDataSource(BusinessDataSourceDTO dataSourceDTO) { + return businessDataDao.addDataSource(dataSourceDTO); + } + + + /** + * 更新数据源 + * + * @param dataSourceDTO 业务系统dto + * @return 数据源主键id + */ + public Long updateDataSource(BusinessDataSourceDTO dataSourceDTO) { + return businessDataDao.updateDataSource(dataSourceDTO); + } + + /** + * 分页查询数据源信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BusinessDataSourceQueryDTO queryDTO) { + return businessDataDao.querySourcePage(queryDTO); + } + + /** + * 删除业务系统 + * + * @param dataSourceId 数据源id + */ + public void deleteDataSource(Long dataSourceId) { + businessDataDao.deleteDataSource(dataSourceId); + } +} diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java index 83be93bebbec748d5f38e537ccaae7647ab3a836..b099b63d73fb5959e636fefa1979b3ef5709fe33 100644 --- a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessSystemRepository.java @@ -26,7 +26,6 @@ public class BusinessSystemRepository { * @return 业务系统主键id */ public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) { - businessDataDao.addDataSystem(dataSystemDTO); return businessDataDao.addDataSystem(dataSystemDTO); } diff --git a/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessTableRepository.java b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessTableRepository.java new file mode 100644 index 0000000000000000000000000000000000000000..9b0bc8cc8e20cc0fdcaa9326b162b980c9c02e62 --- /dev/null +++ b/src/main/java/com/ediagnosis/cdr/dataCollect/inner/BusinessTableRepository.java @@ -0,0 +1,61 @@ +package com.ediagnosis.cdr.dataCollect.inner; + +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableQueryDTO; +import com.mybatisflex.core.paginate.Page; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import org.springframework.util.CollectionUtils; + +/** + * @author monojun + * @description 数据表Repository + * @createTime 2025年08月05日 + */ +@Repository +@RequiredArgsConstructor +public class BusinessTableRepository { + + private final BusinessDataDao businessDataDao; + + /** + * 新增源业务表 + * + * @param dataTableDTO 源业务表dto + * @return 源业务表主键id + */ + public Long addDataTable(BusinessDataTableDTO dataTableDTO) { + return businessDataDao.addDataTable(dataTableDTO); + } + + + /** + * 更新源业务表 + * + * @param dataTableDTO 业务表dto + * @return 源业务表主键id + */ + public Long updateDataTable(BusinessDataTableDTO dataTableDTO) { + return businessDataDao.updateDataTable(dataTableDTO); + } + + /** + * 分页查询源业务表信息 + * + * @param queryDTO 查询dto + * @return PageInfo + */ + public Page queryPage(BusinessDataTableQueryDTO queryDTO) { + return businessDataDao.queryTablePage(queryDTO); + } + + /** + * 删除源业务表 + * + * @param dataTableId 源数据表id + */ + public void deleteDataSystem(Long dataTableId) { + businessDataDao.deleteDataTable(dataTableId); + } +} diff --git a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java index 3eb473d140181b981d81dff990310c7bc7f84e47..4887e74897d442f7e5a6db306a26a41a49e203b2 100644 --- a/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java +++ b/src/test/java/com/ediagnosis/cdr/dao/MapperTest.java @@ -1,8 +1,11 @@ package com.ediagnosis.cdr.dao; import com.ediagnosis.cdr.CdrApplication; +import com.ediagnosis.cdr.dataCollect.dao.BusinessDataDao; import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceDTO; import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableDTO; +import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataTableQueryDTO; import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSource; import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; @@ -12,6 +15,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * @author monojun * @description MapperTest @@ -23,6 +31,9 @@ public class MapperTest { @Autowired private BusinessDataSourceMapper dataSourceMapper; + @Autowired + private BusinessDataDao businessDataDao; + @Test public void test1() { BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); @@ -47,4 +58,21 @@ public class MapperTest { Page dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); System.out.println(dataSourceDTOPage); } + + @Test + public void test3() { + BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO(); + List businessIds = Arrays.asList(1L, 2L, 3L); + queryDTO.setBusinessIds(businessIds); + Page businessDataTableDTOPage = businessDataDao.queryTablePage(queryDTO); + System.out.println(businessDataTableDTOPage); + + BusinessDataTableQueryDTO query1DTO = new BusinessDataTableQueryDTO(); + List list = Stream.of(1L, 2L, 3L).collect(Collectors.toList()); + query1DTO.setSourceIds(list); + Page businessDataTableDTOPage1 = businessDataDao.queryTablePage(query1DTO); + System.out.println(businessDataTableDTOPage1); + } + + }