feature(数据资源树增加内部id字段): 数据资源树增加内部id字段

数据资源树增加内部id字段

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

@@ -11,6 +11,7 @@ import lombok.Data;
 @Data
 @AllArgsConstructor
 public class DataLevelVo {
+    private String innerId;
     private String levelCode;
     private String levelName;
     private String typeCode;

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

@@ -38,6 +38,9 @@ public class DataResourceTreeVo {
 
     @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

@@ -120,7 +120,8 @@ public class DataResourceFacade implements IDataResourceFacade {
               .dataType(item.getTypeCode())
               .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + item.getLevelCode() + ID_SEPARATOR + item.getTypeCode())
               .treeNode(false)
-              .pId(dataLevelTreeVo.getId()).build()).collect(Collectors.toList());
+              .pId(dataLevelTreeVo.getId())
+              .innerId(item.getInnerId()).build()).collect(Collectors.toList());
         dataLevelTreeVo.setChild(child);
 
         dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(dataLevelTreeVo);}});
@@ -153,8 +154,8 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .dataType(item.getTypeCode())
                 .codeDataTypeStr(UUIDUtils.getUUID() + ID_SEPARATOR + item.getLevelCode() + ID_SEPARATOR + item.getTypeCode())
                 .treeNode(false)
-                .pId(securityLevelTree.getId()).build())
-                .collect(Collectors.toList());
+                .pId(securityLevelTree.getId())
+                .innerId(item.getInnerId()).build()).collect(Collectors.toList());
         securityLevelTree.setChild(child);
         dataResourceClassifyVo.setNodes(new ArrayList<DataResourceTreeVo>(){{add(securityLevelTree);}} );
         //设置总数量
@@ -203,6 +204,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
+                .innerId(item.getId())
                 .build();
     }
 
@@ -235,6 +237,7 @@ public class DataResourceFacade implements IDataResourceFacade {
                 .dataType(item.getDataType())
                 .label(item.getName())
                 .code(item.getCode())
+                .innerId(item.getId())
                 .build();
     }
 
@@ -243,7 +246,6 @@ public class DataResourceFacade implements IDataResourceFacade {
         firNodes.forEach(item->{
             List<DataResourceTreeVo> childes = secMap.get(item.getId());
             item.setChild(childes);
-            item.setId(item.getCode());
         });
     }
 
@@ -252,7 +254,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     public List<DataLevelVo> getDataLevelList() {
         List<DataLevel> all = dataLevelService.getAll();
         return all.stream()
-                .map(item -> new DataLevelVo(item.getLevelCode(), item.getLevelName(), item.getDataType()))
+                .map(item -> new DataLevelVo(item.getId(), item.getLevelCode(), item.getLevelName(), item.getDataType()))
                 .collect(Collectors.toList());
     }
 
@@ -260,7 +262,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     public List<DataLevelVo> getSecurityLevelList() {
         List<DataSec> all = dataSecService.getAll();
         return all.stream()
-                .map(item -> new DataLevelVo(item.getSecCode(), item.getSecName(), item.getDataType()))
+                .map(item -> new DataLevelVo(item.getId(), item.getSecCode(), item.getSecName(), item.getDataType()))
                 .collect(Collectors.toList());
     }
 
@@ -489,7 +491,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     private List<DataLevelVo> getDataLevelListFromRemote() {
         return getFirstChildResourceClassifies(dataResourceService.getDataLevelList())
                 .stream()
-                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(),childResourceClassify.getTypeCode()))
+                .map(childResourceClassify -> new DataLevelVo(null, childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(),childResourceClassify.getTypeCode()))
                 .collect(Collectors.toList());
     }
 
@@ -500,7 +502,7 @@ public class DataResourceFacade implements IDataResourceFacade {
     private List<DataLevelVo> getSecurityLevelListFromRemote() {
         return getFirstChildResourceClassifies(dataResourceService.getSecurityLevelList())
                 .stream()
-                .map(childResourceClassify -> new DataLevelVo(childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(), childResourceClassify.getTypeCode()))
+                .map(childResourceClassify -> new DataLevelVo(null, childResourceClassify.getCodeValue(), childResourceClassify.getCodeName(), childResourceClassify.getTypeCode()))
                 .collect(Collectors.toList());
     }
 

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

@@ -354,6 +354,7 @@ public class ResourceServiceImpl extends BaseMybatisService<ServiceResource,Stri
         dto.setDeleted(acceptDTO.getXtzxbs());
         String sxrq = acceptDTO.getSxrq();
         if(!StringUtils.isEmpty(sxrq)){
+            dto.setLineTime(sxrq);
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             try {
                 Date parse = format.parse(sxrq);

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

@@ -142,7 +142,7 @@ public class DataSecServiceImpl implements IDataSecService {
             return;
         }
         //根据code去重
-        Map<String, DataLevelVo> collect = Optional.ofNullable(list).orElse(new ArrayList<>())
+        Map<String, DataLevelVo> collect = Optional.of(list).orElse(new ArrayList<>())
                 .stream()
                 .collect(Collectors.toMap(DataLevelVo::getLevelCode, item -> item, (old, last) -> last));
         List<DataLevelVo> vos = new ArrayList<>(collect.values());

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/strategy/AppResourceStrategy.java

@@ -93,7 +93,7 @@ public class AppResourceStrategy implements ResourceOperateStrategy<AppResourceD
         applyInfo.setApplyStatus(dto.getAppStatus());
         applyInfo.setAppOpsDepName(dto.getAppOpsDepName());
         applyInfo.setManagerOrgCode(dto.getManagerOrgCode());
-        applyInfo.setLineTime(dto.getManagerOrgCode());
+        applyInfo.setLineTime(dto.getLineTime());
         applyInfo.setAppEnglishName(dto.getManagerOrgCode());
         return applyInfo;
     }