Skip to content

M
md-cdr-v1
Commit 49a7196d authored by 王军虎's avatar 王军虎
Browse files
Options

📝 修改提交

parent 503ddce9
Show whitespace changes
Inline Side-by-side
Showing with 1248 additions and 878 deletions
pom.xml
View file @ 49a7196d
......@@ -247,4 +247,17 @@
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>21</source>
<target>21</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/BizSourceController.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.ediagnosis.cdr.context.values.Response;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceQueryDTO;
import com.ediagnosis.cdr.dataIntegration.inner.BizSourceRepository;
import com.ediagnosis.cdr.dataIntegration.value.BizDataSourceVo;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSourceAddOrUpdateParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSourceQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemDeleteParam;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author monojun
* @description 数据源
* @createTime 2025年08月06日
*/
@RestController
@RequestMapping("/bizSource")
@RequiredArgsConstructor
public class BizSourceController {
private final BizSourceRepository sourceRepository;
@PostMapping("/addOrUpdate")
public Response<Integer> addOrUpdate(@RequestBody BizSourceAddOrUpdateParam addOrUpdateParam) {
BizDataSourceDTO addDTO = new BizDataSourceDTO();
BeanUtils.copyProperties(addOrUpdateParam, addDTO);
Integer id = sourceRepository.addDataSource(addDTO);
return Response.success(id);
}
@PostMapping("/page")
public Response<PageVo<BizDataSourceVo>> page(@RequestBody BizSourceQueryParam queryParam) {
BizDataSourceQueryDTO queryDTO = new BizDataSourceQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BizDataSourceDTO> dataSystemPage = sourceRepository.queryPage(queryDTO);
PageVo<BizDataSourceVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> {
BizDataSourceVo vo = new BizDataSourceVo();
BeanUtils.copyProperties(dataSystem, vo);
return vo;
});
return Response.success(systemVoPageInfo);
}
@PostMapping("/delete")
public Response<List<Integer>> delete(@RequestBody BizSystemDeleteParam deleteParam) {
sourceRepository.deleteDataSource(deleteParam.getIds());
return Response.success(deleteParam.getIds());
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSystemController.java → src/main/java/com/ediagnosis/cdr/dataIntegration/BizSystemController.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam;
import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo;
import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.ediagnosis.cdr.value.Response;
import com.ediagnosis.cdr.context.values.Response;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem;
import com.ediagnosis.cdr.dataIntegration.inner.BizSystemRepository;
import com.ediagnosis.cdr.dataIntegration.value.BizSystemVo;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemAddOrUpdateParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemDeleteParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizSystemQueryParam;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
......@@ -20,43 +20,36 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author monojun
* @description 业务系统controller
* @createTime 2025年08月04日
* @description 业务系统
* @createTime 2025年08月06日
*/
@RestController
@RequestMapping("/bizSystem")
@RequiredArgsConstructor
public class BusinessSystemController {
private final BusinessSystemRepository systemRepository;
public class BizSystemController {
private final BizSystemRepository systemRepository;
@PostMapping("/add")
public Response<Long> 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<Long> update(@RequestBody DataSystemUpdateParam updateParam) {
BusinessDataSystemDTO addDTO = new BusinessDataSystemDTO();
BeanUtils.copyProperties(updateParam, addDTO);
Long id = systemRepository.updateDataSystem(addDTO);
@PostMapping("/addOrUpdate")
public Response<Integer> addOrUpdate(@RequestBody BizSystemAddOrUpdateParam addOrUpdateParam) {
BizSystemDTO addDTO = new BizSystemDTO();
BeanUtils.copyProperties(addOrUpdateParam, addDTO);
Integer id = systemRepository.addBizSystem(addDTO);
return Response.success(id);
}
@PostMapping("/page")
public Response<PageVo<BusinessDataSystemVo>> page(@RequestBody DataSystemQueryParam queryParam) {
BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO();
public Response<PageVo<BizSystemVo>> page(@RequestBody BizSystemQueryParam queryParam) {
BizSystemQueryDTO queryDTO = new BizSystemQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataSystem> dataSystemPage = systemRepository.queryPage(queryDTO);
PageVo<BusinessDataSystemVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> {
BusinessDataSystemVo vo = new BusinessDataSystemVo();
Page<BizSystem> dataSystemPage = systemRepository.queryPage(queryDTO);
PageVo<BizSystemVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> {
BizSystemVo vo = new BizSystemVo();
BeanUtils.copyProperties(dataSystem, vo);
return vo;
});
......@@ -65,9 +58,9 @@ public class BusinessSystemController {
@PostMapping("/delete")
public Response<Long> delete(@RequestBody DataSystemDeleteParam deleteParam) {
systemRepository.deleteDataSystem(deleteParam.getId());
return Response.success(deleteParam.getId());
public Response<List<Integer>> delete(@RequestBody BizSystemDeleteParam deleteParam) {
systemRepository.deleteDataSystem(deleteParam.getIds());
return Response.success(deleteParam.getIds());
}
......
src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableController.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.ediagnosis.cdr.context.values.Response;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableQueryDTO;
import com.ediagnosis.cdr.dataIntegration.inner.BizTableRepository;
import com.ediagnosis.cdr.dataIntegration.value.BizTableVo;
import com.ediagnosis.cdr.dataIntegration.value.param.BizTableAddOrUpdateParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizTableDeleteParam;
import com.ediagnosis.cdr.dataIntegration.value.param.BizTableQueryParam;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author monojun
* @description 源数据表controller
* @createTime 2025年08月06日
*/
@RestController
@RequestMapping("/bizTable")
@RequiredArgsConstructor
public class BizTableController {
private final BizTableRepository tableRepository;
@PostMapping("/addOrUpdate")
public Response<Integer> addOrUpdate(@RequestBody BizTableAddOrUpdateParam addOrUpdateParam) {
BizTableDTO addDTO = new BizTableDTO();
BeanUtils.copyProperties(addOrUpdateParam, addDTO);
Integer id = tableRepository.addOrUpdateDataTable(addDTO);
return Response.success(id);
}
@PostMapping("/page")
public Response<PageVo<BizTableVo>> page(@RequestBody BizTableQueryParam queryParam) {
BizTableQueryDTO queryDTO = new BizTableQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BizTableDTO> dataSystemPage = tableRepository.queryPage(queryDTO);
PageVo<BizTableVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataTableDTO -> {
BizTableVo vo = new BizTableVo();
BeanUtils.copyProperties(dataTableDTO, vo);
return vo;
});
return Response.success(systemVoPageInfo);
}
@PostMapping("/delete")
public Response<List<Integer>> delete(@RequestBody BizTableDeleteParam deleteParam) {
tableRepository.deleteDataSystem(deleteParam.getIds());
return Response.success(deleteParam.getIds());
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/BizTableFieldController.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.ediagnosis.cdr.context.values.Response;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDefinitionQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition;
import com.ediagnosis.cdr.dataIntegration.inner.BizTableDefinitionRepository;
import com.ediagnosis.cdr.dataIntegration.value.BizTableFieldVo;
import com.ediagnosis.cdr.dataIntegration.value.param.BizTableDefinitionQueryParam;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author monojun
* @description 数据表字段定义
* @createTime 2025年08月06日
*/
@RestController
@RequestMapping("/tableField")
@RequiredArgsConstructor
public class BizTableFieldController {
private final BizTableDefinitionRepository definitionRepository;
@PostMapping("/page")
public Response<PageVo<BizTableFieldVo>> page(@RequestBody BizTableDefinitionQueryParam queryParam) {
BizTableDefinitionQueryDTO queryDTO = new BizTableDefinitionQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BizTableDefinition> dataTableFieldPage = definitionRepository.queryPage(queryDTO);
PageVo<BizTableFieldVo> tableFieldVoPageInfo = PageConvertUtils.copyPageInfo(dataTableFieldPage, dataTableField -> {
BizTableFieldVo vo = new BizTableFieldVo();
BeanUtils.copyProperties(dataTableField, vo);
return vo;
});
return Response.success(tableFieldVoPageInfo);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessDataController.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.context.values.Response;
import com.ediagnosis.cdr.dataIntegration.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSourceQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataTableFieldQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataTableQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSourceVo;
import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableFieldVo;
import com.ediagnosis.cdr.dataIntegration.value.BusinessDataTableVo;
import com.ediagnosis.cdr.dataIntegration.inner.BusinessDataRepository;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
/**
* @author monojun
* @description 业务系统controller
* @createTime 2025年08月04日
*/
@RestController
@RequiredArgsConstructor
public class BusinessDataController {
private final BusinessDataRepository dataRepository;
@PostMapping("/dataSource/page")
public Response<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")
public Response<PageVo<BusinessDataTableFieldVo>> page(@RequestBody DataTableFieldQueryParam queryParam) {
BusinessDataTableFieldQueryDTO queryDTO = new BusinessDataTableFieldQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataTableField> dataTableFieldPage = dataRepository.queryFieldPage(queryDTO);
PageVo<BusinessDataTableFieldVo> tableFieldVoPageInfo = PageConvertUtils.copyPageInfo(dataTableFieldPage, dataTableField -> {
BusinessDataTableFieldVo vo = new BusinessDataTableFieldVo();
BeanUtils.copyProperties(dataTableField, vo);
return vo;
});
return Response.success(tableFieldVoPageInfo);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessSourceController.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemAddParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemDeleteParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemQueryParam;
import com.ediagnosis.cdr.dataIntegration.value.param.DataSystemUpdateParam;
import com.ediagnosis.cdr.dataIntegration.value.BusinessDataSystemVo;
import com.ediagnosis.cdr.dataIntegration.inner.BusinessSystemRepository;
import com.ediagnosis.cdr.context.PageConvertUtils;
import com.ediagnosis.cdr.context.values.PageVo;
import com.ediagnosis.cdr.value.Response;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author monojun
* @description TODO
* @createTime 2025年08月05日
*/
@RestController
@RequestMapping("/dataSource")
@RequiredArgsConstructor
public class BusinessSourceController {
private final BusinessSystemRepository systemRepository;
@PostMapping("/add")
public Response<Long> 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<Long> 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<PageVo<BusinessDataSystemVo>> page(@RequestBody DataSystemQueryParam queryParam) {
BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO();
BeanUtils.copyProperties(queryParam, queryDTO);
Page<BusinessDataSystem> dataSystemPage = systemRepository.queryPage(queryDTO);
PageVo<BusinessDataSystemVo> systemVoPageInfo = PageConvertUtils.copyPageInfo(dataSystemPage, dataSystem -> {
BusinessDataSystemVo vo = new BusinessDataSystemVo();
BeanUtils.copyProperties(dataSystem, vo);
return vo;
});
return Response.success(systemVoPageInfo);
}
@PostMapping("/delete")
public Response<Long> delete(@RequestBody DataSystemDeleteParam deleteParam) {
systemRepository.deleteDataSystem(deleteParam.getId());
return Response.success(deleteParam.getId());
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/BusinessTableController.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration;
/**
* @author monojun
* @description TODO
* @createTime 2025年08月05日
*/
public class BusinessTableController {
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BizDataDao.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizDataSource;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTable;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizDataSourceMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizSystemMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableDefinitionMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableMapper;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
/**
* @author monojun
* @description 业务dao
* @createTime 2025年08月06日
*/
@Component
@RequiredArgsConstructor
public class BizDataDao {
private final BizSystemMapper systemMapper;
private final BizDataSourceMapper dataSourceMapper;
private final BizTableMapper tableMapper;
private final BizTableDefinitionMapper tableDefinitionMapper;
/**
* 新增or更新业务系统
*
* @param bizSystemDTO 业务系统dto
* @return 业务系统主键id
*/
public Integer addOrUpdateBizSystem(BizSystemDTO bizSystemDTO) {
BizSystem bizSystem = new BizSystem();
BeanUtils.copyProperties(bizSystemDTO, bizSystem);
bizSystem.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
systemMapper.insertOrUpdate(bizSystem);
return bizSystem.getId();
}
/**
* 删除业务系统
*
* @param dataSystemIds 业务系统id列表
*/
public void deleteBatchBizSystem(List<Integer> dataSystemIds) {
systemMapper.deleteBatchByIds(dataSystemIds);
}
/**
* 分页查询业务系统信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizSystem>
*/
public Page<BizSystem> querySystemPage(BizSystemQueryDTO queryDTO) {
QueryWrapper queryWrapper = QueryWrapper.create();
if (StringUtils.hasText(queryDTO.getName())) {
queryWrapper.like(BizSystem::getName, queryDTO.getName());
}
queryWrapper.orderBy(BizSystem::getUpdateTime, false);
queryWrapper.orderBy(BizSystem::getId, false);
return systemMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper);
}
/**
* 新增or更新业务数据源
*
* @param dataSourceDTO dataSourceDTO
* @return 数据源主键id
*/
public Integer addOrUpdateDataSource(BizDataSourceDTO dataSourceDTO) {
BizDataSource dataSource = new BizDataSource();
BeanUtils.copyProperties(dataSourceDTO, dataSource);
dataSource.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
dataSourceMapper.insertOrUpdate(dataSource);
return dataSource.getId();
}
/**
* 删除数据源
*
* @param dataSourceIds 数据源id列表
*/
public void deleteBatchDataSource(List<Integer> dataSourceIds) {
dataSourceMapper.deleteBatchByIds(dataSourceIds);
}
/**
* 分页查询业务数据源信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataSource>
*/
public Page<BizDataSourceDTO> querySourcePage(BizDataSourceQueryDTO queryDTO) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select("d.*", "ds.name as bizSystemName")
.from(BizDataSource.class).as("d")
.leftJoin(BizSystem.class).as("ds")
.on(BizDataSource::getBizSystemId, BizSystem::getId)
.orderBy(BizDataSource::getUpdateTime, false)
.orderBy(BizDataSource::getId, false);
if (!CollectionUtils.isEmpty(queryDTO.getBizSystemIds())) {
queryWrapper.in(BizDataSource::getBizSystemId, queryDTO.getBizSystemIds());
}
if (StringUtils.hasText(queryDTO.getName())) {
queryWrapper.like(BizDataSource::getName, queryDTO.getName());
}
if (StringUtils.hasText(queryDTO.getIp())) {
queryWrapper.like(BizDataSource::getIp, queryDTO.getIp());
}
if (StringUtils.hasText(queryDTO.getType())) {
queryWrapper.eq(BizDataSource::getType, queryDTO.getType());
}
return dataSourceMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BizDataSourceDTO.class);
}
/**
* 新增or更新业务表信息
*
* @param tableDTO tableDTO
* @return 数据表主键id
*/
public Integer addOrUpdateDataTable(BizTableDTO tableDTO) {
BizTable bizTable = new BizTable();
BeanUtils.copyProperties(tableDTO, bizTable);
bizTable.setUpdateTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
tableMapper.insertOrUpdate(bizTable);
return bizTable.getId();
}
/**
* 删除业务表信息
*
* @param dataTableIds 业务表id列表
*/
public void deleteBatchDataTable(List<Integer> dataTableIds) {
tableMapper.deleteBatchByIds(dataTableIds);
}
/**
* 分页查询业务表信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizDataTableDTO>
*/
public Page<BizTableDTO> queryTablePage(BizTableQueryDTO queryDTO) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select("t.*, d.id as bizDataSourceId, d.name as bizDataSourceName, ds.id as bizSystemId, ds.name as bizSystemName")
.from(BizTable.class).as("t")
.leftJoin(BizDataSource.class).as("d")
.on(BizTable::getBizDataSourceId, BizDataSource::getId)
.leftJoin(BizSystem.class).as("ds")
.on(BizTable::getBizSystemId, BizSystem::getId)
.orderBy(BizTable::getUpdateTime, false)
.orderBy(BizTable::getId, false);
if (!CollectionUtils.isEmpty(queryDTO.getBizSystemIds())) {
queryWrapper.in(BizTable::getBizSystemId, queryDTO.getBizSystemIds());
}
if (!CollectionUtils.isEmpty(queryDTO.getBizDataSourceIds())) {
queryWrapper.in(BizTable::getBizDataSourceId, queryDTO.getBizDataSourceIds());
}
if (StringUtils.hasText(queryDTO.getTableName())) {
queryWrapper.like(BizTable::getTableName, queryDTO.getTableName());
}
if (StringUtils.hasText(queryDTO.getTableCode())) {
queryWrapper.like(BizTable::getTableCode, queryDTO.getTableCode());
}
return tableMapper.paginateAs(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper, BizTableDTO.class);
}
/**
* 分页查询业务表字段信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizTableDefinition>
*/
public Page<BizTableDefinition> queryFieldPage(BizTableDefinitionQueryDTO queryDTO) {
QueryWrapper queryWrapper = QueryWrapper.create();
if (StringUtils.hasText(queryDTO.getFieldName())) {
queryWrapper.like(BizTableDefinition::getFieldName, queryDTO.getFieldName());
}
if (StringUtils.hasText(queryDTO.getFieldType())) {
queryWrapper.eq(BizTableDefinition::getFieldType, queryDTO.getFieldType());
}
if (queryDTO.getTableId() != null) {
queryWrapper.eq(BizTableDefinition::getTableId, queryDTO.getTableId());
}
queryWrapper.orderBy(BizTableDefinition::getId, false);
return tableDefinitionMapper.paginate(queryDTO.getPageNo(), queryDTO.getPageSize(), queryWrapper);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/BusinessDataDao.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration.dao;
import com.ediagnosis.cdr.dataCollect.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSystemMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableFieldMapper;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataTableMapper;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.util.Date;
/**
* @author monojun
* @description 业务dao
* @createTime 2025年08月04日
*/
@Component
@RequiredArgsConstructor
public class BusinessDataDao {
private final BusinessDataSystemMapper dataSystemMapper;
private final BusinessDataSourceMapper dataSourceMapper;
private final BusinessDataTableMapper dataTableMapper;
private final BusinessDataTableFieldMapper dataTableFieldMapper;
/**
* 新增业务系统
*
* @param dataSystemDTO dataSystemDTO
* @return 业务系统主键id
*/
public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) {
BusinessDataSystem dataSystem = new BusinessDataSystem();
BeanUtils.copyProperties(dataSystemDTO, dataSystem);
dataSystem.setCreateTime(new Date());
dataSystem.setUpdateTime(new Date());
dataSystemMapper.insert(dataSystem);
return dataSystem.getId();
}
/**
* 更新业务系统
*
* @param dataSystemDTO dataSystemDTO
* @return 业务系统主键id
*/
public Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO) {
BusinessDataSystem dataSystem = new BusinessDataSystem();
BeanUtils.copyProperties(dataSystemDTO, dataSystem);
dataSystem.setUpdateTime(new Date());
dataSystemMapper.update(dataSystem);
return dataSystem.getId();
}
/**
* 删除业务系统
*
* @param dataSystemId 业务系统id
*/
public void deleteDataSystem(Long dataSystemId) {
dataSystemMapper.deleteById(dataSystemId);
}
/**
* 分页查询业务系统信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataSystem>
*/
public Page<BusinessDataSystem> 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<BusinessDataSource>
*/
public Page<BusinessDataSourceDTO> 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<BusinessDataTable>
*/
public Page<BusinessDataTableDTO> 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<BusinessDataTableField>
*/
public Page<BusinessDataTableField> 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);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceDTO.java
View file @ 49a7196d
......@@ -4,7 +4,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
......@@ -12,14 +11,14 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataSourceDTO implements Serializable {
public class BizDataSourceDTO implements Serializable {
@Serial
private static final long serialVersionUID = -447329639545048136L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 数据源名称
......@@ -34,52 +33,31 @@ public class BusinessDataSourceDTO implements Serializable {
/**
* IP地址
*/
private String ipAddress;
private String ip;
/**
* 属性信息
*/
private String properties;
/**
* 业务系统id
*/
private Long businessId;
/**
* 业务系统名称
*/
private String businessName;
/**
* 描述
*/
private String description;
/**
* 连接状态: 0-未知 1-已连接 2-未连接
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
* 更新时间
*/
private Long createUserId;
private String updateTime;
/**
* 更新时间
* 业务系统id
*/
private Date updateTime;
private Integer bizSystemId;
/**
* 更新人
* 业务系统名称
*/
private Long updateUserId;
private String bizSystemName;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSourceQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizDataSourceQueryDTO.java
View file @ 49a7196d
......@@ -12,14 +12,14 @@ import java.util.List;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataSourceQueryDTO extends PageQuery {
public class BizDataSourceQueryDTO extends PageQuery {
@Serial
private static final long serialVersionUID = 4373837873599613512L;
/**
* 业务系统id列表
*/
private List<Long> businessIds;
private List<Integer> bizSystemIds;
/**
* 数据源名称
......@@ -29,7 +29,7 @@ public class BusinessDataSourceQueryDTO extends PageQuery {
/**
* ip地址
*/
private String ipAddress;
private String ip;
/**
* 数据源类型
......
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemDTO.java
View file @ 49a7196d
......@@ -12,14 +12,14 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataSystemDTO implements Serializable {
public class BizSystemDTO implements Serializable {
@Serial
private static final long serialVersionUID = 8024021126762424795L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 业务系统名称
......@@ -31,23 +31,8 @@ public class BusinessDataSystemDTO implements Serializable {
*/
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUserId;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private Long updateUserId;
private String updateTime;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataSystemQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizSystemQueryDTO.java
View file @ 49a7196d
......@@ -3,19 +3,20 @@ package com.ediagnosis.cdr.dataIntegration.dao.dto;
import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery;
import lombok.Data;
import java.io.Serial;
/**
* @author monojun
* @description 业务系统查询参数
* @createTime 2025年07月31日
* @description 业务系统查询dto
* @createTime 2025年08月06日
*/
@Data
public class BusinessDataSystemQueryDTO extends PageQuery {
private static final long serialVersionUID = -725393158125223566L;
public class BizSystemQueryDTO extends PageQuery {
@Serial
private static final long serialVersionUID = -5610198422339477569L;
/**
* 业务系统名称
*/
private String name;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDTO.java
View file @ 49a7196d
......@@ -4,7 +4,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
......@@ -12,68 +11,52 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataTableDTO implements Serializable {
public class BizTableDTO implements Serializable {
@Serial
private static final long serialVersionUID = -1723613352839697417L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 业务表名称
*/
private String name;
private String tableName;
/**
* 业务表编号
* 业务表编码
*/
private String tableNo;
private String tableCode;
/**
* 业务系统id
*/
private Long businessId;
private Integer bizSystemId;
/**
* 业务系统名称
*/
private String businessName;
private String bizSystemName;
/**
* 业务数据源id
*/
private Long sourceId;
private Integer bizDataSourceId;
/**
* 业务数据源名称
*/
private String sourceName;
private String bizDataSourceName;
/**
* 描述
*/
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUserId;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private Long updateUserId;
private String updateTime;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableFieldQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableDefinitionQueryDTO.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.dto;
import com.ediagnosis.cdr.dataIntegration.value.param.PageQuery;
import com.mybatisflex.annotation.Column;
import lombok.Data;
import java.io.Serial;
......@@ -11,7 +12,7 @@ import java.io.Serial;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataTableFieldQueryDTO extends PageQuery {
public class BizTableDefinitionQueryDTO extends PageQuery {
@Serial
private static final long serialVersionUID = -7409716170936124466L;
......@@ -28,5 +29,5 @@ public class BusinessDataTableFieldQueryDTO extends PageQuery {
/**
* 业务表id
*/
private Long tableId;
private Integer tableId;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BusinessDataTableQueryDTO.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/dto/BizTableQueryDTO.java
View file @ 49a7196d
......@@ -12,27 +12,28 @@ import java.util.List;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataTableQueryDTO extends PageQuery {
public class BizTableQueryDTO extends PageQuery {
@Serial
private static final long serialVersionUID = 2568845339056229745L;
/**
* 业务系统id
*/
private List<Long> businessIds;
private List<Integer> bizSystemIds;
/**
* 业务数据源id列表
*/
private List<Long> sourceIds;
private List<Integer> bizDataSourceIds;
/**
* 业务表名称
*/
private String name;
private String tableName;
/**
* 业务表编号
*/
private String tableNo;
private String tableCode;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSource.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizDataSource.java
View file @ 49a7196d
......@@ -6,26 +6,23 @@ import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
* @description 业务系统数据源表
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Data
@Table(value = "business_data_source")
public class BusinessDataSource implements Serializable {
@Serial
@Table(value = "biz_data_source")
public class BizDataSource implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@Id(value = "id", keyType = KeyType.Auto)
private Long id;
private Integer id;
/**
* 数据源名称
......@@ -42,8 +39,8 @@ public class BusinessDataSource implements Serializable {
/**
* IP地址
*/
@Column(value = "ip_address")
private String ipAddress;
@Column(value = "ip")
private String ip;
/**
* 属性信息
......@@ -54,8 +51,8 @@ public class BusinessDataSource implements Serializable {
/**
* 业务系统id
*/
@Column(value = "business_id")
private Long businessId;
@Column(value = "biz_system_id")
private Integer bizSystemId;
/**
* 描述
......@@ -63,39 +60,9 @@ public class BusinessDataSource implements Serializable {
@Column(value = "description")
private String description;
/**
* 连接状态: 0-未知 1-已连接 2-未连接
*/
@Column(value = "status")
private Integer status;
/**
* 创建时间
*/
@Column(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@Column(value = "create_user_id")
private Long createUserId;
/**
* 更新时间
*/
@Column(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@Column(value = "update_user_id")
private Long updateUserId;
/**
* 是否删除: 0-未删除 1-已删除
*/
@Column(value = "is_deleted", isLogicDelete = true)
private Integer isDeleted;
private String updateTime;
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataSystem.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizSystem.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.entity;
import java.io.Serializable;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.util.Date;
/**
* @author monojun
* @description 业务系统表
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Data
@Table("business_data_system")
public class BusinessDataSystem {
@Table(value = "biz_system")
public class BizSystem implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@Id(value = "id", keyType = KeyType.Auto)
private Long id;
private Integer id;
/**
* 业务系统名称
......@@ -34,33 +36,9 @@ public class BusinessDataSystem {
@Column(value = "description")
private String description;
/**
* 创建时间
*/
@Column(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@Column(value = "create_user_id")
private Long createUserId;
/**
* 更新时间
*/
@Column(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@Column(value = "update_user_id")
private Long updateUserId;
/**
* 是否删除 0-未删除 1-已删除
*/
@Column(value = "is_deleted", isLogicDelete = true)
private Integer isDeleted;
private String updateTime;
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTable.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTable.java
View file @ 49a7196d
......@@ -6,51 +6,47 @@ import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
* @description 业务表信息表
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Data
@Table(value = "business_data_table")
public class BusinessDataTable implements Serializable {
@Serial
@Table(value = "biz_table")
public class BizTable implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@Id(value = "id", keyType = KeyType.Auto)
private Long id;
private Integer id;
/**
* 业务表名称
*/
@Column(value = "name")
private String name;
@Column(value = "table_name")
private String tableName;
/**
* 业务表编号
* 业务表编码
*/
@Column(value = "table_no")
private String tableNo;
@Column(value = "table_code")
private String tableCode;
/**
* 业务系统id
*/
@Column(value = "business_id")
private Long businessId;
@Column(value = "biz_system_id")
private Integer bizSystemId;
/**
* 业务数据源id
*/
@Column(value = "source_id")
private Long sourceId;
@Column(value = "biz_data_source_id")
private Integer bizDataSourceId;
/**
* 描述
......@@ -58,33 +54,9 @@ public class BusinessDataTable implements Serializable {
@Column(value = "description")
private String description;
/**
* 创建时间
*/
@Column(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@Column(value = "create_user_id")
private Long createUserId;
/**
* 更新时间
*/
@Column(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@Column(value = "update_user_id")
private Long updateUserId;
/**
* 是否删除: 0-未删除 1-已删除
*/
@Column(value = "is_deleted", isLogicDelete = true)
private Byte isDeleted;
private String updateTime;
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BusinessDataTableField.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/entity/BizTableDefinition.java
View file @ 49a7196d
......@@ -6,26 +6,23 @@ import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
* @description 业务字段信息表
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Data
@Table(value = "business_data_table_field")
public class BusinessDataTableField implements Serializable {
@Serial
@Table(value = "biz_table_definition")
public class BizTableDefinition implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@Id(value = "id", keyType = KeyType.Auto)
private Long id;
private Integer id;
/**
* 字段名称
......@@ -43,41 +40,11 @@ public class BusinessDataTableField implements Serializable {
* 业务表id
*/
@Column(value = "table_id")
private Long tableId;
private Integer tableId;
/**
* 描述
*/
@Column(value = "description")
private String description;
/**
* 创建时间
*/
@Column(value = "create_time")
private Date createTime;
/**
* 创建人
*/
@Column(value = "create_user_id")
private Long createUserId;
/**
* 更新时间
*/
@Column(value = "update_time")
private Date updateTime;
/**
* 更新人
*/
@Column(value = "update_user_id")
private Long updateUserId;
/**
* 是否删除: 0-未删除 1-已删除
*/
@Column(value = "is_deleted", isLogicDelete = true)
private Byte isDeleted;
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSourceMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizDataSourceMapper.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.mapper;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizDataSource;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author monojun
* @description 数据源mapper
* @createTime 2025年08月01日
* @description 业务系统数据源mapper
* @createTime 2025年08月06日
*/
@Mapper
public interface BusinessDataSourceMapper extends BaseMapper<BusinessDataSource> {
int batchInsert(@Param("list") List<BusinessDataSource> list);
public interface BizDataSourceMapper extends BaseMapper<BizDataSource> {
int batchInsert(@Param("list") List<BizDataSource> list);
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataSystemMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizSystemMapper.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.mapper;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author monojun
* @description 业务系统mapper
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Mapper
public interface BusinessDataSystemMapper extends BaseMapper<BusinessDataSystem> {
public interface BizSystemMapper extends BaseMapper<BizSystem> {
int batchInsert(@Param("list") List<BizSystem> list);
int batchInsert(@Param("list") List<BusinessDataSystem> list);
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableFieldMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableDefinitionMapper.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.mapper;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author monojun
* @description 业务表字段mapper
* @createTime 2025年08月01日
* @description 业务字段信息mapper
* @createTime 2025年08月06日
*/
@Mapper
public interface BusinessDataTableFieldMapper extends BaseMapper<BusinessDataTableField> {
public interface BizTableDefinitionMapper extends BaseMapper<BizTableDefinition> {
int batchInsert(@Param("list") List<BusinessDataTableField> list);
int batchInsert(@Param("list") List<BizTableDefinition> list);
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BusinessDataTableMapper.java → src/main/java/com/ediagnosis/cdr/dataIntegration/dao/mapper/BizTableMapper.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.dao.mapper;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTable;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTable;
import java.util.List;
import com.mybatisflex.core.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author monojun
* @description 业务表mapper
* @createTime 2025年08月01日
* @createTime 2025年08月06日
*/
@Mapper
public interface BusinessDataTableMapper extends BaseMapper<BusinessDataTable> {
int batchInsert(@Param("list") List<BusinessDataTable> list);
public interface BizTableMapper extends BaseMapper<BizTable> {
int batchInsert(@Param("list") List<BizTable> list);
}
\ No newline at end of file
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSourceRepository.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizDataSourceQueryDTO;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author monojun
* @description 数据源Repository
* @createTime 2025年08月05日
*/
@Repository
@RequiredArgsConstructor
public class BizSourceRepository {
private final BizDataDao bizDataDao;
/**
* 新增or更新数据源
*
* @param dataSourceDTO 数据源dto
* @return 数据源主键id
*/
public Integer addDataSource(BizDataSourceDTO dataSourceDTO) {
return bizDataDao.addOrUpdateDataSource(dataSourceDTO);
}
/**
* 分页查询数据源信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizDataSourceDTO>
*/
public Page<BizDataSourceDTO> queryPage(BizDataSourceQueryDTO queryDTO) {
return bizDataDao.querySourcePage(queryDTO);
}
/**
* 删除业务系统
*
* @param dataSourceIds 数据源id列表
*/
public void deleteDataSource(List<Integer> dataSourceIds) {
bizDataDao.deleteBatchDataSource(dataSourceIds);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizSystemRepository.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizSystemQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author monojun
* @description BizSystemRepository
* @createTime 2025年08月05日
*/
@Repository
@RequiredArgsConstructor
public class BizSystemRepository {
private final BizDataDao bizDataDao;
/**
* 新增or更新业务系统
*
* @param bizSystemDTO 业务系统dto
* @return 业务系统主键id
*/
public Integer addBizSystem(BizSystemDTO bizSystemDTO) {
return bizDataDao.addOrUpdateBizSystem(bizSystemDTO);
}
/**
* 分页查询业务系统信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizSystem>
*/
public Page<BizSystem> queryPage(BizSystemQueryDTO queryDTO) {
return bizDataDao.querySystemPage(queryDTO);
}
/**
* 删除业务系统
*
* @param dataSystemIds 业务系统id列表
*/
public void deleteDataSystem(List<Integer> dataSystemIds) {
bizDataDao.deleteBatchBizSystem(dataSystemIds);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableDefinitionRepository.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDefinitionQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
/**
* @author monojun
* @description BizTableDefinitionRepository
* @createTime 2025年08月06日
*/
@Repository
@RequiredArgsConstructor
public class BizTableDefinitionRepository {
private final BizDataDao bizDataDao;
/**
* 分页查询源业务表字段信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizTableDTO>
*/
public Page<BizTableDefinition> queryPage(BizTableDefinitionQueryDTO queryDTO) {
return bizDataDao.queryFieldPage(queryDTO);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BizTableRepository.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BizTableQueryDTO;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.util.List;
/**
* @author monojun
* @description 数据表Repository
* @createTime 2025年08月05日
*/
@Repository
@RequiredArgsConstructor
public class BizTableRepository {
private final BizDataDao bizDataDao;
/**
* 新增or更新源业务表
*
* @param tableDTO 源业务表dto
* @return 源业务表主键id
*/
public Integer addOrUpdateDataTable(BizTableDTO tableDTO) {
return bizDataDao.addOrUpdateDataTable(tableDTO);
}
/**
* 分页查询源业务表信息
*
* @param queryDTO 查询dto
* @return PageInfo<BizTableDTO>
*/
public Page<BizTableDTO> queryPage(BizTableQueryDTO queryDTO) {
return bizDataDao.queryTablePage(queryDTO);
}
/**
* 删除源业务表
*
* @param dataTableIds 源数据表id
*/
public void deleteDataSystem(List<Integer> dataTableIds) {
bizDataDao.deleteBatchDataTable(dataTableIds);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessDataRepository.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataTableField;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
/**
* @author monojun
* @description BusinessDataRepository
* @createTime 2025年08月04日
*/
@Repository
@RequiredArgsConstructor
public class BusinessDataRepository {
private final BusinessDataDao businessDataDao;
/**
* 分页查询业务系统信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataSystem>
*/
public Page<BusinessDataSystem> queryPage(BusinessDataSystemQueryDTO queryDTO) {
return businessDataDao.querySystemPage(queryDTO);
}
/**
* 分页查询业务数据源信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataSource>
*/
public Page<BusinessDataSourceDTO> querySourcePage(BusinessDataSourceQueryDTO queryDTO) {
return businessDataDao.querySourcePage(queryDTO);
}
/**
* 分页查询业务表信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataTable>
*/
public Page<BusinessDataTableDTO> queryTablePage(BusinessDataTableQueryDTO queryDTO) {
return businessDataDao.queryTablePage(queryDTO);
}
/**
* 分页查询业务表字段信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataTableField>
*/
public Page<BusinessDataTableField> queryFieldPage(BusinessDataTableFieldQueryDTO queryDTO) {
return businessDataDao.queryFieldPage(queryDTO);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/inner/BusinessSystemRepository.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dataIntegration.inner;
import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSystemQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.mybatisflex.core.paginate.Page;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
/**
* @author monojun
* @description BusinessSystemRepository
* @createTime 2025年08月05日
*/
@Repository
@RequiredArgsConstructor
public class BusinessSystemRepository {
private final BusinessDataDao businessDataDao;
/**
* 新增业务系统
*
* @param dataSystemDTO 业务系统dto
* @return 业务系统主键id
*/
public Long addDataSystem(BusinessDataSystemDTO dataSystemDTO) {
businessDataDao.addDataSystem(dataSystemDTO);
return businessDataDao.addDataSystem(dataSystemDTO);
}
/**
* 更新业务系统
*
* @param dataSystemDTO 业务系统dto
* @return 业务系统主键id
*/
public Long updateDataSystem(BusinessDataSystemDTO dataSystemDTO) {
return businessDataDao.updateDataSystem(dataSystemDTO);
}
/**
* 分页查询业务系统信息
*
* @param queryDTO 查询dto
* @return PageInfo<BusinessDataSystem>
*/
public Page<BusinessDataSystem> queryPage(BusinessDataSystemQueryDTO queryDTO) {
return businessDataDao.querySystemPage(queryDTO);
}
/**
* 删除业务系统
*
* @param dataSystemId 业务系统id
*/
public void deleteDataSystem(Long dataSystemId) {
businessDataDao.deleteDataSystem(dataSystemId);
}
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSourceVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizDataSourceVo.java
View file @ 49a7196d
......@@ -4,7 +4,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
......@@ -12,14 +11,14 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataSourceVo implements Serializable {
public class BizDataSourceVo implements Serializable {
@Serial
private static final long serialVersionUID = -4205114103165887164L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 数据源名称
......@@ -27,24 +26,19 @@ public class BusinessDataSourceVo implements Serializable {
private String name;
/**
* 数据源类型（mysql、oracle、postgreSQL、sqlserver、h2、sqlite）
* 数据源类型
*/
private String type;
/**
* IP地址
*/
private String ipAddress;
private String ip;
/**
* 业务系统id
*/
private Long bizSystemId;
/**
* 业务系统名称
* 属性信息
*/
private String bizSystemName;
private String properties;
/**
* 描述
......@@ -52,32 +46,23 @@ public class BusinessDataSourceVo implements Serializable {
private String description;
/**
* 属性
*/
private String properties;
/**
* 连接状态
* 更新时间
*/
private Integer status;
private String updateTime;
/**
* 创建时间
* 业务系统id
*/
private Date createTime;
private Integer bizSystemId;
/**
* 创建人
* 业务系统名称
*/
private Long createUserId;
private String bizSystemName;
/**
* 更新时间
* 连接状态
*/
private Date updateTime;
private Integer status;
/**
* 更新人
*/
private Long updateUserId;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataSystemVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizSystemVo.java
View file @ 49a7196d
......@@ -4,7 +4,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
......@@ -12,13 +11,14 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataSystemVo implements Serializable {
public class BizSystemVo implements Serializable {
@Serial
private static final long serialVersionUID = 1995094555769215993L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 业务系统名称
......@@ -30,24 +30,9 @@ public class BusinessDataSystemVo implements Serializable {
*/
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUserId;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private Long updateUserId;
private String updateTime;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableFieldVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableFieldVo.java
View file @ 49a7196d
......@@ -4,7 +4,6 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**
* @author monojun
......@@ -12,14 +11,14 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataTableFieldVo implements Serializable {
public class BizTableFieldVo implements Serializable {
@Serial
private static final long serialVersionUID = 3062177923173755855L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 字段名称
......@@ -34,30 +33,10 @@ public class BusinessDataTableFieldVo implements Serializable {
/**
* 业务表id
*/
private Long tableId;
private Integer tableId;
/**
* 描述
*/
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUserId;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private Long updateUserId;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/BusinessDataTableVo.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/BizTableVo.java
View file @ 49a7196d
......@@ -12,67 +12,52 @@ import java.util.Date;
* @createTime 2025年07月31日
*/
@Data
public class BusinessDataTableVo implements Serializable {
public class BizTableVo implements Serializable {
@Serial
private static final long serialVersionUID = 8791629491093128048L;
/**
* 主键id
*/
private Long id;
private Integer id;
/**
* 业务表名称
*/
private String name;
private String tableName;
/**
* 业务表编号
* 业务表编码
*/
private String tableNo;
private String tableCode;
/**
* 业务系统id
*/
private Long businessId;
private Integer bizSystemId;
/**
* 业务系统名称
*/
private String businessName;
private String bizSystemName;
/**
* 业务数据源id
*/
private Long sourceId;
private Integer bizDataSourceId;
/**
* 业务数据源名称
*/
private String sourceName;
private String bizDataSourceName;
/**
* 描述
*/
private String description;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUserId;
/**
* 更新时间
*/
private Date updateTime;
/**
* 更新人
*/
private Long updateUserId;
private String updateTime;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceAddOrUpdateParam.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.value.param;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* @author monojun
* @description 数据源新增参数
* @createTime 2025年08月05日
*/
@Data
public class BizSourceAddOrUpdateParam implements Serializable {
@Serial
private static final long serialVersionUID = 5282468723403441092L;
/**
* 主键id
*/
private Integer id;
/**
* 数据源名称
*/
@Column(value = "name")
private String name;
/**
* 数据源类型
*/
@Column(value = "type")
private String type;
/**
* IP地址
*/
@Column(value = "ip")
private String ip;
/**
* 属性信息
*/
@Column(value = "properties")
private String properties;
/**
* 业务系统id
*/
@Column(value = "biz_system_id")
private Integer bizSystemId;
/**
* 描述
*/
@Column(value = "description")
private String description;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemDeleteParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceDeleteParam.java
View file @ 49a7196d
......@@ -4,6 +4,7 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* @author monojun
......@@ -11,9 +12,9 @@ import java.io.Serializable;
* @createTime 2025年08月05日
*/
@Data
public class DataSystemDeleteParam implements Serializable {
public class BizSourceDeleteParam implements Serializable {
@Serial
private static final long serialVersionUID = -5941215912179720671L;
private Long id;
private List<Integer> ids;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSourceQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSourceQueryParam.java
View file @ 49a7196d
......@@ -11,14 +11,14 @@ import java.util.List;
* @createTime 2025年08月01日
*/
@Data
public class DataSourceQueryParam extends PageQuery {
public class BizSourceQueryParam extends PageQuery {
@Serial
private static final long serialVersionUID = 4384878864788101913L;
/**
* 业务系统id列表
* 业务系统id
*/
private List<Long> businessIds;
private List<Integer> bizSystemIds;
/**
* 数据源名称
......@@ -28,7 +28,7 @@ public class DataSourceQueryParam extends PageQuery {
/**
* ip地址
*/
private String ipAddress;
private String ip;
/**
* 数据源类型
......
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemAddParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemAddOrUpdateParam.java
View file @ 49a7196d
......@@ -11,10 +11,15 @@ import java.io.Serializable;
* @createTime 2025年08月05日
*/
@Data
public class DataSystemAddParam implements Serializable {
public class BizSystemAddOrUpdateParam implements Serializable {
@Serial
private static final long serialVersionUID = 8362821373667292598L;
/**
* 主键id
*/
private Integer id;
/**
* 业务系统名称
*/
......
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemUpdateParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemDeleteParam.java
View file @ 49a7196d
......@@ -4,26 +4,17 @@ import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* @author monojun
* @description 业务系统更新参数
* @description 业务系统删除参数
* @createTime 2025年08月05日
*/
@Data
public class DataSystemUpdateParam implements Serializable {
public class BizSystemDeleteParam implements Serializable {
@Serial
private static final long serialVersionUID = -7333708471431047394L;
private Long id;
/**
* 业务系统名称
*/
private String name;
/**
* 描述
*/
private String description;
private static final long serialVersionUID = -5941215912179720671L;
private List<Integer> ids;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataSystemQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizSystemQueryParam.java
View file @ 49a7196d
......@@ -10,7 +10,7 @@ import java.io.Serial;
* @createTime 2025年08月01日
*/
@Data
public class DataSystemQueryParam extends PageQuery {
public class BizSystemQueryParam extends PageQuery {
@Serial
private static final long serialVersionUID = 5408831076545737168L;
......
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableAddOrUpdateParam.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.value.param;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* @author monojun
* @description 数据表新增参数
* @createTime 2025年08月05日
*/
@Data
public class BizTableAddOrUpdateParam implements Serializable {
@Serial
private static final long serialVersionUID = 3378139727731995899L;
/**
* 主键id
*/
private Integer id;
/**
* 业务表名称
*/
@Column(value = "table_name")
private String tableName;
/**
* 业务表编码
*/
@Column(value = "table_code")
private String tableCode;
/**
* 业务系统id
*/
@Column(value = "biz_system_id")
private Integer bizSystemId;
/**
* 业务数据源id
*/
@Column(value = "biz_data_source_id")
private Integer bizDataSourceId;
/**
* 描述
*/
@Column(value = "description")
private String description;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableFieldQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDefinitionQueryParam.java
View file @ 49a7196d
......@@ -10,7 +10,7 @@ import java.io.Serial;
* @createTime 2025年08月01日
*/
@Data
public class DataTableFieldQueryParam extends PageQuery {
public class BizTableDefinitionQueryParam extends PageQuery {
@Serial
private static final long serialVersionUID = 5419533067070233483L;
......@@ -27,5 +27,5 @@ public class DataTableFieldQueryParam extends PageQuery {
/**
* 业务表id
*/
private Long tableId;
private Integer tableId;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableDeleteParam.java 0 → 100644
View file @ 49a7196d
package com.ediagnosis.cdr.dataIntegration.value.param;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.List;
/**
* @author monojun
* @description 数据表删除参数
* @createTime 2025年08月05日
*/
@Data
public class BizTableDeleteParam implements Serializable {
@Serial
private static final long serialVersionUID = 6212775010515528227L;
private List<Integer> ids;
}
src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/DataTableQueryParam.java → src/main/java/com/ediagnosis/cdr/dataIntegration/value/param/BizTableQueryParam.java
View file @ 49a7196d
......@@ -11,19 +11,20 @@ import java.util.List;
* @createTime 2025年08月01日
*/
@Data
public class DataTableQueryParam extends PageQuery {
public class BizTableQueryParam extends PageQuery {
@Serial
private static final long serialVersionUID = -6012405803243067316L;
/**
* 业务系统id列表
* 业务系统id
*/
private List<Long> businessIds;
private List<Integer> bizSystemIds;
/**
* 业务数据源id列表
*/
private List<Long> sourceIds;
private List<Integer> bizDataSourceIds;
/**
* 业务表名称
......
src/main/java/com/ediagnosis/cdr/dataService/DwsRepository.java
View file @ 49a7196d
package com.ediagnosis.cdr.dataService;
import com.ediagnosis.cdr.context.values.PageVo;
import com.mybatisflex.core.row.Row;
import org.springframework.stereotype.Repository;
......
src/main/java/com/ediagnosis/cdr/indicator/IndicatorRepository.java
View file @ 49a7196d
package com.ediagnosis.cdr.indicator;
import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity;
import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper;
import com.ediagnosis.cdr.context.TimeUtil;
import com.ediagnosis.cdr.indicator.value.Indicator;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
import java.util.Optional;
@Repository
public class IndicatorRepository {
private final IndicatorMapper indicatorMapper;
public IndicatorRepository(IndicatorMapper indicatorMapper) {
this.indicatorMapper = indicatorMapper;
}
private Optional<Indicator> convertToIndicator(IndicatorEntity entity) {
Optional<LocalDateTime> timeOptional = TimeUtil.toLocalDateTime(entity.getUpdateTime());
return timeOptional.map(localDateTime -> new Indicator(
entity.getName(),
entity.getCode(),
entity.getValue(),
localDateTime
));
}
}
//package com.ediagnosis.cdr.indicator;
//
//import com.ediagnosis.cdr.indicator.dao.entity.IndicatorEntity;
//import com.ediagnosis.cdr.indicator.dao.mapper.IndicatorMapper;
//import com.ediagnosis.cdr.context.TimeUtil;
//import com.ediagnosis.cdr.indicator.value.Indicator;
//import org.springframework.stereotype.Repository;
//
//import java.time.LocalDateTime;
//
//import java.util.Optional;
//
//@Repository
//public class IndicatorRepository {
//
// private final IndicatorMapper indicatorMapper;
//
// public IndicatorRepository(IndicatorMapper indicatorMapper) {
// this.indicatorMapper = indicatorMapper;
// }
//
//
//
//
// private Optional<Indicator> convertToIndicator(IndicatorEntity entity) {
// Optional<LocalDateTime> timeOptional = TimeUtil.toLocalDateTime(entity.getUpdateTime());
// return timeOptional.map(localDateTime -> new Indicator(
// entity.getName(),
// entity.getCode(),
// entity.getValue(),
// localDateTime
// ));
//
// }
//
//
//}
src/main/resources/generator/mapper/BizDataSourceMapper.xml 0 → 100644
View file @ 49a7196d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BizDataSourceMapper">
<resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BizDataSource">
<!--@mbg.generated-->
<!--@Table biz_data_source-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="VARCHAR" property="type" />
<result column="ip" jdbcType="VARCHAR" property="ip" />
<result column="properties" jdbcType="LONGVARCHAR" property="properties" />
<result column="biz_system_id" jdbcType="INTEGER" property="bizSystemId" />
<result column="description" jdbcType="LONGVARCHAR" property="description" />
<result column="update_time" jdbcType="VARCHAR" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, `type`, ip, properties, biz_system_id, description, update_time
</sql>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into biz_data_source
(`name`, `type`, ip, properties, biz_system_id, description, update_time)
values
<foreach collection="list" item="item" separator=",">
(#{item.name,jdbcType=VARCHAR}, #{item.type,jdbcType=VARCHAR}, #{item.ip,jdbcType=VARCHAR},
#{item.properties,jdbcType=LONGVARCHAR}, #{item.bizSystemId,jdbcType=INTEGER},
#{item.description,jdbcType=LONGVARCHAR}, #{item.updateTime,jdbcType=VARCHAR})
</foreach>
</insert>
</mapper>
\ No newline at end of file
src/main/resources/generator/mapper/BizSystemMapper.xml 0 → 100644
View file @ 49a7196d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BizSystemMapper">
<resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem">
<!--@mbg.generated-->
<!--@Table biz_system-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="description" jdbcType="LONGVARCHAR" property="description" />
<result column="update_time" jdbcType="VARCHAR" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `name`, description, update_time
</sql>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into biz_system
(`name`, description, update_time)
values
<foreach collection="list" item="item" separator=",">
(#{item.name,jdbcType=VARCHAR}, #{item.description,jdbcType=LONGVARCHAR}, #{item.updateTime,jdbcType=VARCHAR}
)
</foreach>
</insert>
</mapper>
\ No newline at end of file
src/main/resources/generator/mapper/BizTableDefinitionMapper.xml 0 → 100644
View file @ 49a7196d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableDefinitionMapper">
<resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BizTableDefinition">
<!--@mbg.generated-->
<!--@Table biz_table_definition-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="field_name" jdbcType="VARCHAR" property="fieldName" />
<result column="field_type" jdbcType="VARCHAR" property="fieldType" />
<result column="table_id" jdbcType="INTEGER" property="tableId" />
<result column="description" jdbcType="LONGVARCHAR" property="description" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, field_name, field_type, table_id, description
</sql>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into biz_table_definition
(field_name, field_type, table_id, description)
values
<foreach collection="list" item="item" separator=",">
(#{item.fieldName,jdbcType=VARCHAR}, #{item.fieldType,jdbcType=VARCHAR}, #{item.tableId,jdbcType=INTEGER},
#{item.description,jdbcType=LONGVARCHAR})
</foreach>
</insert>
</mapper>
\ No newline at end of file
src/main/resources/generator/mapper/BizTableMapper.xml 0 → 100644
View file @ 49a7196d
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ediagnosis.cdr.dataIntegration.dao.mapper.BizTableMapper">
<resultMap id="BaseResultMap" type="com.ediagnosis.cdr.dataIntegration.dao.entity.BizTable">
<!--@mbg.generated-->
<!--@Table biz_table-->
<id column="id" jdbcType="INTEGER" property="id" />
<result column="table_name" jdbcType="VARCHAR" property="tableName" />
<result column="table_code" jdbcType="VARCHAR" property="tableCode" />
<result column="biz_system_id" jdbcType="BIGINT" property="bizSystemId" />
<result column="biz_data_source_id" jdbcType="BIGINT" property="bizDataSourceId" />
<result column="description" jdbcType="LONGVARCHAR" property="description" />
<result column="update_time" jdbcType="VARCHAR" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, `table_name`, table_code, biz_system_id, biz_data_source_id, description, update_time
</sql>
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into biz_table
(`table_name`, table_code, biz_system_id, biz_data_source_id, description, update_time
)
values
<foreach collection="list" item="item" separator=",">
(#{item.tableName,jdbcType=VARCHAR}, #{item.tableCode,jdbcType=VARCHAR}, #{item.bizSystemId,jdbcType=BIGINT},
#{item.bizDataSourceId,jdbcType=BIGINT}, #{item.description,jdbcType=LONGVARCHAR},
#{item.updateTime,jdbcType=VARCHAR})
</foreach>
</insert>
</mapper>
\ No newline at end of file
src/test/java/com/ediagnosis/cdr/dao/MapperTest.java deleted 100644 → 0
View file @ 503ddce9
package com.ediagnosis.cdr.dao;
import com.ediagnosis.cdr.CdrApplication;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceDTO;
import com.ediagnosis.cdr.dataIntegration.dao.dto.BusinessDataSourceQueryDTO;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSource;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.dao.mapper.BusinessDataSourceMapper;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
/**
* @author monojun
* @description MapperTest
* @createTime 2025年07月31日
*/
@SpringBootTest(classes = CdrApplication.class)
public class MapperTest {
@Autowired
private BusinessDataSourceMapper dataSourceMapper;
@Test
public void test1() {
BusinessDataSourceQueryDTO queryDTO = new BusinessDataSourceQueryDTO();
QueryWrapper queryWrapper = QueryWrapper.create()
.select("d.*, ds.name as businessName")
.from("business_data_source").as("d")
.leftJoin("business_data_system").as("ds")
.on("d.business_id = ds.id");
Page<BusinessDataSourceDTO> dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class);
System.out.println(dataSourceDTOPage);
}
@Test
public void test2() {
QueryWrapper queryWrapper = QueryWrapper.create()
.select("d.*", "ds.id as businessId, ds.name as businessName")
.from(BusinessDataSource.class).as("d")
.leftJoin(BusinessDataSystem.class).as("ds")
.on(BusinessDataSource::getBusinessId, BusinessDataSystem::getId);
queryWrapper.in(BusinessDataSource::getBusinessId, 1);
Page<BusinessDataSourceDTO> dataSourceDTOPage = dataSourceMapper.paginateAs(1, 10, queryWrapper, BusinessDataSourceDTO.class);
System.out.println(dataSourceDTOPage);
}
}
src/test/java/com/ediagnosis/cdr/demo/DemoTest.java → src/test/java/com/ediagnosis/cdr/dataIntegration/DemoTest.java
View file @ 49a7196d
package com.ediagnosis.cdr.demo;
package com.ediagnosis.cdr.dataIntegration;
import com.ediagnosis.cdr.CdrApplication;
import com.ediagnosis.cdr.dataIntegration.dao.BusinessDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.BizDataDao;
import com.ediagnosis.cdr.dataIntegration.dao.dto.*;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BusinessDataSystem;
import com.ediagnosis.cdr.dataIntegration.dao.entity.BizSystem;
import com.mybatisflex.core.paginate.Page;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -11,34 +11,48 @@ import org.springframework.boot.test.context.SpringBootTest;
/**
* @author monojun
* @description ServiceTest
* @createTime 2025年07月31日
* @description TODO
* @createTime 2025年08月06日
*/
@SpringBootTest(classes = CdrApplication.class)
public class DemoTest {
@Autowired
private BusinessDataDao businessDataDao;
private BizDataDao bizDataDao;
@Test
public void test1() {
BusinessDataTableQueryDTO queryDTO = new BusinessDataTableQueryDTO();
Page<BusinessDataTableDTO> businessDataTableDTOPage = businessDataDao.queryTablePage(queryDTO);
BizTableQueryDTO queryDTO = new BizTableQueryDTO();
Page<BizTableDTO> businessDataTableDTOPage = bizDataDao.queryTablePage(queryDTO);
System.out.println(businessDataTableDTOPage);
}
@Test
public void test2() {
BusinessDataSystemQueryDTO queryDTO = new BusinessDataSystemQueryDTO();
Page<BusinessDataSystem> dataSystemPage = businessDataDao.querySystemPage(queryDTO);
BizSystemQueryDTO queryDTO = new BizSystemQueryDTO();
Page<BizSystem> dataSystemPage = bizDataDao.querySystemPage(queryDTO);
System.out.println(dataSystemPage);
}
@Test
public void test3() {
Page<BusinessDataSourceDTO> dataSourceDTOPage = businessDataDao.querySourcePage(new BusinessDataSourceQueryDTO());
Page<BizDataSourceDTO> dataSourceDTOPage = bizDataDao.querySourcePage(new BizDataSourceQueryDTO());
System.out.println(dataSourceDTOPage);
}
@Test
public void test4() {
BizSystemDTO systemDTO = new BizSystemDTO();
systemDTO.setId(4);
systemDTO.setName("test");
systemDTO.setDescription("test");
bizDataDao.addOrUpdateBizSystem(systemDTO);
BizSystemDTO systemDTO1 = new BizSystemDTO();
systemDTO1.setName("test");
systemDTO1.setDescription("test");
bizDataDao.addOrUpdateBizSystem(systemDTO1);
}
}
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