diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/TableInfoController.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/TableInfoController.java index 55bd2ac..aea2da0 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/TableInfoController.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/controller/TableInfoController.java @@ -6,16 +6,13 @@ import com.muyu.cloud.etl.service.TableInfoService; import com.muyu.common.core.domain.Result; import com.muyu.domain.Structure; import com.muyu.domain.TableInfo; -import com.muyu.domain.rep.TableInfoRep; import com.muyu.domain.rep.TableInfoResp; -import com.muyu.domain.rep.TableInfoTreeRep; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.List; @RestController @@ -26,27 +23,27 @@ public class TableInfoController { @Autowired private StructureService structureService; - @GetMapping("/findTableInfo") - public Result> findTableInfo() { - List tableInfoList= tableInfoService.findSourceList(); - - List tableInfoTreeReps = new ArrayList(); - - for (TableInfo tableInfo : tableInfoList) { - TableInfoTreeRep tableInfoTreeRep = new TableInfoTreeRep(); - tableInfoTreeRep.setTableInfo(tableInfo); - List tableInfoRepList= tableInfoService.findTablesList(tableInfo.getId()); - tableInfoTreeRep.setChildren(tableInfoRepList); - for (TableInfoRep tableInfoRep : tableInfoRepList) { - List structureList=structureService.findStructureList(tableInfoRep.getId()); - tableInfoRep.setStructureList(structureList); - } - tableInfoTreeReps.add(tableInfoTreeRep); - } - - return Result.success(tableInfoTreeReps); - - } +// @GetMapping("/findTableInfo") +// public Result> findTableInfo() { +// List tableInfoList= tableInfoService.findSourceList(); +// +// List tableInfoTreeReps = new ArrayList(); +// +// for (TableInfo tableInfo : tableInfoList) { +// TableInfoTreeRep tableInfoTreeRep = new TableInfoTreeRep(); +// tableInfoTreeRep.setTableInfo(tableInfo); +// List tableInfoRepList= tableInfoService.findTablesList(tableInfo.getId()); +// tableInfoTreeRep.setChildren(tableInfoRepList); +// for (TableInfoRep tableInfoRep : tableInfoRepList) { +// List structureList=structureService.findStructureList(tableInfoRep.getId()); +// tableInfoRep.setStructureList(structureList); +// } +// tableInfoTreeReps.add(tableInfoTreeRep); +// } +// +// return Result.success(tableInfoTreeReps); +// +// } @GetMapping("/findTableInfoList") public Result findByTableName() { diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/TableInfoService.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/TableInfoService.java index 3d74806..bee1700 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/TableInfoService.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/TableInfoService.java @@ -12,5 +12,5 @@ public interface TableInfoService extends IService { List findSourceList(); - List findTablesList(Long id); +// List findTablesList(Long id); } diff --git a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/TableServiceImpl.java b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/TableServiceImpl.java index 5152101..01d8afc 100644 --- a/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/TableServiceImpl.java +++ b/cloud-etl-server/src/main/java/com/muyu/cloud/etl/service/impl/TableServiceImpl.java @@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.cloud.etl.mapper.TableInfoMapper; import com.muyu.cloud.etl.service.TableInfoService; import com.muyu.domain.TableInfo; -import com.muyu.domain.rep.TableInfoRep; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; @Service @@ -38,18 +36,18 @@ public class TableServiceImpl extends ServiceImpl im return tableInfoList; } - @Override - public List findTablesList(Long id) { - List tableInfoList = tableInfoMapper.selectList(new LambdaQueryWrapper(TableInfo.class).eq( - TableInfo::getParentId, id - )); - - List tableInfoRepList = new ArrayList<>(); - for (TableInfo tableInfo : tableInfoList) { - TableInfoRep tableInfoRep = TableInfo.tableInfoRep(tableInfo); - tableInfoRepList.add(tableInfoRep); - } - - return tableInfoRepList; - } +// @Override +// public List findTablesList(Long id) { +// List tableInfoList = tableInfoMapper.selectList(new LambdaQueryWrapper(TableInfo.class).eq( +// TableInfo::getParentId, id +// )); +// +// List tableInfoRepList = new ArrayList<>(); +// for (TableInfo tableInfo : tableInfoList) { +// TableInfoRep tableInfoRep = TableInfo.tableInfoRep(tableInfo); +// tableInfoRepList.add(tableInfoRep); +// } +// +// return tableInfoRepList; +// } }