Skip to content

C
civil-bigdata
Commit 3041fa1f by 袁伟铭
Options

修改数据元映射字段

parent 8d2494ab
Showing with 159 additions and 211 deletions
resource-server/src/main/java/com/zq/resource/controller/admin/CategoryGroupController.java
......@@ -8,7 +8,6 @@ import com.zq.common.vo.ResultVo;
import com.zq.resource.entity.DataCategoryGroup;
import com.zq.resource.service.CategoryService;
import com.zq.resource.vo.DataCategoryGroupFindVo;
import com.zq.resource.vo.DataCategoryGroupVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
......@@ -34,7 +33,7 @@ public class CategoryGroupController {
@ApiOperation("获取目录分类信息")
@PostMapping(value = "/getCategoryGroupInfo/{categoryGroupId}")
public ResultVo<DataCategoryGroupVo> getCategoryGroupInfo(@PathVariable String categoryGroupId) {
public ResultVo<DataCategoryGroup> getCategoryGroupInfo(@PathVariable String categoryGroupId) {
AssertUtils.hasText(categoryGroupId, "ID不能为空");
return ResultVo.success(categoryService.getCategoryGroupInfo(categoryGroupId));
}
......
resource-server/src/main/java/com/zq/resource/controller/admin/StandardDataController.java
......@@ -36,7 +36,7 @@ public class StandardDataController {
@ApiOperation("添加数据元")
@PostMapping(value = "/addStandardData")
public ResultVo addStandardData(@RequestBody StandardData vo) {
AssertUtils.notNull(vo.getCategoryId(), "缺少目录ID");
AssertUtils.notNull(vo.getMappingId(), "缺少映射表ID");
AssertUtils.hasText(vo.getStandardName(), "缺少数据源名称");
AssertUtils.hasText(vo.getStandardDataType(), "缺少数据元类型");
AssertUtils.hasText(vo.getStandardDataLength(), "缺少数据元长度");
......@@ -108,14 +108,8 @@ public class StandardDataController {
AssertUtils.hasText(vo.getStandardId(), "缺少数据元ID");
AssertUtils.hasText(vo.getTableName(), "缺少表名");
AssertUtils.hasText(vo.getTableSqlname(), "缺少数据库表名");
// AssertUtils.hasText(vo.getFieldName(), "缺少列名");
// AssertUtils.hasText(vo.getFieldType(), "缺少列类型");
// AssertUtils.notNull(vo.getLength(), "缺少列长度");
// AssertUtils.notNull(vo.getFieldPrecision(), "缺少列精度");
// AssertUtils.notNull(vo.getIsPk(), "确实是否主键");
AssertUtils.hasText(vo.getStandardNum(), "缺少数据标准编目");
AssertUtils.hasText(vo.getConnecttionName(), "缺少数据源名称");
AssertUtils.hasText(vo.getCreditCode(), "缺少统一信用码");
AssertUtils.notNull(vo.getIsNull(), "缺少是否为空");
AssertUtils.notNull(vo.getUsessl(), "缺少是否启用ssl连接");
......
resource-server/src/main/java/com/zq/resource/entity/StandardDataMapping.java
......@@ -54,36 +54,6 @@ public class StandardDataMapping {
private String tableSqlname;
/**
* 列名
*/
@ApiModelProperty("列名")
private String fieldName;
/**
* 列类型
*/
@ApiModelProperty("列类型")
private String fieldType;
/**
* 列长度
*/
@ApiModelProperty("列长度")
private Integer length;
/**
* 列精度
*/
@ApiModelProperty("列精度")
private Integer fieldPrecision;
/**
* 是否主键
*/
@ApiModelProperty("是否主键")
private Integer isPk;
/**
* 数据标准编目
*/
@ApiModelProperty("数据标准编目")
......@@ -96,12 +66,6 @@ public class StandardDataMapping {
private String connecttionName;
/**
* 统一信用代码
*/
@ApiModelProperty("统一信用代码")
private String creditCode;
/**
* 是否为空
*/
@ApiModelProperty("是否为空")
......
resource-server/src/main/java/com/zq/resource/service/CategoryService.java
......@@ -22,7 +22,10 @@ import com.zq.resource.entity.OrgDept;
import com.zq.resource.entity.StandardData;
import com.zq.resource.utils.ShareApiUtils;
import com.zq.resource.utils.TreeUtils;
import com.zq.resource.vo.*;
import com.zq.resource.vo.DataCategoryFindVo;
import com.zq.resource.vo.DataCategoryGroupFindVo;
import com.zq.resource.vo.DataTreeVo;
import com.zq.resource.vo.ShareApiResponse;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
......@@ -305,16 +308,15 @@ public class CategoryService {
}
}
public DataCategoryGroupVo getCategoryGroupInfo(String categoryGroupId) {
public DataCategoryGroup getCategoryGroupInfo(String categoryGroupId) {
DataCategoryGroup dataCategoryGroup = dataCategoryGroupDao.selectById(categoryGroupId);
DataCategoryGroupVo dataCategoryGroupVo = BeanUtil.copyProperties(dataCategoryGroup, DataCategoryGroupVo.class);
if (StringUtils.isNotBlank(dataCategoryGroup.getParentId())) {
DataCategoryGroup parentCategoryGroup = dataCategoryGroupDao.selectById(dataCategoryGroup.getParentId());
dataCategoryGroupVo.setParentName(parentCategoryGroup.getGroupName());
dataCategoryGroup.setParentName(parentCategoryGroup.getGroupName());
}
return dataCategoryGroupVo;
return dataCategoryGroup;
}
public PageVo<DataCategoryGroup> getCategoryGroupList(DataCategoryGroupFindVo vo) {
......
resource-server/src/main/java/com/zq/resource/service/CodeService.java
......@@ -94,6 +94,12 @@ public class CodeService {
return codeMainDao.selectById(codeMainId);
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void registerOrUpdateCodeMain(Set<String> ids) {
for (String id : ids) {
CodeMain codeMain = codeMainDao.selectById(id);
......@@ -117,6 +123,12 @@ public class CodeService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void cancelCodeMain(Set<String> ids) {
for (String id : ids) {
CodeMain codeMain = codeMainDao.selectById(id);
......@@ -174,6 +186,12 @@ public class CodeService {
return codeItemDao.selectById(codeItemId);
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void registerOrUpdateCodeItem(Set<String> ids) {
for (String id : ids) {
CodeItem codeItem = codeItemDao.selectById(id);
......@@ -197,6 +215,12 @@ public class CodeService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void cancelCodeItem(Set<String> ids) {
for (String id : ids) {
CodeItem codeItem = codeItemDao.selectById(id);
......
resource-server/src/main/java/com/zq/resource/service/StandardDataService.java
......@@ -36,12 +36,13 @@ public class StandardDataService {
private final StandardCategoryNameDao standardCategoryNameDao;
private final DbInfoDao dbInfoDao;
private final DataCategoryDao dataCategoryDao;
private final DataDictDao dataDictDao;
public void addStandardData(StandardData vo) {
DataCategory dataCategory = dataCategoryDao.selectById(vo.getCategoryId());
AssertUtils.notNull(dataCategory, "目录不存在");
StandardDataMapping standardDataMapping = standardDataMappingDao.selectById(vo.getMappingId());
AssertUtils.notNull(standardDataMapping, "映射表不存在");
DbInfo dbInfo = dbInfoDao.selectById(standardDataMapping.getDbId());
vo.setCategoryId(dbInfo.getCategoryId());
vo.setInfoItemId(IdUtil.randomUUID());
vo.setCreateTime(DateUtil.date());
vo.setUpdateTime(DateUtil.date());
......@@ -134,6 +135,10 @@ public class StandardDataService {
}
public void addStandardDataMapping(StandardDataMapping vo) {
DbInfo dbInfo = dbInfoDao.selectById(vo.getId());
AssertUtils.notNull(dbInfo, "数据库不存在");
vo.setCreateTime(DateUtil.date());
vo.setUpdateTime(DateUtil.date());
......@@ -148,14 +153,8 @@ public class StandardDataService {
standardDataMapping.setStandardId(vo.getStandardId());
standardDataMapping.setTableName(vo.getTableName());
standardDataMapping.setTableSqlname(vo.getTableSqlname());
standardDataMapping.setFieldName(vo.getFieldName());
standardDataMapping.setFieldType(vo.getFieldType());
standardDataMapping.setLength(vo.getLength());
standardDataMapping.setFieldPrecision(vo.getFieldPrecision());
standardDataMapping.setIsPk(vo.getIsPk());
standardDataMapping.setStandardNum(vo.getStandardNum());
standardDataMapping.setConnecttionName(vo.getConnecttionName());
standardDataMapping.setCreditCode(vo.getCreditCode());
standardDataMapping.setIsNull(vo.getIsNull());
standardDataMapping.setUsessl(vo.getUsessl());
standardDataMapping.setUpdateTime(DateUtil.date());
......@@ -178,10 +177,6 @@ public class StandardDataService {
lambdaQuery.like(StandardDataMapping::getConnecttionName, vo.getConnecttionName());
vo.setConnecttionName(null);
}
if (StringUtils.isNotBlank(vo.getCreditCode())) {
lambdaQuery.like(StandardDataMapping::getCreditCode, vo.getCreditCode());
vo.setCreditCode(null);
}
PageVo<StandardDataMapping> paging = PagingUtils.paging(vo, standardDataMappingDao, StandardDataMapping.class, lambdaQuery);
paging.getRows().forEach(standardDataMapping -> {
......@@ -208,15 +203,18 @@ public class StandardDataService {
lambdaQuery.like(StandardDataMapping::getConnecttionName, vo.getConnecttionName());
vo.setConnecttionName(null);
}
if (StringUtils.isNotBlank(vo.getCreditCode())) {
lambdaQuery.like(StandardDataMapping::getCreditCode, vo.getCreditCode());
vo.setCreditCode(null);
}
StandardDataMapping standardDataMapping = BeanUtil.copyProperties(vo, StandardDataMapping.class);
lambdaQuery.setEntity(standardDataMapping);
return standardDataMappingDao.selectList(lambdaQuery);
List<StandardDataMapping> standardDataMappingList = standardDataMappingDao.selectList(lambdaQuery);
standardDataMappingList.forEach(s -> {
DbInfo dbInfo = dbInfoDao.selectById(s.getDbId());
s.setDbName(dbInfo.getDbName());
StandardData standardData = standardDataDao.selectById(s.getStandardId());
s.setStandardName(standardData.getStandardName());
});
return standardDataMappingList;
}
public StandardDataMapping getStandardDataMappingInfo(String standardMappingDataId) {
......@@ -274,6 +272,12 @@ public class StandardDataService {
return TreeUtils.buildTree(collect, "");
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void registerOrUpdateCategoryName(Set<String> ids) {
for (String id : ids) {
StandardCategoryName standardCategoryName = standardCategoryNameDao.selectById(id);
......@@ -297,6 +301,12 @@ public class StandardDataService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void cancelCategoryName(Set<String> ids) {
for (String id : ids) {
StandardCategoryName standardCategoryName = standardCategoryNameDao.selectById(id);
......@@ -315,6 +325,12 @@ public class StandardDataService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void registerOrUpdateStandardData(Set<String> ids) {
for (String id : ids) {
StandardData standardData = standardDataDao.selectById(id);
......@@ -345,6 +361,12 @@ public class StandardDataService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void cancelStandardData(Set<String> ids) {
for (String id : ids) {
StandardData standardData = standardDataDao.selectById(id);
......@@ -363,6 +385,12 @@ public class StandardDataService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void registerOrUpdateStandardDataMapping(Set<String> ids) {
for (String id : ids) {
StandardDataMapping standardDataMapping = standardDataMappingDao.selectById(id);
......@@ -377,15 +405,15 @@ public class StandardDataService {
params.put("db_pwd", dbInfo.getDbPwd());
params.put("tablename", standardDataMapping.getTableName());
params.put("table_sqlname", standardDataMapping.getTableSqlname());
params.put("FieldName", standardDataMapping.getFieldName());
params.put("Fieldtype", standardDataMapping.getFieldType());
params.put("length", standardDataMapping.getLength());
params.put("precision", standardDataMapping.getFieldPrecision());
params.put("is_pk", standardDataMapping.getIsPk());
// params.put("FieldName", standardDataMapping.getFieldName());
// params.put("Fieldtype", standardDataMapping.getFieldType());
// params.put("length", standardDataMapping.getLength());
// params.put("precision", standardDataMapping.getFieldPrecision());
// params.put("is_pk", standardDataMapping.getIsPk());
params.put("standardNum", standardDataMapping.getStandardNum());
params.put("standardName", standardData.getStandardName());
params.put("connecttion_name", standardDataMapping.getConnecttionName());
params.put("credit_code", standardDataMapping.getCreditCode());
// params.put("credit_code", standardDataMapping.getCreditCode());
params.put("is_null", standardDataMapping.getIsNull());
params.put("usessl", standardDataMapping.getUsessl() ? 1 : 0);
......@@ -400,6 +428,12 @@ public class StandardDataService {
}
}
/**
* 暂时不用注册
*
* @param ids
*/
@Deprecated
public void cancelStandardDataMapping(Set<String> ids) {
for (String id : ids) {
StandardDataMapping standardDataMapping = standardDataMappingDao.selectById(id);
......
resource-server/src/main/java/com/zq/resource/vo/CategoryInterfaceFindVo.java
......@@ -46,10 +46,10 @@ public class CategoryInterfaceFindVo extends PageReqVo {
private String serviceDesc;
/**
* 国家平台目录ID
* 目录ID
*/
@ApiModelProperty("国家平台目录ID")
private String cataId;
@ApiModelProperty("目录ID")
private String categoryId;
/**
* 共享类型
......@@ -135,4 +135,19 @@ public class CategoryInterfaceFindVo extends PageReqVo {
@ApiModelProperty("更新时间")
private Date updateTime;
/**
* 状态: 1-正常, 2-删除
*/
@ApiModelProperty("状态: 1-正常, 2-删除")
private Integer state;
/**
* 注册接口返回的ID
*/
@ApiModelProperty("注册接口返回的ID")
private String cascadeguid;
@ApiModelProperty("目录名称")
private String categoryName;
}
\ No newline at end of file
resource-server/src/main/java/com/zq/resource/vo/DataCategoryFindVo.java
......@@ -28,15 +28,9 @@ public class DataCategoryFindVo extends PageReqVo {
private String id;
/**
* 国家平台目录ID区共享平台返回的目录ID，UUID
* 目录分类ID
*/
@ApiModelProperty("国家平台目录ID区共享平台返回的目录ID，UUID")
private String cataId;
/**
* 区共享平台返回的目录分类ID
*/
@ApiModelProperty("区共享平台返回的目录分类ID")
@ApiModelProperty("目录分类ID")
private String groupId;
/**
......@@ -121,7 +115,13 @@ public class DataCategoryFindVo extends PageReqVo {
* 开放条件描述
*/
@ApiModelProperty("开放条件描述")
private String openCondition;
private String openConditionDesc;
/**
* 向社会开放条件（1：无条件开放；2：依申请开放）
*/
@ApiModelProperty("向社会开放条件（1：无条件开放；2：依申请开放）")
private Integer openCondition;
/**
* 不向社会开放理由依据
......@@ -166,8 +166,20 @@ public class DataCategoryFindVo extends PageReqVo {
private Date updateTime;
/**
* 共享状态: 0-未注册, 1-已注册
* 状态: 1-正常, 2-删除
*/
@ApiModelProperty("共享状态: 0-未注册, 1-已注册")
private Integer shareStatus;
@ApiModelProperty("状态: 1-正常, 2-删除")
private Integer state;
/**
* 注册接口返回的ID
*/
@ApiModelProperty("注册接口返回的ID")
private String cascadeguid;
@ApiModelProperty("目录分类名称")
private String groupName;
@ApiModelProperty("目录分类授权部门名称")
private String deptName;
}
resource-server/src/main/java/com/zq/resource/vo/DataCategoryGroupFindVo.java
......@@ -27,12 +27,6 @@ public class DataCategoryGroupFindVo extends PageReqVo {
private String id;
/**
* 目录分类编码
*/
@ApiModelProperty("目录分类编码")
private String groupId;
/**
* 目录分类名称
*/
@ApiModelProperty("目录分类名称")
......
resource-server/src/main/java/com/zq/resource/vo/DataCategoryGroupVo.java deleted 100644 → 0
package com.zq.resource.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* 资源目录分类(DataCategoryGroup)实体类
*
* @author makejava
* @since 2021-08-31 15:23:39
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class DataCategoryGroupVo {
/**
* id
*/
private String id;
/**
* 目录分类编码
*/
@ApiModelProperty("目录分类编码")
private String groupId;
/**
* 目录分类名称
*/
@ApiModelProperty("目录分类名称")
private String groupName;
/**
* 父目录分类编码
*/
@ApiModelProperty("父目录分类编码")
private String parentId;
@ApiModelProperty("父目录分类名称")
private String parentName;
/**
* 目录分类授权部门的ID
*/
@ApiModelProperty("目录分类授权部门的ID")
private String deptId;
/**
* 目录分类描述
*/
@ApiModelProperty("目录分类描述")
private String remark;
/**
* 目录分类排序编号
*/
@ApiModelProperty("目录分类排序编号")
private Integer orderNum;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 更新时间
*/
@ApiModelProperty("更新时间")
private Date updateTime;
}
\ No newline at end of file
resource-server/src/main/java/com/zq/resource/vo/StandardDataMappingFindVo.java
......@@ -52,36 +52,6 @@ public class StandardDataMappingFindVo extends PageReqVo {
private String tableSqlname;
/**
* 列名
*/
@ApiModelProperty("列名")
private String fieldName;
/**
* 列类型
*/
@ApiModelProperty("列类型")
private String fieldType;
/**
* 列长度
*/
@ApiModelProperty("列长度")
private Integer length;
/**
* 列精度
*/
@ApiModelProperty("列精度")
private Integer fieldPrecision;
/**
* 是否主键
*/
@ApiModelProperty("是否主键")
private Boolean isPk;
/**
* 数据标准编目
*/
@ApiModelProperty("数据标准编目")
......@@ -94,12 +64,6 @@ public class StandardDataMappingFindVo extends PageReqVo {
private String connecttionName;
/**
* 统一信用代码
*/
@ApiModelProperty("统一信用代码")
private String creditCode;
/**
* 是否为空
*/
@ApiModelProperty("是否为空")
......@@ -123,4 +87,28 @@ public class StandardDataMappingFindVo extends PageReqVo {
@ApiModelProperty("更新时间")
private Date updateTime;
/**
* 状态: 1-正常, 2-删除
*/
@ApiModelProperty("状态: 1-正常, 2-删除")
private Integer state;
/**
* 注册接口返回的ID
*/
@ApiModelProperty("注册接口返回的ID")
private String cascadeguid;
/**
* 注册接口返回的ID
*/
@ApiModelProperty("注册库表接口返回的ID")
private String tableCascadeguid;
@ApiModelProperty("数据库名称")
private String dbName;
@ApiModelProperty("数据元名称")
private String standardName;
}
\ No newline at end of file
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