|
@@ -27,10 +27,6 @@ import java.util.stream.Collectors;
|
|
|
public class DataResourceFacade implements IDataResourceFacade {
|
|
|
|
|
|
public static final String ID_SEPARATOR = "|";
|
|
|
- /**
|
|
|
- * codeDataTypeStr分隔符
|
|
|
- */
|
|
|
- public static final String CODE_DATA_TYPE_SEPARATOR = "★";
|
|
|
|
|
|
@Autowired
|
|
|
private IDataResourceService dataResourceService;
|
|
@@ -105,7 +101,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.code(childResourceClassify.getCodeValue())
|
|
|
.label(childResourceClassify.getCodeName())
|
|
|
.dataType(childResourceClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + childResourceClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + childResourceClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + childResourceClassify.getCodeValue() + ID_SEPARATOR + childResourceClassify.getTypeCode())
|
|
|
.treeNode(false)
|
|
|
.pId(dataLevelTreeVo.getId()).build()
|
|
|
).collect(Collectors.toList())
|
|
@@ -145,7 +141,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.code(childResourceClassify.getCodeValue())
|
|
|
.label(childResourceClassify.getCodeName())
|
|
|
.dataType(childResourceClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + childResourceClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + childResourceClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + childResourceClassify.getCodeValue() + ID_SEPARATOR + childResourceClassify.getTypeCode())
|
|
|
.treeNode(false)
|
|
|
.pId(securityLevelTree.getId()).build()
|
|
|
).collect(Collectors.toList())
|
|
@@ -180,7 +176,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.treeNode(true)
|
|
|
.pId(dataClassifyTree.getId())
|
|
|
.dataType(firstClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + firstClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + firstClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + firstClassify.getCodeValue() + ID_SEPARATOR + firstClassify.getTypeCode())
|
|
|
.build();
|
|
|
|
|
|
firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType()).stream()
|
|
@@ -192,7 +188,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.treeNode(true)
|
|
|
.pId(firstTreeVo.getId())
|
|
|
.dataType(secondClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + secondClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + secondClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + secondClassify.getCodeValue() + ID_SEPARATOR + secondClassify.getTypeCode())
|
|
|
.build();
|
|
|
|
|
|
secondTreeVo.setChild(getChildrenTypeList(secondClassify.getChildrenType()).stream()
|
|
@@ -204,7 +200,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.treeNode(true)
|
|
|
.pId(secondTreeVo.getId())
|
|
|
.dataType(thirdClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + thirdClassify.getTypeCode() + CODE_DATA_TYPE_SEPARATOR + thirdClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + thirdClassify.getTypeCode() + ID_SEPARATOR + thirdClassify.getTypeCode())
|
|
|
.build();
|
|
|
|
|
|
thirdTreeVo.setChild(thirdClassify.getDataList().stream()
|
|
@@ -216,7 +212,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.treeNode(false).child(null)
|
|
|
.pId(thirdTreeVo.getId())
|
|
|
.dataType(thirdClassify.getTypeCode())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + fourClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + thirdClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + fourClassify.getCodeValue() + ID_SEPARATOR + thirdClassify.getTypeCode())
|
|
|
.build();
|
|
|
return fourTreeVo;
|
|
|
}).collect(Collectors.toList()));
|
|
@@ -263,7 +259,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.dataType(firstClassify.getTypeCode())
|
|
|
.treeNode(true)
|
|
|
.pId(fieldClassifyTree.getId())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + firstClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + firstClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + firstClassify.getCodeValue() + ID_SEPARATOR + firstClassify.getTypeCode())
|
|
|
.build();
|
|
|
|
|
|
firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType())
|
|
@@ -276,7 +272,7 @@ public class DataResourceFacade implements IDataResourceFacade {
|
|
|
.treeNode(false)
|
|
|
.dataType(secondClassify.getTypeCode())
|
|
|
.pId(firstTreeVo.getId())
|
|
|
- .codeDataTypeStr(UUIDUtils.getUUID() + CODE_DATA_TYPE_SEPARATOR + secondClassify.getCodeValue() + CODE_DATA_TYPE_SEPARATOR + secondClassify.getTypeCode())
|
|
|
+ .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + secondClassify.getCodeValue() + ID_SEPARATOR + secondClassify.getTypeCode())
|
|
|
.build();
|
|
|
return secondTreeVo;
|
|
|
}
|