Commit 79e01bba authored by 王军虎's avatar 王军虎

📝 修改提交

parent ee24b431
...@@ -31,35 +31,6 @@ public class BusinessDataController { ...@@ -31,35 +31,6 @@ public class BusinessDataController {
private final BusinessDataRepository dataRepository; private final BusinessDataRepository dataRepository;
@PostMapping("/dataSource/page")
public Response<PageVo<BusinessDataSourceVo>> page(@RequestBody DataSourceQueryParam queryParam) {
BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataSourceDTO> dataSourcePage = dataRepository.querySourcePage(queryDTO);
PageVo<BusinessDataSourceVo> 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<PageVo<BusinessDataTableVo>> page(@RequestBody DataTableQueryParam queryParam) {
BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataTableDTO> dataTablePage = dataRepository.queryTablePage(queryDTO);
PageVo<BusinessDataTableVo> dataTableVoPageInfo = PageConvertUtils.copyPageInfo(dataTablePage, dataTable -> {
BusinessDataTableVo vo = new BusinessDataTableVo();
BeanUtils.copyProperties(dataTable, vo);
return vo;
});
return Response.success(dataTableVoPageInfo);
}
@PostMapping("/dataTableField/page") @PostMapping("/dataTableField/page")
public Response<PageVo<BusinessDataTableFieldVo>> page(@RequestBody DataTableFieldQueryParam queryParam) { public Response<PageVo<BusinessDataTableFieldVo>> page(@RequestBody DataTableFieldQueryParam queryParam) {
BusinessDataTableFieldQueryDTO queryDTO = new BusinessDataTableFieldQueryDTO(); BusinessDataTableFieldQueryDTO queryDTO = new BusinessDataTableFieldQueryDTO();
......
package com.ediagnosis.cdr.dataCollect; package com.ediagnosis.cdr.dataCollect;
import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemDTO; import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceDTO;
import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSystemQueryDTO; import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO;
import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceAddParam;
import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemAddParam; import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceDeleteParam;
import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemDeleteParam; import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceQueryParam;
import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemQueryParam; import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSourceUpdateParam;
import com.ediagnosis.cdr.dataCollect.endpoint.param.DataSystemUpdateParam; import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSourceVo;
import com.ediagnosis.cdr.dataCollect.endpoint.vo.BusinessDataSystemVo; import com.ediagnosis.cdr.dataCollect.inner.BusinessSourceRepository;
import com.ediagnosis.cdr.dataCollect.inner.BusinessSystemRepository;
import com.ediagnosis.cdr.util.PageConvertUtils; import com.ediagnosis.cdr.util.PageConvertUtils;
import com.ediagnosis.cdr.value.PageVo; import com.ediagnosis.cdr.value.PageVo;
import com.ediagnosis.cdr.value.Response; import com.ediagnosis.cdr.value.Response;
...@@ -20,9 +19,10 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -20,9 +19,10 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**
* @author monojun * @author monojun
* @description TODO * @description 数据源controller
* @createTime 2025年08月05日 * @createTime 2025年08月05日
*/ */
@RestController @RestController
...@@ -30,34 +30,34 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -30,34 +30,34 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor @RequiredArgsConstructor
public class BusinessSourceController { public class BusinessSourceController {
private final BusinessSystemRepository systemRepository; private final BusinessSourceRepository sourceRepository;
@PostMapping("/add") @PostMapping("/add")
public Response<Long> page(@RequestBody DataSystemAddParam addParam) { public Response<Long> page(@RequestBody DataSourceAddParam addParam) {
BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); BusinessDataSourceDTO addDTO = new BusinessDataSourceDTO();
BeanUtils.copyProperties(addParam, addDTO); BeanUtils.copyProperties(addParam, addDTO);
Long id = systemRepository.addDataSystem(addDTO); Long id = sourceRepository.addDataSource(addDTO);
return Response.success(id); return Response.success(id);
} }
@PostMapping("/update") @PostMapping("/update")
public Response<Long> update(@RequestBody DataSystemUpdateParam updateParam) { public Response<Long> update(@RequestBody DataSourceUpdateParam updateParam) {
BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO(); BusinessDataSourceDTO updateDTO = new BusinessDataSourceDTO();
BeanUtils.copyProperties(updateParam, addDTO); BeanUtils.copyProperties(updateParam, updateDTO);
Long id = systemRepository.updateDataSystem(addDTO); Long id = sourceRepository.updateDataSource(updateDTO);
return Response.success(id); return Response.success(id);
} }
@PostMapping("/page") @PostMapping("/page")
public Response<PageVo<BusinessDataSystemVo>> page(@RequestBody DataSystemQueryParam queryParam) { public Response<PageVo<BusinessDataSourceVo>> page(@RequestBody DataSourceQueryParam queryParam) {
BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO(); BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO); BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataSystem> dataSystemPage = systemRepository.queryPage(queryDTO); Page<BusinessDataSourceDTO> dataSourcePage = sourceRepository.queryPage(queryDTO);
PageVo<BusinessDataSystemVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> { PageVo<BusinessDataSourceVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSourcePage, dataSource -> {
BusinessDataSystemVo vo = new BusinessDataSystemVo(); BusinessDataSourceVo vo = new BusinessDataSourceVo();
BeanUtils.copyProperties(dataSystem, vo); BeanUtils.copyProperties(dataSource, vo);
return vo; return vo;
}); });
return Response.success(systemVoPageInfo); return Response.success(systemVoPageInfo);
...@@ -65,8 +65,8 @@ public class BusinessSourceController { ...@@ -65,8 +65,8 @@ public class BusinessSourceController {
@PostMapping("/delete") @PostMapping("/delete")
public Response<Long> delete(@RequestBody DataSystemDeleteParam deleteParam) { public Response<Long> delete(@RequestBody DataSourceDeleteParam deleteParam) {
systemRepository.deleteDataSystem(deleteParam.getId()); sourceRepository.deleteDataSource(deleteParam.getId());
return Response.success(deleteParam.getId()); return Response.success(deleteParam.getId());
} }
......
package com.ediagnosis.cdr.dataCollect; 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 * @author monojun
* @description TODO * @description 源数据表controller
* @createTime 2025年08月05日 * @createTime 2025年08月05日
*/ */
@RestController
@RequestMapping("/dataTable")
@RequiredArgsConstructor
public class BusinessTableController { public class BusinessTableController {
private final BusinessTableRepository tableRepository;
@PostMapping("/add")
public Response<Long> 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<Long> 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<PageVo<BusinessDataTableVo>> page(@RequestBody DataTableQueryParam queryParam) {
BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataTableDTO> dataSystemPage = tableRepository.queryPage(queryDTO);
PageVo<BusinessDataTableVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataTableDTO -> {
BusinessDataTableVo vo = new BusinessDataTableVo();
BeanUtils.copyProperties(dataTableDTO, vo);
return vo;
});
return Response.success(systemVoPageInfo);
}
@PostMapping("/delete")
public Response<Long> delete(@RequestBody DataTableDeleteParam deleteParam) {
tableRepository.deleteDataSystem(deleteParam.getId());
return Response.success(deleteParam.getId());
}
} }
...@@ -66,6 +66,20 @@ public class BusinessDataDao { ...@@ -66,6 +66,20 @@ public class BusinessDataDao {
return dataSystem.getId(); 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 { ...@@ -91,6 +105,44 @@ public class BusinessDataDao {
return dataSystemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper); 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 { ...@@ -123,6 +175,44 @@ public class BusinessDataDao {
return dataSourceMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BusinessDataSourceDTO.class); 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 { ...@@ -139,12 +229,12 @@ public class BusinessDataDao {
.on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId) .on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId)
.orderBy(BusinessDataTable::getUpdateTime, false) .orderBy(BusinessDataTable::getUpdateTime, false)
.orderBy(BusinessDataTable::getId, false); .orderBy(BusinessDataTable::getId, false);
if (!CollectionUtils.isEmpty(queryDTO.getBusinessIds())) {
queryWrapper.in(BusinessDataSource::getBusinessId, queryDTO.getBusinessIds());
}
if (StringUtils.hasText(queryDTO.getName())) { if (StringUtils.hasText(queryDTO.getName())) {
queryWrapper.like(BusinessDataTable::getName, queryDTO.getName()); queryWrapper.like(BusinessDataTable::getName, queryDTO.getName());
} }
if (!CollectionUtils.isEmpty(queryDTO.getBusinessIds())) {
queryWrapper.in(BusinessDataTable::getBusinessId, queryDTO.getBusinessIds());
}
if (!CollectionUtils.isEmpty(queryDTO.getSourceIds())) { if (!CollectionUtils.isEmpty(queryDTO.getSourceIds())) {
queryWrapper.in(BusinessDataTable::getSourceId, queryDTO.getSourceIds()); queryWrapper.in(BusinessDataTable::getSourceId, queryDTO.getSourceIds());
} }
......
...@@ -96,6 +96,6 @@ public class BusinessDataSource implements Serializable { ...@@ -96,6 +96,6 @@ public class BusinessDataSource implements Serializable {
/** /**
* 是否删除: 0-未删除 1-已删除 * 是否删除: 0-未删除 1-已删除
*/ */
@Column(value = "is_deleted", isLogicDelete = true) @Column(value = "is_deleted")
private Integer isDeleted; private Integer isDeleted;
} }
\ No newline at end of file
...@@ -61,6 +61,6 @@ public class BusinessDataSystem { ...@@ -61,6 +61,6 @@ public class BusinessDataSystem {
/** /**
* 是否删除 0-未删除 1-已删除 * 是否删除 0-未删除 1-已删除
*/ */
@Column(value = "is_deleted", isLogicDelete = true) @Column(value = "is_deleted")
private Integer isDeleted; private Integer isDeleted;
} }
\ No newline at end of file
...@@ -85,6 +85,6 @@ public class BusinessDataTable implements Serializable { ...@@ -85,6 +85,6 @@ public class BusinessDataTable implements Serializable {
/** /**
* 是否删除: 0-未删除 1-已删除 * 是否删除: 0-未删除 1-已删除
*/ */
@Column(value = "is_deleted", isLogicDelete = true) @Column(value = "is_deleted")
private Byte isDeleted; private Byte isDeleted;
} }
\ No newline at end of file
...@@ -78,6 +78,6 @@ public class BusinessDataTableField implements Serializable { ...@@ -78,6 +78,6 @@ public class BusinessDataTableField implements Serializable {
/** /**
* 是否删除: 0-未删除 1-已删除 * 是否删除: 0-未删除 1-已删除
*/ */
@Column(value = "is_deleted", isLogicDelete = true) @Column(value = "is_deleted")
private Byte isDeleted; private Byte isDeleted;
} }
\ No newline at end of file
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;
}
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;
}
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;
}
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;
}
package com.ediagnosis.cdr.dataCollect.endpoint.param; package com.ediagnosis.cdr.dataCollect.endpoint.param;
import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;
import java.io.Serial; import java.io.Serial;
......
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;
}
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;
}
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;
}
...@@ -39,12 +39,12 @@ public class BusinessDataSourceVo implements Serializable { ...@@ -39,12 +39,12 @@ public class BusinessDataSourceVo implements Serializable {
/** /**
* 业务系统id * 业务系统id
*/ */
private Long bizSystemId; private Long businessId;
/** /**
* 业务系统名称 * 业务系统名称
*/ */
private String bizSystemName; private String businessName;
/** /**
* 描述 * 描述
......
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<BusinessDataSystem>
*/
public Page<BusinessDataSourceDTO> queryPage(BusinessDataSourceQueryDTO queryDTO) {
return businessDataDao.querySourcePage(queryDTO);
}
/**
* 删除业务系统
*
* @param dataSourceId 数据源id
*/
public void deleteDataSource(Long dataSourceId) {
businessDataDao.deleteDataSource(dataSourceId);
}
}
...@@ -26,7 +26,6 @@ public class BusinessSystemRepository { ...@@ -26,7 +26,6 @@ public class BusinessSystemRepository {
* @return 业务系统主键id * @return 业务系统主键id
*/ */
public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) { public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) {
businessDataDao.addDataSystem(dataSystemDTO);
return businessDataDao.addDataSystem(dataSystemDTO); return businessDataDao.addDataSystem(dataSystemDTO);
} }
......
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<BusinessDataSystem>
*/
public Page<BusinessDataTableDTO> queryPage(BusinessDataTableQueryDTO queryDTO) {
return businessDataDao.queryTablePage(queryDTO);
}
/**
* 删除源业务表
*
* @param dataTableId 源数据表id
*/
public void deleteDataSystem(Long dataTableId) {
businessDataDao.deleteDataTable(dataTableId);
}
}
package com.ediagnosis.cdr.dao; package com.ediagnosis.cdr.dao;
import com.ediagnosis.cdr.CdrApplication; 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.BusinessDataSourceDTO;
import com.ediagnosis.cdr.dataCollect.dao.dto.BusinessDataSourceQueryDTO; 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.BusinessDataSource;
import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem; import com.ediagnosis.cdr.dataCollect.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper; import com.ediagnosis.cdr.dataCollect.dao.mapper.BusinessDataSourceMapper;
...@@ -12,6 +15,11 @@ import org.junit.jupiter.api.Test; ...@@ -12,6 +15,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; 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 * @author monojun
* @description MapperTest * @description MapperTest
...@@ -23,6 +31,9 @@ public class MapperTest { ...@@ -23,6 +31,9 @@ public class MapperTest {
@Autowired @Autowired
private BusinessDataSourceMapper dataSourceMapper; private BusinessDataSourceMapper dataSourceMapper;
@Autowired
private BusinessDataDao businessDataDao;
@Test @Test
public void test1() { public void test1() {
BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO(); BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO();
...@@ -47,4 +58,21 @@ public class MapperTest { ...@@ -47,4 +58,21 @@ public class MapperTest {
Page<BusinessDataSourceDTO> dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class); Page<BusinessDataSourceDTO> dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class);
System.out.println(dataSourceDTOPage); System.out.println(dataSourceDTOPage);
} }
@Test
public void test3() {
BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO();
List<Long> businessIds = Arrays.asList(1L, 2L, 3L);
queryDTO.setBusinessIds(businessIds);
Page<BusinessDataTableDTO> businessDataTableDTOPage = businessDataDao.queryTablePage(queryDTO);
System.out.println(businessDataTableDTOPage);
BusinessDataTableQueryDTO query1DTO = new BusinessDataTableQueryDTO();
List<Long> list = Stream.of(1L, 2L, 3L).collect(Collectors.toList());
query1DTO.setSourceIds(list);
Page<BusinessDataTableDTO> businessDataTableDTOPage1 = businessDataDao.queryTablePage(query1DTO);
System.out.println(businessDataTableDTOPage1);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment