diff --git a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java index 5c1ae14..907642c 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/controller/SchCollectorController.java @@ -14,6 +14,7 @@ import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * 采集器管理 控制器类 @@ -26,6 +27,11 @@ public class SchCollectorController implements SchCollectorApi { @Resource private ISchCollectorService iSchCollectorService; + @Override + public List findAll() { + return iSchCollectorService.findAll(); + } + /** * 按主键查询 * diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java index 7278571..5f43a3d 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/ISchCollectorService.java @@ -9,6 +9,8 @@ import com.docus.server.dto.scheduling.management.schcollector.UpdateSchCollecto import com.docus.server.entity.scheduling.management.SchCollector; import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO; +import java.util.List; + /** * 采集器管理 服务接口 * @@ -65,4 +67,6 @@ public interface ISchCollectorService { SchCollector findByCollectorId(String collectorId); + List findAll(); + } diff --git a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java index 185a7d6..c64c026 100644 --- a/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java +++ b/collector-scheduling-management/src/main/java/com/docus/server/service/impl/SchCollectorServiceImpl.java @@ -27,6 +27,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.Date; +import java.util.List; import java.util.Map; /** @@ -100,6 +101,12 @@ public class SchCollectorServiceImpl implements ISchCollectorService { return iSchCollectorDao.findOneBy("collectorId", collectorId); } + @Override + public List findAll() { + List schCollectors = iSchCollectorDao.findAll(); + return SchCollectorConvert.INSTANCE.convertVO(schCollectors); + } + /** * 新增 * diff --git a/collector-terminal-management/src/main/java/com/docus/server/common/LoadPackageCommandLineRunner.java b/collector-terminal-management/src/main/java/com/docus/server/common/LoadPackageCommandLineRunner.java new file mode 100644 index 0000000..d9c0870 --- /dev/null +++ b/collector-terminal-management/src/main/java/com/docus/server/common/LoadPackageCommandLineRunner.java @@ -0,0 +1,25 @@ +package com.docus.server.common; + +import com.docus.server.api.scheduling.management.SchCollectorApi; +import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO; +import org.springframework.boot.CommandLineRunner; + +import javax.annotation.Resource; +import java.util.List; + +/** + * load collector package and config + */ +public class LoadPackageCommandLineRunner implements CommandLineRunner { + @Resource + private SchCollectorApi schCollectorApi; + + @Override + public void run(String... args) throws Exception { + List schCollectorVOList = schCollectorApi.findAll(); + + + + + } +} diff --git a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java index d74ed03..e3b3f7e 100644 --- a/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java +++ b/docus-client-interface/src/main/java/com/docus/server/api/scheduling.management/SchCollectorApi.java @@ -10,7 +10,15 @@ import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; /** @@ -23,6 +31,14 @@ import org.springframework.web.bind.annotation.*; @FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorApi") @RequestMapping("/sch/collector") public interface SchCollectorApi { + /** + * 按主键查询 + * + * @return 实体 + */ + @ApiOperation("查询全部") + @GetMapping("/find/all") + List findAll(); /** * 按主键查询