diff --git a/muyu-quest-common/pom.xml b/muyu-quest-common/pom.xml index d6bfd56..0a0f3ea 100644 --- a/muyu-quest-common/pom.xml +++ b/muyu-quest-common/pom.xml @@ -22,5 +22,10 @@ com.muyu cloud-common-core + + + com.muyu + muyu-quest-remote + diff --git a/muyu-quest-remote/pom.xml b/muyu-quest-remote/pom.xml index a2bdf38..bed8415 100644 --- a/muyu-quest-remote/pom.xml +++ b/muyu-quest-remote/pom.xml @@ -20,7 +20,8 @@ com.muyu - muyu-quest-common + muyu-source-server + 3.6.5 diff --git a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java index 64c5fcc..5087931 100644 --- a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java +++ b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/RemoteDataSourceService.java @@ -1,18 +1,26 @@ -//package com.muyu.source.remote; -// -//import com.muyu.source.remote.factory.RemoteDataSourceFactory; -//import org.springframework.cloud.openfeign.FeignClient; -//import com.muyu.common.core.constant.ServiceNameConstants; -// -///** -// * @ Tool:IntelliJ IDEA -// * @ Author:CHX -// * @ Date:2024-08-21-10:50 -// * @ Version:1.0 -// * @ Description:数据源远程调用 -// * @author Lenovo -// */ -//@FeignClient(contextId = "RemoteDataSourceService",value = ServiceNameConstants.SOURCE_SERVICE,fallbackFactory = RemoteDataSourceFactory.class, path = "/dataSource") -//public interface RemoteDataSourceService { -// -//} +package com.muyu.quest.remote; + +import com.muyu.common.core.domain.Result; +import com.muyu.quest.remote.factory.RemoteDataSourceFactory; +import org.springframework.cloud.openfeign.FeignClient; +import com.muyu.common.core.constant.ServiceNameConstants; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @ Tool:IntelliJ IDEA + * @ Author:CHX + * @ Date:2024-08-21-10:50 + * @ Version:1.0 + * @ Description:数据源远程调用 + * @author Lenovo + */ +@FeignClient(contextId = "RemoteDataSourceService", + value = ServiceNameConstants.SOURCE_SERVICE, + fallbackFactory = RemoteDataSourceFactory.class, + path = "/source") +public interface RemoteDataSourceService { + + @PostMapping("/value/findTableValue") + public Result findTableValue(@RequestParam("basicId") Long basicId, @RequestParam("sql") String sql); +} diff --git a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/factory/RemoteDataSourceFactory.java b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/factory/RemoteDataSourceFactory.java index 8ee072a..8c6c4f2 100644 --- a/muyu-quest-remote/src/main/java/com/muyu/quest/remote/factory/RemoteDataSourceFactory.java +++ b/muyu-quest-remote/src/main/java/com/muyu/quest/remote/factory/RemoteDataSourceFactory.java @@ -1,19 +1,25 @@ -//package com.muyu.source.remote.factory; -// -//import com.muyu.source.remote.RemoteDataSourceService; -//import org.springframework.cloud.openfeign.FallbackFactory; -// -///** -// * @ Tool:IntelliJ IDEA -// * @ Author:CHX -// * @ Date:2024-08-21-10:54 -// * @ Version:1.0 -// * @ Description: -// * @author Lenovo -// */ -//public class RemoteDataSourceFactory implements FallbackFactory { -// @Override -// public RemoteDataSourceService create(Throwable cause) { -// return null; -// } -//} +package com.muyu.quest.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.quest.remote.RemoteDataSourceService; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * @ Tool:IntelliJ IDEA + * @ Author:CHX + * @ Date:2024-08-21-10:54 + * @ Version:1.0 + * @ Description: + * @author Lenovo + */ +public class RemoteDataSourceFactory implements FallbackFactory { + @Override + public RemoteDataSourceService create(Throwable cause) { + return new RemoteDataSourceService() { + @Override + public Result findTableValue(Long basicId, String sql) { + return Result.error("数据接入模块连接失败,网络异常..."); + } + }; + } +} diff --git a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java index 9c923ac..46075e8 100644 --- a/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java +++ b/muyu-quest-server/src/main/java/com/muyu/quest/controller/TaskController.java @@ -33,7 +33,7 @@ import com.muyu.common.core.web.page.TableDataInfo; * @date 2024-08-22 */ @RestController -@RequestMapping("/quest") +@RequestMapping("/task") public class TaskController extends BaseController { @Resource