Merge branch 'mzq-sjjq-220929' into 'develop'

Mzq sjjq 220929

See merge request xj-aks/dcuc/app-service!5

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

@@ -1,6 +1,6 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -21,7 +21,7 @@ public interface IDataSecFacade {
      * @return
      */
     @PostMapping("dataLevelAdd")
-    ResponseStatus dataLevelAdd(@RequestBody DataSecDTO dto);
+    ResponseStatus dataLevelAdd(@RequestBody FieldSecDTO dto);
 
     /**
      * 查看详情
@@ -29,7 +29,7 @@ public interface IDataSecFacade {
      * @return
      */
     @GetMapping("detail/{id}")
-    DataSecDTO detail(@PathVariable("id") String id);
+    FieldSecDTO detail(@PathVariable("id") String id);
 
     /**
      * 根据id删除
@@ -45,7 +45,7 @@ public interface IDataSecFacade {
      * @return
      */
     @GetMapping("detailByCode/{secCode}")
-    DataSecDTO detailByCode(@PathVariable("secCode") String secCode);
+    FieldSecDTO detailByCode(@PathVariable("secCode") String secCode);
 
     /**
      * 数据安全等级分页查询
@@ -53,6 +53,6 @@ public interface IDataSecFacade {
      * @return
      */
     @PostMapping("search")
-    Page<DataSecDTO> pageSearch(@RequestBody SearchDTO searchDTO);
+    Page<FieldSecDTO> pageSearch(@RequestBody SearchDTO searchDTO);
 
 }

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

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.app.dto.sub;
 import lombok.Data;
 
 /**
- * 主客体授权-数据分级新增修改DTO
+ * 主客体授权-数据分级DTO
  * @author mazq
  * @date 2021/5/25
  */

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

@@ -5,6 +5,8 @@ import lombok.Data;
 import java.util.Date;
 
 /**
+ * 字段分类Dto
+ *
  * @author mazq
  * @date 2021/5/31
  */

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

@@ -3,12 +3,12 @@ package com.dragoninfo.dcuc.app.dto.sub;
 import lombok.Data;
 
 /**
- * 主客体授权-数据分级新增修改DTO
+ * 主客体授权-字段安全等级Dto
  * @author mazq
  * @date 2021/5/25
  */
 @Data
-public class DataSecDTO {
+public class FieldSecDTO {
 
     private String id;
 

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

@@ -20,7 +20,7 @@ import java.util.Date;
  */
 @Data
 @TableName("T_APP_DATA_SEC")
-public class DataSec implements Serializable {
+public class FieldSec implements Serializable {
 
     @TableId(type = IdType.UUID)
     private String id;

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

@@ -0,0 +1,45 @@
+package com.dragoninfo.dcuc.app.enumresources;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @author mazq
+ * @date 2022/10/4
+ */
+public enum AppDataTypeEnum implements ICodeEnum {
+
+    /**
+     * 表资源类型
+     */
+    TAB("TAB", "表"),
+
+    /**
+     * 列资源类型
+     */
+    COL("COL", "列");
+
+    /**
+     * 数据资源code
+     */
+    private String value;
+
+    /**
+     * 数据资源名称
+     */
+    private String label;
+
+    AppDataTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

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

@@ -34,11 +34,7 @@ public enum DataResourceEnum {
     /**
      * 字段关系
      */
-    COLUMN_RELATION_CATALOG("COLUMN_RELATION_CATALOG", "字段关系", "COLUMN_RELATION_CATALOG", DataAttrTypeEnum.DATA_ATTR_COLUMN),
-
-    TAB("TAB", "表", "TAB", DataAttrTypeEnum.DATA_ATTR_TABLE),
-
-    COL("TAB", "列", "COL", DataAttrTypeEnum.DATA_ATTR_COLUMN);
+    COLUMN_RELATION_CATALOG("COLUMN_RELATION_CATALOG", "字段关系", "COLUMN_RELATION_CATALOG", DataAttrTypeEnum.DATA_ATTR_COLUMN);
 
     DataResourceEnum(String code, String label, String dataType, DataAttrTypeEnum attrType) {
         this.code = code;

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/entity/DataColInfo.java

@@ -1,33 +0,0 @@
-package com.dragoninfo.dcuc.app.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-@Data
-@TableName("T_AUTH_DATA_COLINFO")
-public class DataColInfo {
-
-    /** ID */
-    @TableId(type = IdType.UUID)
-    private String id ;
-    /** NAME */
-    private String name ;
-    /** CODE */
-    private String code ;
-    /** TA_CODE */
-    private String taCode ;
-    /** SECU_LEV */
-    private String secuLev ;
-    /** COL_CLA_FIR */
-    private String colClaFir ;
-    /** COL_CLA_SEC */
-    private String colClaSec ;
-
-
-}

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/entity/DataTabInfo.java

@@ -1,41 +0,0 @@
-package com.dragoninfo.dcuc.app.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-@Data
-@TableName("T_AUTH_DATA_TABINFO")
-public class DataTabInfo {
-
-    /** ID */
-    @TableId(type = IdType.UUID)
-    private String id ;
-    /** NAME */
-    private String name ;
-    /** CODE */
-    private String code ;
-    /** DATA_LEV_FIR */
-    private String dataLevFir ;
-    /** DATA_CLA_FIR */
-    private String dataClaFir ;
-    /** DATA_CLA_SEC */
-    private String dataClaSec ;
-    /** LAB_FIR */
-    private String labFir ;
-    /** LAB_SEC */
-    private String labSec ;
-    /** LAB_THR */
-    private String labThr ;
-    /** LAB_FOUR */
-    private String labFour ;
-    /** LAB_FIV */
-    private String labFiv ;
-
-
-}

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

@@ -6,19 +6,13 @@ import com.dragoninfo.dcuc.app.dto.dataresource.ChildResourceClassify;
 import com.dragoninfo.dcuc.app.dto.dataresource.ResourceClassify;
 import com.dragoninfo.dcuc.app.dto.sub.DataClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
-import com.dragoninfo.dcuc.app.entity.DataColInfo;
-import com.dragoninfo.dcuc.app.entity.DataTabInfo;
-import com.dragoninfo.dcuc.app.entity.sub.DataCla;
-import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
-import com.dragoninfo.dcuc.app.entity.sub.FieldCla;
+import com.dragoninfo.dcuc.app.entity.sub.*;
+import com.dragoninfo.dcuc.app.enumresources.AppDataTypeEnum;
 import com.dragoninfo.dcuc.app.enumresources.DataAttrTypeEnum;
 import com.dragoninfo.dcuc.app.enumresources.DataResourceEnum;
 import com.dragoninfo.dcuc.app.enumresources.sub.DataClaTypeEnum;
 import com.dragoninfo.dcuc.app.enumresources.sub.FieldClaTypeEnum;
-import com.dragoninfo.dcuc.app.service.IDataColInfoService;
 import com.dragoninfo.dcuc.app.service.IDataResourceService;
-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;
@@ -61,10 +55,10 @@ public class DataResourceFacade implements IDataResourceFacade {
     private IFieldClaService fieldClaService;
 
     @Autowired
-    private IDataTabInfoService tabInfoService;
+    private IAppDataResourceInfoService tabInfoService;
 
     @Autowired
-    private IDataColInfoService colInfoService;
+    private IAppDataItemInfoService colInfoService;
 
     @Autowired
     private IDataCatalogBusiness dataCatalogBusiness;
@@ -80,21 +74,21 @@ public class DataResourceFacade implements IDataResourceFacade {
         //表：数据分级  数据资源分类
         if (DataAttrTypeEnum.DATA_ATTR_TABLE.getValue().equals(attrType)) {
             // 查询所有的表和列
-            List<DataTabInfo> tabInfos = tabInfoService.getAllTabInfos();
-            List<DataColInfo> colInfos = colInfoService.getAllColInfos();
+            List<AppDataResourceInfo> tabInfos = tabInfoService.getHasClassifyTables();
             result.add(getDataLevelTree());
-            result.add(getDataClassifyTree(tabInfos, colInfos));
+            result.add(getDataClassifyTree(tabInfos));
         } else if (DataAttrTypeEnum.DATA_ATTR_COLUMN.getValue().equals(attrType)) {
-            List<DataColInfo> colInfos = colInfoService.getAllColInfos();
+            List<AppDataResourceInfo> tabInfos = tabInfoService.getAllTabInfos();
+            List<AppDataItemInfo> colInfos = colInfoService.getHasClassifyColInfos();
             result.add(getSecurityLevelTree());
-            result.add(getFieldClassifyTree(colInfos));
+            result.add(getFieldClassifyTree(tabInfos, colInfos));
         } else {
-            List<DataTabInfo> tabInfos = tabInfoService.getAllTabInfos();
-            List<DataColInfo> colInfos = colInfoService.getAllColInfos();
+            List<AppDataResourceInfo> tabInfos = tabInfoService.getAllTabInfos();
+            List<AppDataItemInfo> colInfos = colInfoService.getHasClassifyColInfos();
             result.add(getDataLevelTree());
-            result.add(getDataClassifyTree(tabInfos, colInfos));
+            result.add(getDataClassifyTree(tabInfos));
             result.add(getSecurityLevelTree());
-            result.add(getFieldClassifyTree(colInfos));
+            result.add(getFieldClassifyTree(tabInfos, colInfos));
         }
         return result;
     }
@@ -103,23 +97,23 @@ public class DataResourceFacade implements IDataResourceFacade {
     public DataResourceClassifyVo getDataResourceTree(String typeCode) {
         DataResourceClassifyVo result = null;
         DataResourceEnum dataResourceEnum = Enum.valueOf(DataResourceEnum.class, typeCode);
-        List<DataColInfo> colInfos = null;
-        List<DataTabInfo> tabInfos = null;
+        List<AppDataItemInfo> colInfos = null;
+        List<AppDataResourceInfo> tabInfos = null;
         switch (dataResourceEnum) {
             case DATA_CLASSIFY:
                 result = getDataLevelTree();
                 break;
             case COLUMN_CLASSIFY:
-                colInfos = colInfoService.getAllColInfos();
-                result = getFieldClassifyTree(colInfos);
+                tabInfos = tabInfoService.getAllTabInfos();
+                colInfos = colInfoService.getHasClassifyColInfos();
+                result = getFieldClassifyTree(tabInfos, colInfos);
                 break;
             case DATA_SECURITY_LEVEL:
                 result = getSecurityLevelTree();
                 break;
             case DATA_RESOURCE_CLASSIFY:
-                tabInfos = tabInfoService.getAllTabInfos();
-                colInfos = colInfoService.getAllColInfos();
-                result = getDataClassifyTree(tabInfos, colInfos);
+                tabInfos = tabInfoService.getHasClassifyTables();
+                result = getDataClassifyTree(tabInfos);
                 break;
             default:
                 break;
@@ -202,10 +196,9 @@ public class DataResourceFacade implements IDataResourceFacade {
         return dataResourceClassifyVo;
     }
 
-    private DataResourceClassifyVo getDataClassifyTree(List<DataTabInfo> tabInfos, List<DataColInfo> colInfos) {
+    private DataResourceClassifyVo getDataClassifyTree(List<AppDataResourceInfo> tabInfos) {
         // 将表分类映射到表
-        Map<String, List<DataTabInfo>> tabLabMap = getTabLabGroupMap(tabInfos);
-        Map<String, List<DataColInfo>> colTaMap = colInfos.stream().collect(Collectors.groupingBy(DataColInfo::getTaCode));
+        Map<String, List<AppDataResourceInfo>> tabLabMap = getTabLabGroupMap(tabInfos);
 
         DataResourceEnum dataResourceEnum = DataResourceEnum.DATA_RESOURCE_CLASSIFY;
 
@@ -238,7 +231,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             resourceVo.setTotal(0);
         } else {
             // 拼接表、列、pid
-            boolean b = combinePidAndTabCol(topTreeVo, tabLabMap, colTaMap);
+            boolean b = combinePidAndTableInfo(topTreeVo, tabLabMap);
             if (b) {
                 resourceVo.setNodes(new ArrayList<>());
                 resourceVo.setTotal(0);
@@ -252,42 +245,42 @@ public class DataResourceFacade implements IDataResourceFacade {
         return resourceVo;
     }
 
-    private Map<String, List<DataTabInfo>> getTabLabGroupMap(List<DataTabInfo> tabInfos) {
-        Map<String, List<DataTabInfo>> group = new HashMap<>();
+    private Map<String, List<AppDataResourceInfo>> getTabLabGroupMap(List<AppDataResourceInfo> tabInfos) {
+        Map<String, List<AppDataResourceInfo>> group = new HashMap<>();
         tabInfos.forEach(e -> {
             // 一级分类
-            String claFir = e.getDataClaFir();
+            String claFir = e.getDataClassifyOneCode();
             if (StringUtils.isBlank(claFir)) {
                 return;
             }
             // 二级分类
-            String claSec = e.getLabSec();
+            String claSec = e.getDataClassifyTwoCode();
             if (StringUtils.isBlank(claSec)) {
                 putInMap(group, e, claFir);
                 return;
             }
             // 标签1
-            String labFir = e.getLabFir();
+            String labFir = e.getDataLabelOneCode();
             if (StringUtils.isNotBlank(labFir)) {
                 labFir = CommonCons.LAB_CLA_FIR + CommonCons.ID_SEPARATOR + labFir;
             }
             // 标签2
-            String labSec = e.getLabSec();
+            String labSec = e.getDataLabelTwoCode();
             if (StringUtils.isNotBlank(labSec)) {
                 labSec = CommonCons.LAB_CLA_SEC + CommonCons.ID_SEPARATOR + labSec;
             }
             // 标签3
-            String labThr = e.getLabThr();
+            String labThr = e.getDataLabelThreeCode();
             if (StringUtils.isNotBlank(labThr)) {
                 labThr = CommonCons.LAB_CLA_THI + CommonCons.ID_SEPARATOR + labThr;
             }
             // 标签4
-            String labFour = e.getLabFour();
+            String labFour = e.getDataLabelFourCode();
             if (StringUtils.isNotBlank(labFour)) {
                 labFour = CommonCons.LAB_CLA_FOUR + CommonCons.ID_SEPARATOR + labFour;
             }
             // 标签5
-            String labFiv = e.getLabFiv();
+            String labFiv = e.getDataLabelFiveCode();
             if (StringUtils.isNotBlank(labFiv)) {
                 labFiv = CommonCons.LAB_CLA_FIV + CommonCons.ID_SEPARATOR + labFiv;
             }
@@ -305,8 +298,8 @@ public class DataResourceFacade implements IDataResourceFacade {
         return group;
     }
 
-    private void putInMap(Map<String, List<DataTabInfo>> group, DataTabInfo e, String claFir) {
-        List<DataTabInfo> list = group.get(claFir);
+    private void putInMap(Map<String, List<AppDataResourceInfo>> group, AppDataResourceInfo e, String claFir) {
+        List<AppDataResourceInfo> list = group.get(claFir);
         if (null == list) {
             list = new ArrayList<>();
         }
@@ -325,9 +318,11 @@ public class DataResourceFacade implements IDataResourceFacade {
     }
 
 
-    private DataResourceClassifyVo getFieldClassifyTree(List<DataColInfo> colInfos) {
-
-        Map<String, List<DataColInfo>> colInfosMap = getColumnClaGroupMap(colInfos);
+    private DataResourceClassifyVo getFieldClassifyTree(List<AppDataResourceInfo> tabInfos, List<AppDataItemInfo> colInfos) {
+        Map<String, AppDataResourceInfo> tableMap = tabInfos
+                .stream()
+                .collect(Collectors.toMap(AppDataResourceInfo::getDataObjectId, e -> e));
+        Map<String, List<AppDataItemInfo>> colInfosMap = getColumnClaGroupMap(colInfos);
 
         DataResourceEnum dataResourceEnum = DataResourceEnum.COLUMN_CLASSIFY;
 
@@ -348,7 +343,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             resourceVo.setNodes(new ArrayList<>());
             resourceVo.setTotal(0);
         } else {
-            boolean b = combinePidCol(topTreeVo, colInfosMap);
+            boolean b = combinePidTabAndCol(topTreeVo, tableMap, colInfosMap);
             if (b) {
                 resourceVo.setNodes(new ArrayList<>());
                 resourceVo.setTotal(0);
@@ -361,11 +356,11 @@ public class DataResourceFacade implements IDataResourceFacade {
         return resourceVo;
     }
 
-    private Map<String, List<DataColInfo>> getColumnClaGroupMap(List<DataColInfo> colInfos) {
-        return colInfos.stream().collect(Collectors.groupingBy(DataColInfo::getColClaSec));
+    private Map<String, List<AppDataItemInfo>> getColumnClaGroupMap(List<AppDataItemInfo> colInfos) {
+        return colInfos.stream().collect(Collectors.groupingBy(AppDataItemInfo::getColumnClassify));
     }
 
-    private boolean combinePidCol(DataResourceTreeVo treeVo, Map<String, List<DataColInfo>> colInfosMap) {
+    private boolean combinePidTabAndCol(DataResourceTreeVo treeVo, Map<String, AppDataResourceInfo> tableMap, Map<String, List<AppDataItemInfo>> colInfosMap) {
         List<DataResourceTreeVo> child = treeVo.getChild();
         Iterator<DataResourceTreeVo> iterator = child.iterator();
         while (iterator.hasNext()) {
@@ -375,19 +370,24 @@ public class DataResourceFacade implements IDataResourceFacade {
             List<DataResourceTreeVo> cc = childVo.getChild();
             if (CollectionUtils.isNotEmpty(cc)) {
                 childVo.setTreeNode(true);
-                boolean emptyChild = combinePidCol(childVo, colInfosMap);
+                boolean emptyChild = combinePidTabAndCol(childVo, tableMap, colInfosMap);
                 if (emptyChild) {
                     iterator.remove();
                 }
             } else {
                 // 如果为叶子节点,查找对应的表和列
                 // 如果查找不到表和列则移除
-                String id = childVo.getId();
-                List<DataColInfo> dataColInfo = colInfosMap.get(childVo.getCode());
+                List<AppDataItemInfo> dataColInfo = colInfosMap.get(childVo.getCode());
                 if (dataColInfo == null) {
                     iterator.remove();
                 } else {
-                    List<DataResourceTreeVo> tableVos = convertColumnToTreeVo(childVo.getId(), dataColInfo);
+                    Map<String, List<AppDataItemInfo>> tableGroup = dataColInfo.stream()
+                            .collect(Collectors.groupingBy(AppDataItemInfo::getResourceTableId));
+                    List<DataResourceTreeVo> tableVos = tableGroup.entrySet().stream().map(e -> {
+                        String tableId = e.getKey();
+                        AppDataResourceInfo table = tableMap.get(tableId);
+                        return convertTableToTreeVo(childVo.getId(), Collections.singletonList(table), tableGroup);
+                    }).flatMap(List::stream).collect(Collectors.toList());
                     childVo.setTreeNode(true);
                     childVo.setChild(tableVos);
                 }
@@ -425,7 +425,7 @@ public class DataResourceFacade implements IDataResourceFacade {
 
     @Override
     public List<DataLevelVo> getSecurityLevelList() {
-        List<DataSec> all = dataSecService.getAll();
+        List<FieldSec> all = dataSecService.getAll();
         return all.stream()
                 .map(item -> new DataLevelVo(item.getId(), item.getSecCode(), item.getSecName(), item.getDataType()))
                 .collect(Collectors.toList());
@@ -636,7 +636,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             }).collect(Collectors.toList());
 
         } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
-            List<DataSec> list = dataSecService.getByIds(ids);
+            List<FieldSec> list = dataSecService.getByIds(ids);
             list.stream().map(item -> {
                 DataLevelVo vo = new DataLevelVo();
                 vo.setTypeCode(item.getDataType());
@@ -677,7 +677,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             vo.setLevelName(dataCla.getName());
             vo.setTypeCode(dataCla.getCode());
         } else if (DataResourceEnum.DATA_SECURITY_LEVEL.equals(anEnum)) {
-            DataSec dataSec = dataSecService.getById(id);
+            FieldSec dataSec = dataSecService.getById(id);
             vo.setId(dataSec.getId());
             vo.setLevelCode(dataSec.getSecCode());
             vo.setLevelName(dataSec.getSecName());
@@ -794,10 +794,9 @@ public class DataResourceFacade implements IDataResourceFacade {
      *
      * @param treeVo
      * @param tabInfosMap
-     * @param colInfosMap
      * @return
      */
-    private boolean combinePidAndTabCol(DataResourceTreeVo treeVo, Map<String, List<DataTabInfo>> tabInfosMap, Map<String, List<DataColInfo>> colInfosMap) {
+    private boolean combinePidAndTableInfo(DataResourceTreeVo treeVo, Map<String, List<AppDataResourceInfo>> tabInfosMap) {
         List<DataResourceTreeVo> child = treeVo.getChild();
         Iterator<DataResourceTreeVo> iterator = child.iterator();
         while (iterator.hasNext()) {
@@ -807,7 +806,7 @@ public class DataResourceFacade implements IDataResourceFacade {
             List<DataResourceTreeVo> cc = childVo.getChild();
             if (CollectionUtils.isNotEmpty(cc)) {
                 childVo.setTreeNode(true);
-                boolean emptyChild = combinePidAndTabCol(childVo, tabInfosMap, colInfosMap);
+                boolean emptyChild = combinePidAndTableInfo(childVo, tabInfosMap);
                 if (emptyChild) {
                     iterator.remove();
                 }
@@ -818,11 +817,11 @@ public class DataResourceFacade implements IDataResourceFacade {
                 String classifyCode = DataResourceEnum.DATA_RESOURCE_CLASSIFY.getCode();
                 if (id.startsWith(classifyCode)) {
                     String replace = id.replace(classifyCode + CommonCons.ID_SEPARATOR, "");
-                    List<DataTabInfo> dataTabInfo = tabInfosMap.get(replace);
+                    List<AppDataResourceInfo> dataTabInfo = tabInfosMap.get(replace);
                     if (dataTabInfo == null) {
                         iterator.remove();
                     } else {
-                        List<DataResourceTreeVo> tableVos = convertTableToTreeVo(childVo, dataTabInfo, colInfosMap);
+                        List<DataResourceTreeVo> tableVos = convertTableToTreeVo(childVo.getId(), dataTabInfo, null);
                         childVo.setTreeNode(true);
                         childVo.setChild(tableVos);
                     }
@@ -833,33 +832,35 @@ public class DataResourceFacade implements IDataResourceFacade {
         return CollectionUtils.isEmpty(child);
     }
 
-    private List<DataResourceTreeVo> convertTableToTreeVo(DataResourceTreeVo childVo, List<DataTabInfo> dataTabInfo, Map<String, List<DataColInfo>> colInfosMap) {
+    private List<DataResourceTreeVo> convertTableToTreeVo(String pid, List<AppDataResourceInfo> dataTabInfo, Map<String, List<AppDataItemInfo>> colInfosMap) {
         return dataTabInfo.stream().map(e -> {
             DataResourceTreeVo vo = new DataResourceTreeVo();
             vo.setId(e.getId());
-            vo.setPId(childVo.getId());
-            vo.setLabel(e.getName());
-            vo.setDataType(DataResourceEnum.TAB.getCode());
-            List<DataColInfo> colInfoList = colInfosMap.get(e.getCode());
-            if (CollectionUtils.isNotEmpty(colInfoList)) {
-                List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList);
-                vo.setChild(colVos);
-                vo.setTreeNode(true);
-            } else {
-                vo.setChild(Collections.emptyList());
-                vo.setTreeNode(false);
+            vo.setPId(pid);
+            vo.setLabel(e.getTableName());
+            vo.setDataType(AppDataTypeEnum.TAB.getValue());
+            if (null != colInfosMap) {
+                List<AppDataItemInfo> colInfoList = colInfosMap.get(e.getDataObjectId());
+                if (CollectionUtils.isNotEmpty(colInfoList)) {
+                    List<DataResourceTreeVo> colVos = convertColumnToTreeVo(e.getId(), colInfoList);
+                    vo.setChild(colVos);
+                    vo.setTreeNode(true);
+                } else {
+                    vo.setChild(Collections.emptyList());
+                    vo.setTreeNode(false);
+                }
             }
             return vo;
         }).collect(Collectors.toList());
     }
 
-    private List<DataResourceTreeVo> convertColumnToTreeVo(String pid, List<DataColInfo> colInfoList) {
+    private List<DataResourceTreeVo> convertColumnToTreeVo(String pid, List<AppDataItemInfo> colInfoList) {
         return colInfoList.stream().map(e -> {
             DataResourceTreeVo vo = new DataResourceTreeVo();
             vo.setId(e.getId());
             vo.setPId(pid);
-            vo.setLabel(e.getName());
-            vo.setDataType(DataResourceEnum.COL.getCode());
+            vo.setLabel(e.getColumnName());
+            vo.setDataType(AppDataTypeEnum.COL.getValue());
             return vo;
         }).collect(Collectors.toList());
     }

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

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.facade.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -24,15 +24,15 @@ public class DataSecFacade implements IDataSecFacade {
 
 
     @Override
-    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+    public ResponseStatus dataLevelAdd(FieldSecDTO dto) {
         return dataSecService.dataLevelAdd(dto);
     }
 
 
     @Override
-    public DataSecDTO detail(String id) {
-        DataSec sec = dataSecService.getById(id);
-        DataSecDTO dto = new DataSecDTO();
+    public FieldSecDTO detail(String id) {
+        FieldSec sec = dataSecService.getById(id);
+        FieldSecDTO dto = new FieldSecDTO();
         BeanUtils.copyProperties(sec, dto);
         return dto;
     }
@@ -43,12 +43,12 @@ public class DataSecFacade implements IDataSecFacade {
     }
 
     @Override
-    public DataSecDTO detailByCode(String secCode) {
+    public FieldSecDTO detailByCode(String secCode) {
         return dataSecService.detailByCode(secCode);
     }
 
     @Override
-    public Page<DataSecDTO> pageSearch(SearchDTO searchDTO) {
+    public Page<FieldSecDTO> pageSearch(SearchDTO searchDTO) {
         return dataSecService.pageSearch(searchDTO);
     }
 

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/mapper/DataColInfoMapper.java

@@ -1,11 +0,0 @@
-package com.dragoninfo.dcuc.app.mapper;
-
-import com.dragoninfo.dcuc.app.entity.DataColInfo;
-import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-public interface DataColInfoMapper extends BaseMybatisMapper<DataColInfo> {
-}

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/mapper/DataTabInfoMapper.java

@@ -1,11 +0,0 @@
-package com.dragoninfo.dcuc.app.mapper;
-
-import com.dragoninfo.dcuc.app.entity.DataTabInfo;
-import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-public interface DataTabInfoMapper extends BaseMybatisMapper<DataTabInfo> {
-}

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

@@ -1,11 +1,11 @@
 package com.dragoninfo.dcuc.app.mapper.sub;
 
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
 
 /**
  * @author mazq
  * @date 2021/5/25
  */
-public interface DataSecMapper extends BaseMybatisMapper<DataSec> {
+public interface DataSecMapper extends BaseMybatisMapper<FieldSec> {
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IDataColInfoService.java

@@ -1,15 +0,0 @@
-package com.dragoninfo.dcuc.app.service;
-
-import com.dragoninfo.dcuc.app.entity.DataColInfo;
-
-import java.util.List;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-public interface IDataColInfoService {
-
-
-    List<DataColInfo> getAllColInfos();
-}

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IDataTabInfoService.java

@@ -1,16 +0,0 @@
-package com.dragoninfo.dcuc.app.service;
-
-import com.dragoninfo.dcuc.app.entity.DataTabInfo;
-
-import java.util.List;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-public interface IDataTabInfoService {
-
-
-    List<DataTabInfo> getAllTabInfos();
-
-}

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

@@ -1,26 +0,0 @@
-package com.dragoninfo.dcuc.app.service.impl;
-
-import com.dragoninfo.dcuc.app.entity.DataColInfo;
-import com.dragoninfo.dcuc.app.mapper.DataColInfoMapper;
-import com.dragoninfo.dcuc.app.service.IDataColInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-@Service
-public class DataColInfoServiceImpl implements IDataColInfoService {
-
-    @Autowired
-    private DataColInfoMapper colInfoMapper;
-
-
-    @Override
-    public List<DataColInfo> getAllColInfos() {
-        return colInfoMapper.selectList(null);
-    }
-}

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

@@ -1,25 +0,0 @@
-package com.dragoninfo.dcuc.app.service.impl;
-
-import com.dragoninfo.dcuc.app.entity.DataTabInfo;
-import com.dragoninfo.dcuc.app.mapper.DataTabInfoMapper;
-import com.dragoninfo.dcuc.app.service.IDataTabInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author mazq
- * @date 2022/9/29
- */
-@Service
-public class DataTabInfoServiceImpl implements IDataTabInfoService {
-
-    @Autowired
-    private DataTabInfoMapper tabInfoMapper;
-
-    @Override
-    public List<DataTabInfo> getAllTabInfos() {
-        return tabInfoMapper.selectList(null);
-    }
-}

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

@@ -48,6 +48,13 @@ public interface IAppDataItemInfoService {
      */
     void updateAll(List<AppDataItemInfo> updateDataItemInfoList);
 
+    /**
+     * 获取所有列信息
+     * @return
+     */
+    List<AppDataItemInfo> getHasClassifyColInfos();
+
+
     /**
      * 搜索查询列表
      *

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

@@ -1,13 +1,7 @@
 package com.dragoninfo.dcuc.app.service.sub;
 
 import com.dragoninfo.dcuc.app.entity.sub.AppDataResourceInfo;
-import com.dragoninfo.dcuc.app.vo.AppDataResourceInfoRespVO;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -39,6 +33,20 @@ public interface IAppDataResourceInfoService {
      */
     void updateAll(List<AppDataResourceInfo> updateResourceInfoList);
 
+    /**
+     * 获取所有表信息
+     *
+     * @return
+     */
+    List<AppDataResourceInfo> getAllTabInfos();
+
+    /**
+     * 获取有表分类信息的所有表数据
+     * @return
+     */
+    List<AppDataResourceInfo> getHasClassifyTables();
+
+
 
     /**
      * 根据查询条件查询列表

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

@@ -1,7 +1,7 @@
 package com.dragoninfo.dcuc.app.service.sub;
 
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
@@ -21,28 +21,28 @@ public interface IDataSecService {
      * @param dto
      * @return
      */
-    ResponseStatus dataLevelAdd(DataSecDTO dto);
+    ResponseStatus dataLevelAdd(FieldSecDTO dto);
 
     /**
      * 更新
      * @param dto
      * @return
      */
-    DataSec update(DataSecDTO dto);
+    FieldSec update(FieldSecDTO dto);
 
     /**
      * 保存
      * @param dto
      * @return
      */
-    DataSec save(DataSecDTO dto);
+    FieldSec save(FieldSecDTO dto);
 
     /**
      * 获取详情
      * @param id
      * @return
      */
-    DataSec getById(String id);
+    FieldSec getById(String id);
 
     /**
      * 根据id删除
@@ -56,14 +56,14 @@ public interface IDataSecService {
      * @param secCode
      * @return
      */
-    DataSecDTO detailByCode(String secCode);
+    FieldSecDTO detailByCode(String secCode);
 
     /**
      * 分页查询数据安全等级
      * @param searchDTO
      * @return
      */
-    Page<DataSecDTO> pageSearch(SearchDTO searchDTO);
+    Page<FieldSecDTO> pageSearch(SearchDTO searchDTO);
 
     /**
      * 安全等级同步数据保存
@@ -76,18 +76,18 @@ public interface IDataSecService {
      * @param codes
      * @return
      */
-    List<DataSec> getByCodes(List<String> codes);
+    List<FieldSec> getByCodes(List<String> codes);
 
     /**
      * 获取所有数据
      * @return
      */
-    List<DataSec> getAll();
+    List<FieldSec> getAll();
 
     /**
      * 批量获取
      * @param ids
      * @return
      */
-    List<DataSec> getByIds(List<String> ids);
+    List<FieldSec> getByIds(List<String> ids);
 }

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

@@ -1,19 +1,18 @@
 package com.dragoninfo.dcuc.app.service.sub.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragoninfo.dcuc.app.entity.sub.AppDataItemInfo;
 import com.dragoninfo.dcuc.app.mapper.sub.AppDataItemInfoMapper;
 import com.dragoninfo.dcuc.app.service.sub.IAppDataItemInfoService;
-import com.dragoninfo.dcuc.app.service.sub.IAppDataResourceInfoService;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -69,4 +68,17 @@ public class AppDataItemInfoServiceImpl implements IAppDataItemInfoService {
         lambdaQueryWrapper.eq(AppDataItemInfo::getResourceTableId, tableId);
         return appDataItemInfoMapper.selectList(lambdaQueryWrapper);
     }
+
+    @Override
+    public List<AppDataItemInfo> getHasClassifyColInfos() {
+        LambdaQueryWrapper<AppDataItemInfo> query = Wrappers.lambdaQuery();
+        query.select(AppDataItemInfo::getId, AppDataItemInfo::getColumnName, AppDataItemInfo::getResourceTableId,
+                AppDataItemInfo::getColumnClassify, AppDataItemInfo::getDataSecurityLevel);
+        query.isNotNull(AppDataItemInfo::getColumnClassify);
+        List<AppDataItemInfo> appDataItemInfos = appDataItemInfoMapper.selectList(query);
+        return appDataItemInfos
+                .stream()
+                .filter(e -> StringUtils.isNotEmpty(e.getColumnClassify()))
+                .collect(Collectors.toList());
+    }
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragoninfo.dcuc.app.entity.sub.AppDataResourceInfo;
 import com.dragoninfo.dcuc.app.mapper.sub.AppDataResourceInfoMapper;
 import com.dragoninfo.dcuc.app.service.sub.IAppDataResourceInfoService;
+import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -50,6 +52,32 @@ public class AppDataResourceInfoServiceImpl implements IAppDataResourceInfoServi
         }
     }
 
+    @Override
+    public List<AppDataResourceInfo> getAllTabInfos() {
+        LambdaQueryWrapper<AppDataResourceInfo> query = Wrappers.lambdaQuery();
+        query.select(AppDataResourceInfo::getId, AppDataResourceInfo::getTableName, AppDataResourceInfo::getDataObjectId,
+                AppDataResourceInfo::getDataClassification, AppDataResourceInfo::getDataClassifyOneCode,
+                AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
+                AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
+                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
+        return appDataResourceInfoMapper.selectList(query);
+    }
+
+    @Override
+    public List<AppDataResourceInfo> getHasClassifyTables() {
+        LambdaQueryWrapper<AppDataResourceInfo> query = Wrappers.lambdaQuery();
+        query.select(AppDataResourceInfo::getId, AppDataResourceInfo::getTableName, AppDataResourceInfo::getDataObjectId,
+                AppDataResourceInfo::getDataClassification, AppDataResourceInfo::getDataClassifyOneCode,
+                AppDataResourceInfo::getDataClassifyTwoCode, AppDataResourceInfo::getDataLabelOneCode,
+                AppDataResourceInfo::getDataLabelTwoCode, AppDataResourceInfo::getDataLabelThreeCode,
+                AppDataResourceInfo::getDataLabelFourCode, AppDataResourceInfo::getDataLabelFiveCode);
+        query.isNotNull(e -> StringUtils.isNotBlank(e.getDataClassification()));
+        List<AppDataResourceInfo> appDataResourceInfos = appDataResourceInfoMapper.selectList(query);
+        return appDataResourceInfos.stream()
+                .filter(e -> StringUtils.isNotBlank(e.getDataClassification()))
+                .collect(Collectors.toList());
+    }
+
     @Override
     public List<AppDataResourceInfo> searchList(Searchable searchable) {
         return appDataResourceInfoMapper.findBySearchable(searchable);

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

@@ -1,39 +1,24 @@
 package com.dragoninfo.dcuc.app.service.sub.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.dragoninfo.dcuc.app.entity.sub.DataLevel;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
-import com.dragoninfo.dcuc.app.dto.sub.DataSecDTO;
-import com.dragoninfo.dcuc.app.dto.sub.ExcelDataSec;
-import com.dragoninfo.dcuc.app.entity.sub.DataSec;
+import com.dragoninfo.dcuc.app.dto.sub.FieldSecDTO;
+import com.dragoninfo.dcuc.app.entity.sub.FieldSec;
 import com.dragoninfo.dcuc.app.mapper.sub.DataSecMapper;
 import com.dragoninfo.dcuc.app.service.sub.IDataSecService;
-import com.dragoninfo.dcuc.app.util.ImportUtil;
 import com.dragoninfo.dcuc.app.vo.DataLevelVo;
-import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
-import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.base.enums.BooleanEnum;
-import com.dragonsoft.duceap.base.utils.UserContextUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -49,14 +34,14 @@ public class DataSecServiceImpl implements IDataSecService {
     private DataSecMapper dataSecMapper;
 
     @Override
-    public ResponseStatus dataLevelAdd(DataSecDTO dto) {
+    public ResponseStatus dataLevelAdd(FieldSecDTO dto) {
         String id = dto.getId();
         String code = dto.getSecCode();
         dto.setDataType(DataAuthTypeCodeEnum.AUTH_DATA_SEC.value);
         if(StringUtils.isBlank(code)) {
             return ResponseStatus.fail("代码不能为空");
         }
-        DataSec exist = getByCode(code);
+        FieldSec exist = getByCode(code);
         if(StringUtils.isBlank(id)) {
             if(null != exist) {
                 return ResponseStatus.fail("代码已存在");
@@ -73,8 +58,8 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec update(DataSecDTO dto) {
-        DataSec dataSec = dataSecMapper.selectById(dto.getId());
+    public FieldSec update(FieldSecDTO dto) {
+        FieldSec dataSec = dataSecMapper.selectById(dto.getId());
         if (null == dataSec) {
             return null;
         }
@@ -85,8 +70,8 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec save(DataSecDTO dto) {
-        DataSec dataSec = new DataSec();
+    public FieldSec save(FieldSecDTO dto) {
+        FieldSec dataSec = new FieldSec();
         BeanUtils.copyProperties(dto, dataSec);
         dataSec.setCreateTime(new Date());
         dataSec.setDeleted(BooleanEnum.FALSE.value);
@@ -95,7 +80,7 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSec getById(String id) {
+    public FieldSec getById(String id) {
         return dataSecMapper.selectById(id);
     }
 
@@ -105,11 +90,11 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public DataSecDTO detailByCode(String secCode) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().eq(DataSec::getSecCode, secCode);
-        DataSec dataSec = dataSecMapper.selectOne(queryWrapper);
-        DataSecDTO dto = new DataSecDTO();
+    public FieldSecDTO detailByCode(String secCode) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().eq(FieldSec::getSecCode, secCode);
+        FieldSec dataSec = dataSecMapper.selectOne(queryWrapper);
+        FieldSecDTO dto = new FieldSecDTO();
         if (null == dataSec) {
             return dto;
         }
@@ -118,15 +103,15 @@ public class DataSecServiceImpl implements IDataSecService {
     }
 
     @Override
-    public Page<DataSecDTO> pageSearch(SearchDTO searchDTO) {
-        Page<DataSec> dataSecs = dataSecMapper.pagingBySearchable(Searchable.toSearchable(searchDTO));
-        List<DataSec> pageContent = dataSecs.getContent();
-        List<DataSecDTO> collect = pageContent.stream().map(item -> {
-            DataSecDTO dto = new DataSecDTO();
+    public Page<FieldSecDTO> pageSearch(SearchDTO searchDTO) {
+        Page<FieldSec> dataSecs = dataSecMapper.pagingBySearchable(Searchable.toSearchable(searchDTO));
+        List<FieldSec> pageContent = dataSecs.getContent();
+        List<FieldSecDTO> collect = pageContent.stream().map(item -> {
+            FieldSecDTO dto = new FieldSecDTO();
             BeanUtils.copyProperties(item, dto);
             return dto;
         }).collect(Collectors.toList());
-        Page<DataSecDTO> page = new PageImpl<>(collect, dataSecs.getPageable(), dataSecs.getTotalElements());
+        Page<FieldSecDTO> page = new PageImpl<>(collect, dataSecs.getPageable(), dataSecs.getTotalElements());
         return page;
     }
 
@@ -141,7 +126,7 @@ public class DataSecServiceImpl implements IDataSecService {
                 .collect(Collectors.toMap(DataLevelVo::getLevelCode, item -> item, (old, last) -> last));
         List<DataLevelVo> vos = new ArrayList<>(collect.values());
         for (DataLevelVo vo : vos) {
-            DataSec dataSec = new DataSec();
+            FieldSec dataSec = new FieldSec();
             dataSec.setSecCode(vo.getLevelCode());
             dataSec.setSecName(vo.getLevelName());
             dataSec.setDataType(vo.getTypeCode());
@@ -152,29 +137,29 @@ public class DataSecServiceImpl implements IDataSecService {
 
 
     @Override
-    public List<DataSec> getByCodes(List<String> codes) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().in(DataSec::getSecCode, codes);
+    public List<FieldSec> getByCodes(List<String> codes) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(FieldSec::getSecCode, codes);
         return dataSecMapper.selectList(queryWrapper);
     }
 
     @Override
-    public List<DataSec> getAll() {
+    public List<FieldSec> getAll() {
         return dataSecMapper.selectList(null);
     }
 
     @Override
-    public List<DataSec> getByIds(List<String> ids) {
+    public List<FieldSec> getByIds(List<String> ids) {
         if(CollectionUtils.isEmpty(ids)) {
             return new ArrayList<>();
         }
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().in(DataSec::getId, ids);
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().in(FieldSec::getId, ids);
         return dataSecMapper.selectList(queryWrapper);
     }
 
-    private void saveByCode(DataSec dataSec) {
-        DataSec exist = this.getByCode(dataSec.getSecCode());
+    private void saveByCode(FieldSec dataSec) {
+        FieldSec exist = this.getByCode(dataSec.getSecCode());
         if(null == exist) {
             dataSec.setDeleted(BooleanEnum.FALSE.value);
             dataSec.setCreateTime(new Date());
@@ -187,9 +172,9 @@ public class DataSecServiceImpl implements IDataSecService {
         }
     }
 
-    private DataSec getByCode(String secCode) {
-        LambdaQueryWrapper<DataSec> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select().eq(DataSec::getSecCode, secCode);
+    private FieldSec getByCode(String secCode) {
+        LambdaQueryWrapper<FieldSec> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select().eq(FieldSec::getSecCode, secCode);
         return dataSecMapper.selectOne(queryWrapper);
     }
 }

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

@@ -3,7 +3,6 @@ package com.dragoninfo.dcuc.app.service.sub.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.entity.sub.DataSec;
 import com.dragoninfo.dcuc.app.enumresources.DataAuthTypeCodeEnum;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaAcceptDTO;
 import com.dragoninfo.dcuc.app.dto.sub.FieldClaDTO;