修改数据目录树形接口

data-collect-server/src/main/java/com/zq/datacollect/entity/QueryDb.java

@@ -60,4 +60,9 @@ public class QueryDb {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    /**
+     *  所属领域id
+     */
+    private String categoryId;
 }

data-collect-server/src/main/java/com/zq/datacollect/service/impl/DataSourceServiceImpl.java

 package com.zq.datacollect.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.zq.datacollect.entity.QueryDb;
 import com.zq.datacollect.holder.DatabaseHolder;
 import com.zq.datacollect.service.DataSourceService;
@@ -10,12 +11,15 @@ public class DataSourceServiceImpl implements DataSourceService {
 
     @Override
     public void add(QueryDb queryDb) {
+        queryDb.setCreateTime(DateUtil.date());
+        queryDb.setUpdateTime(DateUtil.date());
         DatabaseHolder.add(queryDb);
     }
 
     @Override
     public void update(QueryDb queryDb) {
         DatabaseHolder.remove(queryDb.getId());
+        queryDb.setCategoryId(queryDb.getCategoryId());
         DatabaseHolder.add(queryDb);
     }
 
@@ -23,4 +27,4 @@ public class DataSourceServiceImpl implements DataSourceService {
     public void delete(Integer id) {
         DatabaseHolder.remove(id);
     }
-}
\ No newline at end of file
+}

dataoperation-server/src/main/java/com/zq/dataoperation/controller/CommonQueryController.java

@@ -60,6 +60,7 @@ public class CommonQueryController {
         AssertUtils.notNull(queryDb.getDbType(), "缺少数据库类型");
         AssertUtils.hasText(queryDb.getUsername(), "缺少连接用户名");
         AssertUtils.hasText(queryDb.getPassword(), "缺少连接密码");
+        AssertUtils.hasText(queryDb.getCategoryId(),"缺少上级目录id");
         commonQueryService.updateDatasource(queryDb);
         return ResultVo.success("操作成功！");
     }

dataoperation-server/src/main/java/com/zq/dataoperation/controller/DataCleanController.java

@@ -9,7 +9,6 @@ import com.zq.dataoperation.dao.MetaDataDao;
 import com.zq.dataoperation.entity.DataCleanExpressCategory;
 import com.zq.dataoperation.entity.DataCleanRecord;
 import com.zq.dataoperation.entity.DataCleanRule;
-import com.zq.dataoperation.service.CommonQueryService;
 import com.zq.dataoperation.service.DataCleanRecordService;
 import com.zq.dataoperation.service.DataCleanRuleService;
 import com.zq.dataoperation.service.DataCleanService;

dataoperation-server/src/main/java/com/zq/dataoperation/dao/QueryDbDao.java

@@ -3,5 +3,8 @@ package com.zq.dataoperation.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zq.dataoperation.entity.QueryDb;
 
+import java.util.List;
+
 public interface QueryDbDao extends BaseMapper<QueryDb> {
-}
\ No newline at end of file
+    List<QueryDb> selectDataList();
+}

dataoperation-server/src/main/java/com/zq/dataoperation/entity/MetaData.java

@@ -67,7 +67,7 @@ public class MetaData {
     /**
      *  所属领域id
      */
-    private Long categoryId;
+    private String categoryId;
 
     /**
      *  是否复合元数据0否1是

dataoperation-server/src/main/java/com/zq/dataoperation/entity/QueryDb.java

 package com.zq.dataoperation.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -57,6 +58,17 @@ public class QueryDb {
     private Integer useType;
 
     /**
+     *  所属领域id
+     */
+    private String categoryId;
+
+    /**
+     * 目录分类名称
+     */
+    @ApiModelProperty("目录分类名称")
+    private String groupName;
+
+    /**
      *  createTime
      */
     @TableField(fill = FieldFill.INSERT)

dataoperation-server/src/main/java/com/zq/dataoperation/runner/DatabaseRunner.java

@@ -3,6 +3,7 @@ package com.zq.dataoperation.runner;
 import com.zq.dataoperation.entity.QueryDb;
 import com.zq.dataoperation.holder.DatabaseHolder;
 import com.zq.dataoperation.service.CommonQueryService;
+import com.zq.dataoperation.vo.QueryDbVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -28,4 +29,4 @@ public class DatabaseRunner implements ApplicationRunner {
         }
         log.info("成功加载数据库：{}个", datasource.size());
     }
-}
\ No newline at end of file
+}

dataoperation-server/src/main/java/com/zq/dataoperation/service/CommonQueryService.java

@@ -3,7 +3,6 @@ package com.zq.dataoperation.service;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zq.common.context.ThreadContext;
 import com.zq.common.exception.BusinessException;
@@ -50,7 +49,7 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
     private static final Logger log = LoggerFactory.getLogger(ThreadContext.class);
 
     public List<QueryDb> getDatasource() {
-        return queryDbDao.selectList(new QueryWrapper<>());
+        return queryDbDao.selectDataList();
     }
 
     public ResultVo addDatasource(QueryDb queryDb) {
@@ -77,7 +76,11 @@ public class CommonQueryService extends ServiceImpl<CommonQuerySettingDao, Commo
         AssertUtils.isTrue(queryDbService.updateById(queryDb), "操作失败！");
         DatabaseHolder.remove(queryDb.getId());
         DatabaseHolder.add(queryDb.getDbType(), queryDb.getDbIp(), queryDb.getDbPort(), queryDb.getDbName(), queryDb.getUsername(), queryDb.getPassword(), queryDb.getId());
-        dataCollectFeign.update(queryDb);
+        queryDb.setCategoryId(queryDb.getCategoryId());
+        int update = queryDbDao.updateById(queryDb);
+//        if (update>0) {
+//            dataCollectFeign.update(queryDb);
+//        }
     }
 
     @Transactional

dataoperation-server/src/main/java/com/zq/dataoperation/vo/QueryDbVo.java

+package com.zq.dataoperation.vo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class QueryDbVo {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 数据库名称
+     */
+    private String dbName;
+
+    /**
+     * 数据库中文名称
+     */
+    private String chDbName;
+
+    /**
+     * 数据库ip
+     */
+    private String dbIp;
+
+    /**
+     * 数据库端口
+     */
+    private Integer dbPort;
+
+    /**
+     * 数据库用户名
+     */
+    private String username;
+
+    /**
+     * 数据库密码
+     */
+    private String password;
+
+    /**
+     * 数据库类型（1.Mysql 2.oracle 3.MSSQL ）
+     */
+    private Integer dbType;
+
+    private Integer useType;
+
+    /**
+     *  所属领域id
+     */
+    private String categoryId;
+
+    /**
+     * 目录分类名称
+     */
+    @ApiModelProperty("目录分类名称")
+    private String groupName;
+
+
+    /**
+     *  createTime
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     *  updateTime
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}

dataoperation-server/src/main/resources/mapper/QueryDbMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zq.dataoperation.dao.QueryDbDao">
+
+
+    <select id="selectDataList" resultType="com.zq.dataoperation.entity.QueryDb">
+        SELECT
+            t.*,
+            h.GROUP_NAME
+        FROM
+            query_db t
+                LEFT JOIN DATA_CATEGORY_GROUP h ON t.category_id = h.ID
+    </select>
+</mapper>

spider-flow-web/src/main/java/com/zq/spiderflow/dao/DataCategoryGroupDao.java

@@ -2,8 +2,11 @@ package com.zq.spiderflow.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zq.spiderflow.entity.DataCategoryGroup;
+import com.zq.spiderflow.vo.DataCategoryGroupFindVo;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
  * 资源目录分类(DataCategoryGroup)表数据库访问层
  *
@@ -13,4 +16,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface DataCategoryGroupDao extends BaseMapper<DataCategoryGroup> {
 
+    List<DataCategoryGroupFindVo> selectCategoryList();
 }

spider-flow-web/src/main/java/com/zq/spiderflow/entity/MetaData.java

@@ -67,7 +67,7 @@ public class MetaData {
     /**
      *  所属领域id
      */
-    private Long categoryId;
+    private String categoryId;
 
     /**
      *  是否复合元数据0否1是

spider-flow-web/src/main/java/com/zq/spiderflow/service/CategoryInterfaceService.java

@@ -11,9 +11,11 @@ import com.zq.common.vo.PageVo;
 import com.zq.spiderflow.constant.ShareApiEnum;
 import com.zq.spiderflow.dao.CategoryInterfaceDao;
 import com.zq.spiderflow.dao.DataCategoryDao;
+import com.zq.spiderflow.dao.DataCategoryGroupDao;
 import com.zq.spiderflow.dao.InterfaceAttachDao;
 import com.zq.spiderflow.entity.CategoryInterface;
 import com.zq.spiderflow.entity.DataCategory;
+import com.zq.spiderflow.entity.DataCategoryGroup;
 import com.zq.spiderflow.entity.InterfaceAttach;
 import com.zq.spiderflow.util.ShareApiUtils;
 import com.zq.spiderflow.vo.CategoryInterfaceFindVo;
@@ -35,6 +37,7 @@ public class CategoryInterfaceService {
     private final CategoryInterfaceDao categoryInterfaceDao;
     private final InterfaceAttachDao interfaceAttachDao;
     private final DataCategoryDao dataCategoryDao;
+    private final DataCategoryGroupDao dataCategoryGroupDao;
 //    private final OrgDeptDao orgDeptDao;
 
     public PageVo<CategoryInterface> getCategoryInterfaceList(CategoryInterfaceFindVo vo) {
@@ -59,8 +62,8 @@ public class CategoryInterfaceService {
 
         PageVo<CategoryInterface> paging = PagingUtils.paging(vo, categoryInterfaceDao, lambdaQuery,CategoryInterface.class);
         paging.getRows().forEach(categoryInterface -> {
-            DataCategory dataCategory = dataCategoryDao.selectById(categoryInterface.getCategoryId());
-            categoryInterface.setCategoryName(dataCategory.getCataTitle());
+            DataCategoryGroup dataCategoryGroup = dataCategoryGroupDao.selectById(categoryInterface.getCategoryId());
+            categoryInterface.setCategoryName(dataCategoryGroup.getGroupName());
         });
         return paging;
     }
@@ -185,7 +188,7 @@ public class CategoryInterfaceService {
     }
 
     public void deleteCategoryInterfaceInfo(String interfaceId) {
-        cancelCategoryInterface(CollUtil.newHashSet(interfaceId), "删除接口");
+//        cancelCategoryInterface(CollUtil.newHashSet(interfaceId), "删除接口");
         categoryInterfaceDao.deleteById(interfaceId);
         interfaceAttachDao.delete(Wrappers.lambdaUpdate(InterfaceAttach.builder().businessId(interfaceId).build()));
     }

spider-flow-web/src/main/java/com/zq/spiderflow/service/CategoryService.java

@@ -243,11 +243,13 @@ public class CategoryService {
     }
 
     public Object getCategoryGroupTree() {
-        List<DataCategoryGroup> categoryGroupList = dataCategoryGroupDao.selectList(null);
+        List<DataCategoryGroupFindVo> categoryGroupList = dataCategoryGroupDao.selectCategoryList();
         List<DataTreeVo> collect = categoryGroupList.stream().map(categoryGroup -> DataTreeVo.builder()
                 .value(String.valueOf(categoryGroup.getId()))
                 .parentId(categoryGroup.getParentId())
                 .label(categoryGroup.getGroupName())
+                .queryDbId(categoryGroup.getQueryDbId())
+                .dbName(categoryGroup.getDbName())
                 .build()).collect(Collectors.toList());
 
         return TreeUtils.buildTree(collect, null);

spider-flow-web/src/main/java/com/zq/spiderflow/service/MetaDataService.java

@@ -50,7 +50,7 @@ public class MetaDataService extends ServiceImpl<MetaDataDao, MetaData> {
 
     public PageVo<MetaData> getPageByCategoryId(MetaDataReq req) {
         // 获取类别目录id参数
-        Long categoryId = req.getCategoryId();
+        String categoryId = req.getCategoryId();
         // 获取模糊查询的条件
         String metaName = req.getMetaName();
         LambdaQueryWrapper<MetaData> wrapper = new LambdaQueryWrapper<>();
@@ -62,22 +62,6 @@ public class MetaDataService extends ServiceImpl<MetaDataDao, MetaData> {
         }
        return PagingUtils.paging(req,metaDataDao,wrapper,MetaData.class);
 
-//        List<MetaDataVo> pageList = metaDataDao.getPageList(req);
-//        int start = 0;
-//        PageVo<MetaDataVo> pageVo = new PageVo<>();
-//        if (req.getPage() - 1 == 0) {
-//            pageVo.setStart(0);
-//            start = 0;
-//        } else {
-//            pageVo.setStart((req.getPage() - 1) * req.getSize());
-//            start = (req.getPage() - 1) * req.getSize();
-//        }
-//        pageVo.setPage(req.getPage());
-//        pageVo.setSize(req.getSize());
-//        pageVo.setRows(pageList);
-//        pageVo.setTotal(pageList.size());
-//        return pageVo;
-
     }
 
 
@@ -120,7 +104,7 @@ public class MetaDataService extends ServiceImpl<MetaDataDao, MetaData> {
             metaData.setDataCode(dataCode);
             metaData.setCreateTime(DateUtil.date());
             metaData.setDataLevel(dataLevel);
-            metaData.setCategoryId(metaDataCategory.getId());
+            metaData.setCategoryId(metaDataCategory.getId().toString());
             metaData.setMutiMetaFlag(0);
             List<MetaData> list = metaDataDao.selectList(Wrappers.lambdaQuery(MetaData.builder().dataCode(dataCode).build()));
             if (list != null && list.size() > 0) {

spider-flow-web/src/main/java/com/zq/spiderflow/vo/DataCategoryGroupFindVo.java

@@ -56,6 +56,10 @@ public class DataCategoryGroupFindVo extends PageReqVo {
     @ApiModelProperty("目录分类排序编号")
     private Integer orderNum;
 
+    private String queryDbId;
+
+    private String dbName;
+
     /**
      * 创建时间
      */

spider-flow-web/src/main/java/com/zq/spiderflow/vo/DataTreeVo.java

@@ -27,6 +27,10 @@ public class DataTreeVo {
 
     private String label;
 
+    private String dbName;
+
+    private String queryDbId;
+
     @Builder.Default
     private Integer childNum = 0;
 

spider-flow-web/src/main/java/com/zq/spiderflow/vo/MetaDataReq.java

@@ -74,7 +74,7 @@ public class MetaDataReq extends PageReqVo {
     /**
      *  所属领域id
      */
-    private Long categoryId;
+    private String categoryId;
 
     private Long queryDbId;
 

spider-flow-web/src/main/java/com/zq/spiderflow/vo/MetaDataVo.java

@@ -64,7 +64,7 @@ public class MetaDataVo {
     /**
      *  所属领域id
      */
-    private Long categoryId;
+    private String categoryId;
 
     /**
      *  是否复合元数据

spider-flow-web/src/main/resources/mapper/DataCategoryGroupMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zq.spiderflow.dao.DataCategoryGroupDao">
+    <select id="selectCategoryList" resultType="com.zq.spiderflow.vo.DataCategoryGroupFindVo">
+        SELECT t.* , h.id as query_db_id,h.db_name FROM DATA_CATEGORY_GROUP t LEFT JOIN query_db h ON t.ID=h.category_id
+    </select>
+</mapper>