diff --git a/cloud-task-server/pom.xml b/cloud-task-server/pom.xml index f3fd7b8..09decef 100644 --- a/cloud-task-server/pom.xml +++ b/cloud-task-server/pom.xml @@ -19,11 +19,7 @@ - - com.muyu - cloud-rule-server - 1.0.0 - + com.alibaba.cloud @@ -105,7 +101,6 @@ cloud-datasources-common - diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java index 33cdeff..b217365 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java @@ -1,11 +1,5 @@ package com.muyu.task.server.service.impl; -import com.muyu.common.domian.*; -import com.muyu.common.domian.basic.abstracts.DataTaskAbstracts; -import com.muyu.remote.feign.RuleFeign; -import com.muyu.rule.common.domain.RuleEngineVersion; -import com.muyu.task.server.service.*; -import com.muyu.task.server.thread.OptimizedPrioritizedThreadPool; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,11 +7,17 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.domain.DataValue; +import com.muyu.common.domian.*; +import com.muyu.common.domian.basic.abstracts.DataTaskAbstracts; import com.muyu.common.domian.enums.Weight; import com.muyu.common.domian.req.TaskInfoListReq; import com.muyu.common.domian.resp.TaskInfoResp; import com.muyu.remote.feign.DatasourceFeign; +import com.muyu.remote.feign.RuleFeign; +import com.muyu.rule.common.domain.RuleEngineVersion; import com.muyu.task.server.mapper.TaskInfoMapper; +import com.muyu.task.server.service.*; +import com.muyu.task.server.thread.OptimizedPrioritizedThreadPool; import lombok.extern.log4j.Log4j2; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -370,7 +370,6 @@ public class TaskInfoServiceImpl extends ServiceImpl i - private void executeTheRule(DataValue[][] dataValues, HashMap map, Long newBasicId, Long tableId, Long taskId) { // 创建一个单线程的ExecutorService