Merge branch 'develop' of 192.168.0.144:xj-aks/dcuc/app-service into huangzqa-add-data-auth-20221002

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/vo/DataLevelVo.java

@@ -13,7 +13,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DataLevelVo {
-    private String innerId;
+    private String id;
     private String levelCode;
     private String levelName;
     private String typeCode;

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

@@ -39,10 +39,4 @@ public class DataResourceTreeVo {
     private Boolean treeNode;
     @ApiModelProperty(value = "父节点id")
     private String pId;
-
-    @ApiModelProperty(value = "数据资源code与dataType拼接，以|拼接")
-    private String codeDataTypeStr;
-
-    @ApiModelProperty(value = "内部使用唯一标识id")
-    private String innerId;
 }

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

@@ -22,7 +22,6 @@ import com.dragoninfo.dcuc.app.service.IDataTabInfoService;
 import com.dragoninfo.dcuc.app.service.sub.*;
 import com.dragoninfo.dcuc.app.vo.*;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
@@ -144,14 +143,13 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .build();
         List<DataLevelVo> dataLevelList = getDataLevelList();
         List<DataResourceTreeVo> child = dataLevelList.stream().map(item -> DataResourceTreeVo.builder()
-                .id(Joiner.on(CommonCons.ID_SEPARATOR).join(dataLevelTreeVo.getId(), item.getLevelCode()))
+                .id(item.getId())
                 .code(item.getLevelCode())
                 .label(item.getLevelName())
                 .dataType(item.getTypeCode())
-                .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + item.getLevelCode() + CommonCons.ID_SEPARATOR + item.getTypeCode())
                 .treeNode(false)
                 .pId(dataLevelTreeVo.getId())
-                .innerId(item.getInnerId()).build()).collect(Collectors.toList());
+                .build()).collect(Collectors.toList());
         dataLevelTreeVo.setChild(child);
         if (child.size() == 0) {
             dataResourceClassifyVo.setNodes(new ArrayList<>());
@@ -183,14 +181,13 @@ public class DataResourceFacade implements IDataResourceFacade {
         List<DataLevelVo> securityLevelList = getSecurityLevelList();
 
         List<DataResourceTreeVo> child = securityLevelList.stream().map(item -> DataResourceTreeVo.builder()
-                .id(Joiner.on(CommonCons.ID_SEPARATOR).join(securityLevelTree.getId(), item.getLevelCode()))
+                .id(item.getId())
                 .code(item.getLevelCode())
                 .label(item.getLevelName())
                 .dataType(item.getTypeCode())
-                .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + item.getLevelCode() + CommonCons.ID_SEPARATOR + item.getTypeCode())
                 .treeNode(false)
                 .pId(securityLevelTree.getId())
-                .innerId(item.getInnerId()).build()).collect(Collectors.toList());
+                .build()).collect(Collectors.toList());
         securityLevelTree.setChild(child);
         if (child.size() == 0) {
             dataResourceClassifyVo.setNodes(new ArrayList<>());
@@ -324,7 +321,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
-                .innerId(item.getId())
                 .build();
     }
 
@@ -407,7 +403,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
-                .innerId(item.getId())
                 .build();
     }
 
@@ -614,7 +609,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 vo.setTypeCode(item.getDataType());
                 vo.setLevelName(item.getName());
                 vo.setLevelCode(item.getCode());
-                vo.setInnerId(item.getId());
+                vo.setId(item.getId());
                 return vo;
             }).collect(Collectors.toList());
 
@@ -625,7 +620,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 vo.setTypeCode(item.getDataType());
                 vo.setLevelName(item.getLevelName());
                 vo.setLevelCode(item.getLevelCode());
-                vo.setInnerId(item.getId());
+                vo.setId(item.getId());
                 return vo;
             }).collect(Collectors.toList());
 
@@ -636,7 +631,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 vo.setTypeCode(item.getDataType());
                 vo.setLevelName(item.getName());
                 vo.setLevelCode(item.getCode());
-                vo.setInnerId(item.getId());
+                vo.setId(item.getId());
                 return vo;
             }).collect(Collectors.toList());
 
@@ -647,7 +642,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 vo.setTypeCode(item.getDataType());
                 vo.setLevelName(item.getSecName());
                 vo.setLevelCode(item.getSecCode());
-                vo.setInnerId(item.getId());
+                vo.setId(item.getId());
                 return vo;
             }).collect(Collectors.toList());
         }
@@ -665,25 +660,25 @@ public class DataResourceFacade implements IDataResourceFacade {
             return null;
         } else if (DataResourceEnum.COLUMN_CLASSIFY.equals(anEnum)) {
             FieldCla fieldCla = fieldClaService.getById(id);
-            vo.setInnerId(fieldCla.getId());
+            vo.setId(fieldCla.getId());
             vo.setLevelCode(fieldCla.getCode());
             vo.setLevelName(fieldCla.getName());
             vo.setTypeCode(fieldCla.getDataType());
         } else if (DataResourceEnum.DATA_CLASSIFY.equals(anEnum)) {
             DataLevel dataLevel = dataLevelService.getById(id);
-            vo.setInnerId(dataLevel.getId());
+            vo.setId(dataLevel.getId());
             vo.setLevelCode(dataLevel.getLevelCode());
             vo.setLevelName(dataLevel.getLevelName());
             vo.setTypeCode(dataLevel.getDataType());
         } else if (DataResourceEnum.DATA_RESOURCE_CLASSIFY.equals(anEnum)) {
             DataCla dataCla = dataClaService.getById(id);
-            vo.setInnerId(dataCla.getId());
+            vo.setId(dataCla.getId());
             vo.setLevelCode(dataCla.getId());
             vo.setLevelName(dataCla.getName());
             vo.setTypeCode(dataCla.getCode());
         } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
             DataSec dataSec = dataSecService.getById(id);
-            vo.setInnerId(dataSec.getId());
+            vo.setId(dataSec.getId());
             vo.setLevelCode(dataSec.getSecCode());
             vo.setLevelName(dataSec.getSecName());
             vo.setTypeCode(dataSec.getDataType());
@@ -709,7 +704,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                             .treeNode(true)
                             .pId(id)
                             .dataType(firstClassify.getTypeCode())
-                            .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + firstClassify.getCodeValue() + CommonCons.ID_SEPARATOR + firstClassify.getTypeCode())
                             .build();
 
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType()).stream()
@@ -721,7 +715,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                                         .treeNode(true)
                                         .pId(firstTreeVo.getId())
                                         .dataType(secondClassify.getTypeCode())
-                                        .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + secondClassify.getCodeValue() + CommonCons.ID_SEPARATOR + secondClassify.getTypeCode())
                                         .build();
 
                                 secondTreeVo.setChild(getChildrenTypeList(secondClassify.getChildrenType()).stream()
@@ -733,7 +726,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                                                     .treeNode(true)
                                                     .pId(secondTreeVo.getId())
                                                     .dataType(thirdClassify.getTypeCode())
-                                                    .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + thirdClassify.getTypeCode() + CommonCons.ID_SEPARATOR + thirdClassify.getTypeCode())
                                                     .build();
 
                                             thirdTreeVo.setChild(thirdClassify.getDataList().stream()
@@ -745,7 +737,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                                                                 .treeNode(false).child(null)
                                                                 .pId(thirdTreeVo.getId())
                                                                 .dataType(thirdClassify.getTypeCode())
-                                                                .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + fourClassify.getCodeValue() + CommonCons.ID_SEPARATOR + thirdClassify.getTypeCode())
                                                                 .build();
                                                         return fourTreeVo;
                                                     }).collect(Collectors.toList()));
@@ -775,7 +766,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                             .dataType(firstClassify.getTypeCode())
                             .treeNode(true)
                             .pId(id)
-                            .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + firstClassify.getCodeValue() + CommonCons.ID_SEPARATOR + firstClassify.getTypeCode())
                             .build();
 
                     firstTreeVo.setChild(getFirstChildResourceClassifies(firstClassify.getChildrenType())
@@ -788,7 +778,6 @@ public class DataResourceFacade implements IDataResourceFacade {
                                                 .treeNode(false)
                                                 .dataType(secondClassify.getTypeCode())
                                                 .pId(firstTreeVo.getId())
-                                                .codeDataTypeStr(UUIDUtils.getUUID() + CommonCons.ID_SEPARATOR + secondClassify.getCodeValue() + CommonCons.ID_SEPARATOR + secondClassify.getTypeCode())
                                                 .build();
                                         return secondTreeVo;
                                     }