diff --git a/cloud-task-common/pom.xml b/cloud-task-common/pom.xml index ec7a32c..c0d7c82 100644 --- a/cloud-task-common/pom.xml +++ b/cloud-task-common/pom.xml @@ -33,15 +33,16 @@ com.muyu cloud-etl-common - 1.0.0 + 1.0.1 com.muyu - cloud-etl-common - 1.0.1 + cloud-common-etl + 1.0.0 + diff --git a/cloud-task-remote/pom.xml b/cloud-task-remote/pom.xml index a4acd05..66d9b7d 100644 --- a/cloud-task-remote/pom.xml +++ b/cloud-task-remote/pom.xml @@ -23,6 +23,13 @@ cloud-task-common 1.0.0 + + + com.muyu + cloud-common-etl + 1.0.0 + compile + diff --git a/cloud-task-server/pom.xml b/cloud-task-server/pom.xml index bc8bd19..ffd9903 100644 --- a/cloud-task-server/pom.xml +++ b/cloud-task-server/pom.xml @@ -78,6 +78,18 @@ 1.0.0 + + com.muyu + cloud-etl-client + 1.0.0 + + + + com.muyu + cloud-common-etl + 1.0.0 + + @@ -86,6 +98,36 @@ cloud-common-xxl 3.6.3 + + com.muyu + cloud-etl-common + 1.0.1 + compile + + + com.muyu + cloud-etl-common + 1.0.1 + compile + + + com.muyu + cloud-etl-common + 1.0.1 + compile + + + com.muyu + cloud-etl-common + 1.0.1 + compile + + + com.muyu + cloud-etl-common + 1.0.1 + compile + diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java index 7943264..a4d2214 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -7,6 +7,8 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.*; import com.muyu.domain.req.TaskInfoReq; import com.muyu.mapper.TaskMapper; +import com.muyu.mysql.MySqlDataSource; +import com.muyu.mysql.MySqlQuery; import com.muyu.service.*; import com.muyu.task.PriorityThreadPool; import com.muyu.task.feign.DataValueClient; @@ -251,8 +253,8 @@ public class TaskServiceImpl extends ServiceImpl implement return "success"; } -// @Resource -// private Mysql mySqlDataSource; + @Resource + private MySqlDataSource mySqlDataSource; @NotNull private void selectAndAdd(Long databaseId, Long basicId, String sql, Long tableId, @@ -261,11 +263,14 @@ public class TaskServiceImpl extends ServiceImpl implement log.info("sql{}", sql); log.info("数组为{},,{}", finalFirstArray, two); log.info("开始远调"); -// mySqlDataSource.setQuery(MySqlQuery.builder().dataSourceId(databaseId).sql(sql).one(finalFirstArray).two(two).build()); -// com.muyu.access.data.base.DataValue[][] rows = mySqlDataSource.getRows(); - Result result = dataValueClient.findTableValueToArray(databaseId, sql, finalFirstArray, two); + mySqlDataSource.setQuery(MySqlQuery.builder().dataSourceId(databaseId).sql(sql).one(finalFirstArray).two(two).build()); + Object query = mySqlDataSource.getQuery(); + log.info("aaaaa",query); + DataValue[][] dataValues = mySqlDataSource.getRows(); + log.info("okl"); +// Result result = dataValueClient.findTableValueToArray(databaseId, sql, finalFirstArray, two); log.info("调用完毕拿到值"); - DataValue[][] dataValues = result.getData(); +// DataValue[][] dataValues = result.getData(); System.out.println("aaa" + dataValues.length); System.out.println("aaa" + dataValues.length); System.out.println("aaa" + dataValues.length);