feature(数据授权类型字段增加): 数据授权类型字段增加

数据授权类型字段增加

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/enumresources/DataAuthTypeCodeEnum.java

@@ -0,0 +1,28 @@
+package com.dragoninfo.dcuc.app.enumresources;
+
+/**
+ * 数据分级分类资源在数据资源目录所属的类型
+ * @author mazq
+ * @date 2021/6/4
+ */
+public enum DataAuthTypeCodeEnum {
+
+    /**
+     * 数据分级分类资源在数据资源目录所属的类型
+     */
+    AUTH_DATA_LEVEL("数据分级","DATA_LEVEL"),
+    AUTH_DATA_SEC("安全级别","DATA_SECURITY_LEVEL"),
+    AUTH_DATA_FIELD_FIR("字段一级分类","LEVEL_1_COLUMN_CLASSIFY"),
+    AUTH_DATA_FIELD_SEC("字段二级分类","LEVEL_2_COLUMN_CLASSIFY"),
+    AUTH_DATA_CLA_FIR("数据组织一级分类","RESOURCE_SJZZYJFL"),
+    AUTH_DATA_CLA_SEC("数据组织二级分类","RESOURCE_SJZZEJFL");
+
+    public String label;
+
+    public String value;
+
+    DataAuthTypeCodeEnum(String label, String value) {
+        this.label = label;
+        this.value = value;
+    }
+}

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataClaDTO.java

@@ -34,6 +34,10 @@ public class DataClaDTO {
      */
     private String labClaId;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
 
     /**
      * 码值

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataLevelDTO.java

@@ -22,6 +22,11 @@ public class DataLevelDTO {
      */
     private String levelName;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
     /**
      * 说明
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/DataSecDTO.java

@@ -22,6 +22,11 @@ public class DataSecDTO {
      */
     private String secName;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
     /**
      * 说明
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/dto/FieldClaDTO.java

@@ -33,6 +33,11 @@ public class FieldClaDTO {
      */
     private String level;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
     /**
      * 分类类型 一级分类 二级分类
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataCla.java

@@ -44,6 +44,12 @@ public class DataCla implements Serializable {
      */
     private String name;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
+
     /**
      * 层级
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataLevel.java

@@ -29,6 +29,12 @@ public class DataLevel implements Serializable {
      */
     private String levelName;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
+
     /**
      * 说明
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/DataSec.java

@@ -29,6 +29,11 @@ public class DataSec implements Serializable {
      */
     private String secName;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
     /**
      * 说明
      */

dcuc-app-model/src/main/java/com/dragoninfo/dcuc/app/sub/entity/FieldCla.java

@@ -34,6 +34,11 @@ public class FieldCla implements Serializable {
      */
     private String name;
 
+    /**
+     * 数据授权资源类型
+     */
+    private String dataType;
+
     /**
      * 层级
      */

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

@@ -13,4 +13,5 @@ import lombok.Data;
 public class DataLevelVo {
     private String levelCode;
     private String levelName;
+    private String typeCode;
 }

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

@@ -362,7 +362,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     public List<DataLevelVo> getDataLevelList() {
         return getFirstChildResourceClassifies(dataResourceService.getDataLevelList())
                 .stream()
-                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName()))
+                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(),childResourceClassify.getTypeCode()))
                 .collect(Collectors.toList());
     }
 
@@ -370,7 +370,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     public List<DataLevelVo> getSecurityLevelList() {
         return getFirstChildResourceClassifies(dataResourceService.getSecurityLevelList())
                 .stream()
-                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName()))
+                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(), childResourceClassify.getTypeCode()))
                 .collect(Collectors.toList());
     }
 

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataClaServiceImpl.java

@@ -4,6 +4,7 @@ package com.dragoninfo.dcuc.app.sub.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.cons.CommonCons;
+import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.sub.dto.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.sub.dto.DataClaDTO;
 import com.dragoninfo.dcuc.app.sub.entity.DataCla;
@@ -11,6 +12,7 @@ import com.dragoninfo.dcuc.app.sub.enumresources.DataClaTypeEnum;
 import com.dragoninfo.dcuc.app.sub.mapper.DataClaMapper;
 import com.dragoninfo.dcuc.app.sub.service.IDataClaService;
 import com.dragoninfo.dcuc.app.vo.DataResourceTreeVo;
+import com.dragoninfo.dcuc.auth.auth.enumresources.AuthDataTypeEnum;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
@@ -46,6 +48,7 @@ public class DataClaServiceImpl implements IDataClaService {
         if(StringUtils.isBlank(firId)) {
             DataClaDTO dataClaDTO = new DataClaDTO(dto.getFirCode()
                     ,dto.getFirName(), DataClaTypeEnum.FIR.getLevel(), DataClaTypeEnum.FIR.getCode());
+            dataClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_CLA_FIR.value);
             DataClaDTO firDTO = save(dataClaDTO);
             firId = firDTO.getId();
         }
@@ -55,6 +58,7 @@ public class DataClaServiceImpl implements IDataClaService {
             DataClaDTO dataClaDTO = new DataClaDTO(dto.getSecCode()
                     ,dto.getSecName(), DataClaTypeEnum.SEC.getLevel(), DataClaTypeEnum.SEC.getCode());
             dataClaDTO.setFirId(firId);
+            dataClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_CLA_SEC.value);
             DataClaDTO secDTO = save(dataClaDTO);
             secId = secDTO.getId();
         }
@@ -65,6 +69,7 @@ public class DataClaServiceImpl implements IDataClaService {
                     ,dto.getLabClaName(), DataClaTypeEnum.LAB_CLA.getLevel(), DataClaTypeEnum.LAB_CLA.getCode());
             dataClaDTO.setFirId(firId);
             dataClaDTO.setSecId(secId);
+            dataClaDTO.setDataType(dto.getLabClaCode());
             DataClaDTO labClaDTO = save(dataClaDTO);
             labClaId = labClaDTO.getId();
         }
@@ -76,6 +81,7 @@ public class DataClaServiceImpl implements IDataClaService {
             dataClaDTO.setRemark(dto.getRemark());
             dataClaDTO.setFirId(firId);
             dataClaDTO.setSecId(secId);
+            dataClaDTO.setDataType(dto.getLabClaCode());
             dataClaDTO.setLabClaId(labClaId);
             save(dataClaDTO);
         }
@@ -343,6 +349,7 @@ public class DataClaServiceImpl implements IDataClaService {
         DataCla dataCla = new DataCla();
         dataCla.setName(node.getLabel());
         dataCla.setCode(node.getCode());
+        dataCla.setDataType(node.getDataType());
         dataCla.setDeleted(BooleanEnum.FALSE.value);
         dataCla.setCreateTime(date);
         int length = 1;

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataLevelServiceImpl.java

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.sub.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.sub.dto.DataLevelDTO;
 import com.dragoninfo.dcuc.app.sub.dto.ExcelDataLevel;
 import com.dragoninfo.dcuc.app.sub.entity.DataLevel;
@@ -9,6 +10,7 @@ import com.dragoninfo.dcuc.app.sub.mapper.DataLevelMapper;
 import com.dragoninfo.dcuc.app.sub.service.IDataLevelService;
 import com.dragoninfo.dcuc.app.util.ImportUtil;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
+import com.dragoninfo.dcuc.auth.auth.enumresources.AuthDataTypeEnum;
 import com.dragoninfo.dcuc.auth.sub.dto.ExcelImpOrgInfo;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
 import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
@@ -54,6 +56,7 @@ public class DataLevelServiceImpl implements IDataLevelService {
         String id = dto.getId();
         DataLevel dataLevel;
         if(StringUtils.isBlank(id)) {
+            dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_LEVEL.value);
             dataLevel = save(dto);
         } else {
             dataLevel = update(dto);
@@ -138,6 +141,7 @@ public class DataLevelServiceImpl implements IDataLevelService {
         vos.forEach(item->{
             DataLevel dataLevel = new DataLevel();
             BeanUtils.copyProperties(item, dataLevel);
+            dataLevel.setDataType(item.getTypeCode());
             saveByCode(dataLevel);
         });
     }
@@ -165,6 +169,7 @@ public class DataLevelServiceImpl implements IDataLevelService {
             BeanUtils.copyProperties(item, dataLevel);
             dataLevel.setDeleted(BooleanEnum.FALSE.value);
             dataLevel.setCreateTime(date);
+            dataLevel.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_LEVEL.value);
             dataLevelMapper.insert(dataLevel);
         });
     }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/DataSecServiceImpl.java

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.sub.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.sub.dto.DataSecDTO;
 import com.dragoninfo.dcuc.app.sub.dto.ExcelDataLevel;
 import com.dragoninfo.dcuc.app.sub.dto.ExcelDataSec;
@@ -57,6 +58,7 @@ public class DataSecServiceImpl implements IDataSecService {
         String id = dto.getId();
         DataSec dataSec;
         if (StringUtils.isBlank(id)) {
+            dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_SEC.value);
             dataSec = save(dto);
         } else {
             dataSec = update(dto);
@@ -143,6 +145,7 @@ public class DataSecServiceImpl implements IDataSecService {
             DataSec dataSec = new DataSec();
             dataSec.setSecCode(item.getLevelCode());
             dataSec.setSecName(item.getLevelName());
+            dataSec.setDataType(item.getTypeCode());
             saveByCode(dataSec);
         });
     }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/sub/service/impl/FieldClaServiceImpl.java

@@ -3,6 +3,7 @@ package com.dragoninfo.dcuc.app.sub.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.dragoninfo.dcuc.app.cons.CommonCons;
+import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.sub.dto.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.sub.dto.FieldClaDTO;
 import com.dragoninfo.dcuc.app.sub.entity.DataCla;
@@ -45,6 +46,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
         if(StringUtils.isBlank(firId)) {
             FieldClaDTO fieldClaDTO = new FieldClaDTO(dto.getFirCode(),dto.getFirName(),
                     FieldClaTypeEnum.FIR.getLevel(), FieldClaTypeEnum.FIR.getCode());
+            fieldClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_FIELD_FIR.value);
             FieldClaDTO firDTO = save(fieldClaDTO);
             firId = firDTO.getId();
         }
@@ -53,6 +55,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
                     FieldClaTypeEnum.SEC.getLevel(), FieldClaTypeEnum.SEC.getCode());
             fieldClaDTO.setFirId(firId);
             fieldClaDTO.setRemark(dto.getRemark());
+            fieldClaDTO.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_FIELD_SEC.value);
             save(fieldClaDTO);
         }
         return true;
@@ -275,6 +278,7 @@ public class FieldClaServiceImpl implements IFieldClaService {
         fieldCla.setCode(node.getCode());
         fieldCla.setDeleted(BooleanEnum.FALSE.value);
         fieldCla.setCreateTime(date);
+        fieldCla.setDataType(node.getDataType());
         int length = 1;
         if(StringUtils.isNotBlank(path)) {
             String[] idArr = path.split(CommonCons.PATH_SEP);