feature(1、人员、机构同步修改 2、添加id和classifyType查询接口): 1、人员、机构同步修改 2、添加id和classifyType查询接口

1、人员、机构同步修改 2、添加id和classifyType查询接口

dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IDataResourceFacade.java

@@ -36,18 +36,19 @@ public interface IDataResourceFacade {
     List<DataFieldClassifyVo> getFieldClassifyList();
 
     @ApiOperation(value = "数据资源树")
-    @ApiImplicitParam(name = "attrType",value = "数据属性类型 TABLE：表 COLUMN：列")
+    @ApiImplicitParam(name = "attrType", value = "数据属性类型 TABLE：表 COLUMN：列")
     @GetMapping(value = "getAllDataResourceTree")
     List<DataResourceClassifyVo> getAllDataResourceTree(@RequestParam("attrType") String attrType);
 
     @ApiOperation(value = "数据资源树")
-    @ApiImplicitParam(name = "typeCode",value = "typeCode类型（数据分级：DATA_CLASSIFY；数据资源分类：DATA_RESOURCE_CLASSIFY；数据安全级别：DATA_SECURITY_LEVEL；字段分类：COLUMN_CLASSIFY）")
+    @ApiImplicitParam(name = "typeCode", value = "typeCode类型（数据分级：DATA_CLASSIFY；数据资源分类：DATA_RESOURCE_CLASSIFY；数据安全级别：DATA_SECURITY_LEVEL；字段分类：COLUMN_CLASSIFY）")
     @GetMapping(value = "getDataResourceTree")
     DataResourceClassifyVo getDataResourceTree(@RequestParam("typeCode") String typeCode);
 
 
     /**
      * 数据分级同步
+     *
      * @return
      */
     @GetMapping(value = "dataLevelSync")
@@ -55,6 +56,7 @@ public interface IDataResourceFacade {
 
     /**
      * 数据安全等级同步
+     *
      * @return
      */
     @GetMapping(value = "dataSecSync")
@@ -62,6 +64,7 @@ public interface IDataResourceFacade {
 
     /**
      * 数据资源分类同步
+     *
      * @return
      */
     @GetMapping(value = "dataClaSync")
@@ -69,12 +72,14 @@ public interface IDataResourceFacade {
 
     /**
      * 数据分级同步
+     *
      * @return
      */
     @GetMapping(value = "fieldClaSync")
     ResponseStatus fieldClaSync();
 
     /**
+     * 批量获取
      * 根据id和classifyType获取名字和code值
      *
      * @param ids
@@ -83,4 +88,14 @@ public interface IDataResourceFacade {
      */
     @PostMapping(value = "getDetailByIdAndClaType")
     List<DataLevelVo> getDetailByIdsAndClaType(@RequestParam("ids") List<String> ids, @RequestParam("classifyType") String classifyType);
+
+    /**
+     * 根据id和classifyType获取名字和code值
+     *
+     * @param id
+     * @param classifyType
+     * @return
+     */
+    @PostMapping(value = "getDetailByIdAndClaType")
+    DataLevelVo getDetailByIdAndClaType(@RequestParam("id") String id, @RequestParam("classifyType") String classifyType);
 }

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

@@ -39,7 +39,8 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping(value = "/dcuc/app/dataResourceFacade")
-public class DataResourceFacade implements IDataResourceFacade {
+public class DataResourceFacade implements IDataResourceFacade
+{
 
     public static final String ID_SEPARATOR = "|";
 
@@ -416,6 +417,43 @@ public class DataResourceFacade implements IDataResourceFacade {
         return vos;
     }
 
+    @Override
+    public DataLevelVo getDetailByIdAndClaType(String id, String classifyType) {
+        if(StringUtils.isAnyBlank(id, classifyType)) {
+            return null;
+        }
+        DataLevelVo vo = new DataLevelVo();
+        DataResourceEnum anEnum = DataResourceEnum.getByCode(classifyType);
+        if(null == anEnum) {
+            return null;
+        } else if(DataResourceEnum.COLUMN_CLASSIFY.equals(anEnum)) {
+            FieldCla fieldCla = fieldClaService.getById(id);
+            vo.setInnerId(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.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.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.setLevelCode(dataSec.getSecCode());
+            vo.setLevelName(dataSec.getSecName());
+            vo.setTypeCode(dataSec.getDataType());
+        }
+        return vo;
+    }
+
 
     /**
      * 数据资源分类