feature(提供根据ids和classifyType查询详情接口): 提供根据ids和classifyType查询详情接口

提供根据ids和classifyType查询详情接口

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -72,4 +73,14 @@ public interface IDataResourceFacade {
      */
     @GetMapping(value = "fieldClaSync")
     ResponseStatus fieldClaSync();
+
+    /**
+     * 根据id和classifyType获取名字和code值
+     *
+     * @param ids
+     * @param classifyType
+     * @return
+     */
+    @PostMapping(value = "getDetailByIdAndClaType")
+    List<DataLevelVo> getDetailByIdsAndClaType(@RequestParam("id") List<String> ids, @RequestParam("classifyType") String classifyType);
 }

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

@@ -2,6 +2,7 @@ package com.dragoninfo.dcuc.app.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @Author: qiuyu
@@ -10,6 +11,7 @@ import lombok.Data;
  */
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class DataLevelVo {
     private String innerId;
     private String levelCode;

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

@@ -23,6 +23,7 @@ import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -356,6 +357,62 @@ public class DataResourceFacade implements IDataResourceFacade {
     }
 
 
+    @Override
+    public List<DataLevelVo> getDetailByIdsAndClaType(List<String> ids, String classifyType) {
+        List<DataLevelVo> vos= new ArrayList<>();
+        if(CollectionUtils.isEmpty(ids)) {
+            return vos;
+        }
+        if(StringUtils.isBlank(classifyType)) {
+            return vos;
+        }
+        DataResourceEnum anEnum = DataResourceEnum.getByCode(classifyType);
+        if(null == anEnum) {
+            return vos;
+        } else if(DataResourceEnum.COLUMN_CLASSIFY.equals(anEnum)) {
+            List<FieldCla> list = fieldClaService.getByIds(ids);
+            list.stream().map(item->{
+                DataLevelVo vo = new DataLevelVo();
+                vo.setTypeCode(item.getDataType());
+                vo.setLevelName(item.getName());
+                vo.setLevelCode(item.getCode());
+                return vo;
+            }).collect(Collectors.toList());
+
+        } else if(DataResourceEnum.DATA_CLASSIFY.equals(anEnum)) {
+            List<DataLevel> list = dataLevelService.getByIds(ids);
+            list.stream().map(item->{
+                DataLevelVo vo = new DataLevelVo();
+                vo.setTypeCode(item.getDataType());
+                vo.setLevelName(item.getLevelName());
+                vo.setLevelCode(item.getLevelCode());
+                return vo;
+            }).collect(Collectors.toList());
+
+        } else if(DataResourceEnum.DATA_RESOURCE_CLASSIFY.equals(anEnum)) {
+            List<DataCla> list = dataClaService.getByIds(ids);
+            list.stream().map(item->{
+                DataLevelVo vo = new DataLevelVo();
+                vo.setTypeCode(item.getDataType());
+                vo.setLevelName(item.getName());
+                vo.setLevelCode(item.getCode());
+                return vo;
+            }).collect(Collectors.toList());
+
+        } else if(DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
+            List<DataSec> list = dataSecService.getByIds(ids);
+            list.stream().map(item->{
+                DataLevelVo vo = new DataLevelVo();
+                vo.setTypeCode(item.getDataType());
+                vo.setLevelName(item.getSecName());
+                vo.setLevelCode(item.getSecCode());
+                return vo;
+            }).collect(Collectors.toList());
+        }
+        return vos;
+    }
+
+
     /**
      * 数据资源分类
      *

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

@@ -117,5 +117,16 @@ public interface IDataClaService {
      */
     List<DataCla> getAllDataCla();
 
+    /**
+     * 删除
+     * @param id
+     */
     void delete(String id);
+
+    /**
+     * 根据id获取详情
+     * @param id
+     * @return
+     */
+    DataCla getById(String id);
 }

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

@@ -91,4 +91,10 @@ public interface IDataLevelService {
      */
     List<DataLevel> getAll();
 
+    /**
+     * 批量获取
+     * @param ids
+     * @return
+     */
+    List<DataLevel> getByIds(List<String> ids);
 }

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

@@ -91,4 +91,10 @@ public interface IDataSecService {
      */
     List<DataSec> getAll();
 
+    /**
+     * 批量获取
+     * @param ids
+     * @return
+     */
+    List<DataSec> getByIds(List<String> ids);
 }

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

@@ -85,10 +85,10 @@ public interface IFieldClaService {
 
     /**
      * 根据ids查询集合
-     * @param firIds
+     * @param ids
      * @return
      */
-    List<FieldCla> getByIds(List<String> firIds);
+    List<FieldCla> getByIds(List<String> ids);
 
     /**
      * 字段分类数据同步
@@ -109,5 +109,15 @@ public interface IFieldClaService {
      */
     List<FieldCla> getAllFieldCla();
 
+    /**
+     * 删除
+     * @param id
+     */
     void delete(String id);
+
+    /**
+     * 根据id获取详情
+     * @return
+     */
+    FieldCla getById(String id);
 }

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

@@ -172,9 +172,6 @@ public class DataClaServiceImpl implements IDataClaService {
         if(CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        Optional.of(ids)
-                .orElse(new ArrayList<>())
-                .stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
         LambdaQueryWrapper<DataCla> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select().in(DataCla::getId, ids);
         return dataClaMapper.selectList(queryWrapper);
@@ -470,6 +467,11 @@ public class DataClaServiceImpl implements IDataClaService {
        dataClaMapper.deleteById(id);
     }
 
+    @Override
+    public DataCla getById(String id) {
+        return dataClaMapper.selectById(id);
+    }
+
     /**
      * 组装成列表
      * @param dataClaList

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

@@ -239,6 +239,16 @@ public class DataLevelServiceImpl implements IDataLevelService {
         return dataLevelMapper.selectList(null);
     }
 
+    @Override
+    public List<DataLevel> getByIds(List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        LambdaQueryWrapper<DataLevel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(DataLevel::getId, ids);
+        return dataLevelMapper.selectList(queryWrapper);
+    }
+
     private List<ExcelDataLevel> loadDataLevelFromExcel(InputStream inputStream) throws IOException {
         List<ExcelDataLevel> list = new ArrayList<>();
         Workbook wb0 = new HSSFWorkbook(inputStream);

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

@@ -234,6 +234,16 @@ public class DataSecServiceImpl implements IDataSecService {
         return dataSecMapper.selectList(null);
     }
 
+    @Override
+    public List<DataSec> getByIds(List<String> ids) {
+        if(CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(DataSec::getId, ids);
+        return dataSecMapper.selectList(queryWrapper);
+    }
+
     private List<ExcelDataSec> loadDataSecFromExcel(InputStream inputStream) throws IOException {
         List<ExcelDataSec> list = new ArrayList<>();
         Workbook wb0 = new HSSFWorkbook(inputStream);

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

@@ -248,9 +248,6 @@ public class FieldClaServiceImpl implements IFieldClaService {
         if(CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        ids = Optional.of(ids)
-                .orElse(new ArrayList<>())
-                .stream().filter(StringUtils::isNotBlank).collect(Collectors.toList());
         LambdaQueryWrapper<FieldCla> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select().in(FieldCla::getId,ids);
         return fieldClaMapper.selectList(queryWrapper);
@@ -351,6 +348,11 @@ public class FieldClaServiceImpl implements IFieldClaService {
         fieldClaMapper.deleteById(id);
     }
 
+    @Override
+    public FieldCla getById(String id) {
+        return fieldClaMapper.selectById(id);
+    }
+
     private void updateCodeName(FieldClaDTO fieldClaDTO) {
         LambdaUpdateWrapper<FieldCla> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(FieldCla::getCode, fieldClaDTO.getCode())