Ver Fonte

feature:清单接口

huangjy há 4 anos atrás
pai
commit
5e121f379f

+ 2 - 0
dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/vo/DataResourceTreeVo.java

@@ -36,6 +36,8 @@ public class DataResourceTreeVo {
     @ApiModelProperty(value = "父节点id")
     private String pId;
 
+    @ApiModelProperty(value = "数据资源code与dataType拼接,以|拼接")
+    private String codeDataTypeStr;
     /**
      * 添加无参构造器,便于调用端序列化
      */

+ 14 - 0
dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/DataResourceFacade.java

@@ -5,6 +5,7 @@ import com.dragoninfo.dcuc.app.dto.dataresource.ResourceClassify;
 import com.dragoninfo.dcuc.app.enumresources.DataResourceEnum;
 import com.dragoninfo.dcuc.app.service.IDataResourceService;
 import com.dragoninfo.dcuc.app.vo.*;
+import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.enums.EnumUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -26,6 +27,11 @@ 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;
 
@@ -99,6 +105,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())
                         .treeNode(false)
                         .pId(dataLevelTreeVo.getId()).build()
                 ).collect(Collectors.toList())
@@ -138,6 +145,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())
                         .treeNode(false)
                         .pId(securityLevelTree.getId()).build()
                 ).collect(Collectors.toList())
@@ -172,6 +180,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())
                             .build();
 
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType()).stream()
@@ -183,6 +192,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())
                                         .build();
 
                                 secondTreeVo.setChild(getChildrenTypeList(secondClassify.getChildrenType()).stream()
@@ -194,6 +204,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())
                                                     .build();
 
                                             thirdTreeVo.setChild(thirdClassify.getDataList().stream()
@@ -205,6 +216,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())
                                                                 .build();
                                                         return fourTreeVo;
                                                     }).collect(Collectors.toList()));
@@ -251,6 +263,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())
                             .build();
 
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType())
@@ -263,6 +276,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())
                                                 .build();
                                         return secondTreeVo;
                                     }