|
@@ -8,9 +8,11 @@ import com.lantone.common.exception.Asserts;
|
|
import com.lantone.common.util.BeanUtil;
|
|
import com.lantone.common.util.BeanUtil;
|
|
import com.lantone.common.util.ListUtil;
|
|
import com.lantone.common.util.ListUtil;
|
|
import com.lantone.common.util.StringUtil;
|
|
import com.lantone.common.util.StringUtil;
|
|
|
|
+import com.lantone.daqe.dto.GetColumnInfoDTO;
|
|
import com.lantone.daqe.dto.GetColumnNameDTO;
|
|
import com.lantone.daqe.dto.GetColumnNameDTO;
|
|
import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
|
|
import com.lantone.daqe.dto.GetColumnVerifyPageDTO;
|
|
import com.lantone.daqe.dto.GetRegularDTO;
|
|
import com.lantone.daqe.dto.GetRegularDTO;
|
|
|
|
+import com.lantone.daqe.dto.GetTableColumnNameDTO;
|
|
import com.lantone.daqe.dto.GetTableNameDTO;
|
|
import com.lantone.daqe.dto.GetTableNameDTO;
|
|
import com.lantone.daqe.entity.ColumnInfo;
|
|
import com.lantone.daqe.entity.ColumnInfo;
|
|
import com.lantone.daqe.entity.ColumnVerify;
|
|
import com.lantone.daqe.entity.ColumnVerify;
|
|
@@ -74,7 +76,7 @@ public class ColumnVerifyManagementFacade {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 下拉框获取数据库表中列数据表名称信息
|
|
|
|
|
|
+ * 查询下拉框获取数据库表中列数据表名称信息
|
|
*
|
|
*
|
|
* @param getTableNameVO
|
|
* @param getTableNameVO
|
|
* @return: 数据库表中列数据表名称信息
|
|
* @return: 数据库表中列数据表名称信息
|
|
@@ -91,7 +93,7 @@ public class ColumnVerifyManagementFacade {
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 下拉框获取数据库表中列数据字段名称信息
|
|
|
|
|
|
+ * 查询下拉框获取数据库表中列数据字段名称信息
|
|
*
|
|
*
|
|
* @param getColumnNameVO
|
|
* @param getColumnNameVO
|
|
* @return: 数据库表中列数据字段名称信息
|
|
* @return: 数据库表中列数据字段名称信息
|
|
@@ -107,6 +109,42 @@ public class ColumnVerifyManagementFacade {
|
|
return getColumnDTOList;
|
|
return getColumnDTOList;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 新增修改下拉框获取数据库表中列数据字段名称信息
|
|
|
|
+ *
|
|
|
|
+ * @param
|
|
|
|
+ * @return: 数据库表中列数据字段名称信息
|
|
|
|
+ */
|
|
|
|
+ public List<GetTableColumnNameDTO> getTableColumnName() {
|
|
|
|
+ List<GetColumnInfoDTO> columnInfoList = columnInfoFacade.getBaseMapper().getNoVerifyColumnName();
|
|
|
|
+ List<String> columnString = new ArrayList<>();
|
|
|
|
+ List<GetTableColumnNameDTO> getTableColumnNameDTOS = new ArrayList<>();
|
|
|
|
+ for (GetColumnInfoDTO columnInfo : columnInfoList) {
|
|
|
|
+ GetTableColumnNameDTO getTableColumnNameDTO = new GetTableColumnNameDTO();
|
|
|
|
+ GetTableNameDTO getTableNameDTO = new GetTableNameDTO();
|
|
|
|
+ List<GetColumnNameDTO> getColumnNameDTOS = new ArrayList<GetColumnNameDTO>();
|
|
|
|
+ getTableNameDTO.setTableCname(columnInfo.getTableCname());
|
|
|
|
+ getTableNameDTO.setTableEname(columnInfo.getTableEname());
|
|
|
|
+ if(columnString.contains(columnInfo.getTableCname())){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
|
|
+ columnString.add(columnInfo.getTableCname());
|
|
|
|
+ for (GetColumnInfoDTO info : columnInfoList) {
|
|
|
|
+ if(info.getTableCname().equals(columnInfo.getTableCname()) && info.getTableEname().equals(columnInfo.getTableEname())){
|
|
|
|
+ GetColumnNameDTO getColumnNameDTO = new GetColumnNameDTO();
|
|
|
|
+ getColumnNameDTO.setId(info.getId());
|
|
|
|
+ getColumnNameDTO.setColumnCname(info.getColumnCname());
|
|
|
|
+ getColumnNameDTO.setColumnEname(info.getColumnEname());
|
|
|
|
+ getColumnNameDTOS.add(getColumnNameDTO);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ getTableColumnNameDTO.setGetTableNameDTO(getTableNameDTO);
|
|
|
|
+ getTableColumnNameDTO.setGetColumnNameDTOList(getColumnNameDTOS);
|
|
|
|
+ getTableColumnNameDTOS.add(getTableColumnNameDTO);
|
|
|
|
+ }
|
|
|
|
+ return getTableColumnNameDTOS;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 下拉框获取正则式名称
|
|
* 下拉框获取正则式名称
|
|
*
|
|
*
|
|
@@ -132,14 +170,7 @@ public class ColumnVerifyManagementFacade {
|
|
List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
|
|
List<ColumnInfoVO> columnList = addColumnVerifyVO.getColumnList();
|
|
//查出表列信息ID
|
|
//查出表列信息ID
|
|
for (ColumnInfoVO columnInfoVO : columnList) {
|
|
for (ColumnInfoVO columnInfoVO : columnList) {
|
|
- ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectOne(new QueryWrapper<ColumnInfo>()
|
|
|
|
- .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getTableCname()), "table_cname", columnInfoVO.getTableCname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getTableEname()), "table_ename", columnInfoVO.getTableEname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getColumnCname()), "column_cname", columnInfoVO.getColumnCname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getColumnEname()), "column_ename", columnInfoVO.getColumnEname())
|
|
|
|
- );
|
|
|
|
- Long columnId = columnInfo.getId();
|
|
|
|
|
|
+ Long columnId = columnInfoVO.getId();
|
|
if (columnId == null) {
|
|
if (columnId == null) {
|
|
Asserts.fail("不存在该字段信息!");
|
|
Asserts.fail("不存在该字段信息!");
|
|
}
|
|
}
|
|
@@ -334,20 +365,13 @@ public class ColumnVerifyManagementFacade {
|
|
public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
|
|
public Boolean updateColumnVerify(UpdateColumnVerifyVO updateColumnVerifyVO) {
|
|
List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
|
|
List<ColumnInfoVO> columnList = updateColumnVerifyVO.getColumnList();
|
|
AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
|
|
AddColumnVerifyVO addColumnVerifyVO = new AddColumnVerifyVO();
|
|
- ArrayList<ColumnInfoVO> columnInfoAdd = new ArrayList<>();
|
|
|
|
- ArrayList<ColumnInfoVO> columnInfoUpdate = new ArrayList<>();
|
|
|
|
|
|
+ List<ColumnInfoVO> columnInfoAdd = new ArrayList<>();
|
|
|
|
+ List<ColumnInfoVO> columnInfoUpdate = new ArrayList<>();
|
|
//查出表列信息ID
|
|
//查出表列信息ID
|
|
List<Long> columnInfoIdAdd = new ArrayList<>();
|
|
List<Long> columnInfoIdAdd = new ArrayList<>();
|
|
List<Long> columnInfoIdUpdate = new ArrayList<>();
|
|
List<Long> columnInfoIdUpdate = new ArrayList<>();
|
|
for (ColumnInfoVO columnInfoVO : columnList) {
|
|
for (ColumnInfoVO columnInfoVO : columnList) {
|
|
- ColumnInfo columnInfo = columnInfoFacade.getBaseMapper().selectOne(new QueryWrapper<ColumnInfo>()
|
|
|
|
- .eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getTableCname()), "table_cname", columnInfoVO.getTableCname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getTableEname()), "table_ename", columnInfoVO.getTableEname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getColumnCname()), "column_cname", columnInfoVO.getColumnCname())
|
|
|
|
- .eq(StringUtil.isNotBlank(columnInfoVO.getColumnEname()), "column_ename", columnInfoVO.getColumnEname())
|
|
|
|
- );
|
|
|
|
- Long columnId = columnInfo.getId();
|
|
|
|
|
|
+ Long columnId = columnInfoVO.getId();
|
|
ColumnVerify columnVerify = columnVerifyFacade.getById(columnId);
|
|
ColumnVerify columnVerify = columnVerifyFacade.getById(columnId);
|
|
if (columnVerify != null) {
|
|
if (columnVerify != null) {
|
|
//库中已有维护
|
|
//库中已有维护
|