diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java index 69bf78bd..03d4f0c2 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCapability.java @@ -1,24 +1,24 @@ package work.slhaf.partner.core.action; import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; -import work.slhaf.partner.core.action.entity.CacheAdjustData; -import work.slhaf.partner.core.action.entity.MetaActionInfo; +import work.slhaf.partner.core.action.entity.ActionInfo; +import work.slhaf.partner.core.action.entity.cache.CacheAdjustData; import java.util.List; @Capability(value = "action") public interface ActionCapability { - void putPreparedAction(String uuid, MetaActionInfo metaActionInfo); + void putPreparedAction(String uuid, ActionInfo actionInfo); - List popPreparedAction(String userId); + List popPreparedAction(String userId); - List popPendingAction(String userId); + List popPendingAction(String userId); - List listPreparedAction(String userId); + List listPreparedAction(String userId); - List listPendingAction(String userId); + List listPendingAction(String userId); - void putPendingActions(String userId, MetaActionInfo metaActionInfo); + void putPendingActions(String userId, ActionInfo actionInfo); List selectTendencyCache(String input); diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java index 502a3753..8dd95d58 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/ActionCore.java @@ -1,14 +1,14 @@ package work.slhaf.partner.core.action; import lombok.extern.slf4j.Slf4j; -import work.slhaf.partner.api.agent.factory.capability.annotation.Capability; +import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.common.vector.VectorClient; import work.slhaf.partner.core.PartnerCore; -import work.slhaf.partner.core.action.entity.ActionCacheData; -import work.slhaf.partner.core.action.entity.CacheAdjustData; -import work.slhaf.partner.core.action.entity.CacheAdjustMetaData; -import work.slhaf.partner.core.action.entity.MetaActionInfo; +import work.slhaf.partner.core.action.entity.ActionInfo; +import work.slhaf.partner.core.action.entity.cache.ActionCacheData; +import work.slhaf.partner.core.action.entity.cache.CacheAdjustData; +import work.slhaf.partner.core.action.entity.cache.CacheAdjustMetaData; import java.io.IOException; import java.util.ArrayList; @@ -21,19 +21,19 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; @SuppressWarnings("FieldMayBeFinal") -@Capability(value = "action") +@CapabilityCore(value = "action") @Slf4j public class ActionCore extends PartnerCore { /** * 对应本次交互即将执行或将要放置在行动池的预备任务，因此将以本次交互的uuid为键，其起到的作用相当于暂时的模块上下文 */ - private HashMap> preparedActions = new HashMap<>(); + private HashMap> preparedActions = new HashMap<>(); /** * 待确认任务，以userId区分不同用户，因为需要跨请求确认 */ - private HashMap> pendingActions = new HashMap<>(); + private HashMap> pendingActions = new HashMap<>(); /** * 语义缓存与行为倾向映射 @@ -48,44 +48,44 @@ public class ActionCore extends PartnerCore { } @CapabilityMethod - public synchronized void putPendingActions(String userId, MetaActionInfo metaActionInfo) { + public synchronized void putPendingActions(String userId, ActionInfo actionInfo) { pendingActions.computeIfAbsent(userId, k -> { - List temp = new ArrayList<>(); - temp.add(metaActionInfo); + List temp = new ArrayList<>(); + temp.add(actionInfo); return temp; }); } @CapabilityMethod - public synchronized List popPendingAction(String userId) { - List infos = pendingActions.get(userId); + public synchronized List popPendingAction(String userId) { + List infos = pendingActions.get(userId); pendingActions.remove(userId); return infos; } @CapabilityMethod - public synchronized void putPreparedAction(String uuid, MetaActionInfo metaActionInfo) { + public synchronized void putPreparedAction(String uuid, ActionInfo actionInfo) { preparedActions.computeIfAbsent(uuid, k -> { - List temp = new ArrayList<>(); - temp.add(metaActionInfo); + List temp = new ArrayList<>(); + temp.add(actionInfo); return temp; }); } @CapabilityMethod - public synchronized List popPreparedAction(String userId) { - List infos = preparedActions.get(userId); + public synchronized List popPreparedAction(String userId) { + List infos = preparedActions.get(userId); preparedActions.remove(userId); return infos; } @CapabilityMethod - public List listPreparedAction(String userId) { + public List listPreparedAction(String userId) { return preparedActions.get(userId); } @CapabilityMethod - public List listPendingAction(String userId) { + public List listPendingAction(String userId) { return pendingActions.get(userId); } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java deleted file mode 100644 index 4fed2443..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionData.java +++ /dev/null @@ -1,11 +0,0 @@ -package work.slhaf.partner.core.action.entity; - -import lombok.Data; - -@Data -public class ActionData { - private String key; - private String[] array; - private String reason; - private String description; -} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaActionInfo.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionInfo.java similarity index 54% rename from Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaActionInfo.java rename to Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionInfo.java index bc2abe4a..d3a3318d 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaActionInfo.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionInfo.java @@ -2,11 +2,15 @@ package work.slhaf.partner.core.action.entity; import lombok.Data; +import java.util.List; + @Data -public abstract class MetaActionInfo { +public abstract class ActionInfo { protected String uuid; protected String tendency; protected ActionStatus status; - protected ActionData actionData; + protected List actionChain; protected String Result; + protected String reason; + protected String description; } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ImmediateActionInfo.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ImmediateActionInfo.java index f0ba45ff..5e65d871 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ImmediateActionInfo.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ImmediateActionInfo.java @@ -5,5 +5,5 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -public class ImmediateActionInfo extends MetaActionInfo{ +public class ImmediateActionInfo extends ActionInfo { } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java new file mode 100644 index 00000000..bdf2451b --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/MetaAction.java @@ -0,0 +1,26 @@ +package work.slhaf.partner.core.action.entity; + +import lombok.Data; +import org.jetbrains.annotations.NotNull; + +@Data +public class MetaAction implements Comparable { + //行动key + private String key; + //行动参数 + private String[] params; + //行动回应 + private String response; + //执行顺序，升序排列 + private int order; + private boolean io; + + @Override + public int compareTo(@NotNull MetaAction metaAction) { + return this.order - metaAction.order; + } + + private void execute() { + + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ScheduledActionInfo.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ScheduledActionInfo.java index ddf86503..d2f1283b 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ScheduledActionInfo.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ScheduledActionInfo.java @@ -5,7 +5,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) @Data -public class ScheduledActionInfo extends MetaActionInfo { +public class ScheduledActionInfo extends ActionInfo { private ScheduledType type; private String scheduleContent; //如果为周期，则对应cron表达式，如果为一次性，则对应为LocalDateTime字符串 diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionCacheData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/ActionCacheData.java similarity index 99% rename from Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionCacheData.java rename to Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/ActionCacheData.java index caba8198..38deccd7 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/ActionCacheData.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/ActionCacheData.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.action.entity; +package work.slhaf.partner.core.action.entity.cache; import lombok.Data; import work.slhaf.partner.common.vector.VectorClient; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java similarity index 75% rename from Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustData.java rename to Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java index b0289fde..d2fadd26 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustData.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustData.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.action.entity; +package work.slhaf.partner.core.action.entity.cache; import lombok.Data; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustMetaData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java similarity index 73% rename from Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustMetaData.java rename to Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java index 3afed553..04cb8dff 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/CacheAdjustMetaData.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/action/entity/cache/CacheAdjustMetaData.java @@ -1,4 +1,4 @@ -package work.slhaf.partner.core.action.entity; +package work.slhaf.partner.core.action.entity.cache; import lombok.Data; diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java new file mode 100644 index 00000000..8b278967 --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/ActionDispatcher.java @@ -0,0 +1,61 @@ +package work.slhaf.partner.module.modules.action.dispatcher; + +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentModule; +import work.slhaf.partner.api.agent.factory.module.annotation.Init; +import work.slhaf.partner.api.agent.factory.module.annotation.InjectModule; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.core.action.ActionCapability; +import work.slhaf.partner.core.action.entity.ActionInfo; +import work.slhaf.partner.core.action.entity.ImmediateActionInfo; +import work.slhaf.partner.core.action.entity.ScheduledActionInfo; +import work.slhaf.partner.module.common.module.PostRunningModule; +import work.slhaf.partner.module.modules.action.dispatcher.executor.ActionExecutor; +import work.slhaf.partner.module.modules.action.dispatcher.scheduler.ActionScheduler; +import work.slhaf.partner.runtime.interaction.data.context.PartnerRunningFlowContext; + +import java.util.ArrayList; +import java.util.List; + +@AgentModule(name = "action_dispatcher", order = 7) +public class ActionDispatcher extends PostRunningModule { + + @InjectCapability + private ActionCapability actionCapability; + + @InjectModule + private ActionExecutor actionExecutor; + @InjectModule + private ActionScheduler actionScheduler; + + private InteractionThreadPoolExecutor executor; + + @Init + public void init() { + executor = InteractionThreadPoolExecutor.getInstance(); + } + + @Override + public void doExecute(PartnerRunningFlowContext context) { + //只需要处理prepared action，因为pending action在用户确认后也将变为prepared action + //将PLANNING action放入时间轮中，IMMEDIATE action直接进入并发执行流 + //对于将触发的PLANNING action，理想做法是将执行工具做成执行链的形式，模型的自对话流程、是否通知用户都做成与普通工具同等的通用可选能力，避免绑定固定流程 + executor.execute(() -> { + String userId = context.getUserId(); + List preparedActions = actionCapability.popPreparedAction(userId); + //分类成PLANNING和IMMEDIATE两类 + List scheduledActions = new ArrayList<>(); + List immediateActions = new ArrayList<>(); + for (ActionInfo preparedAction : preparedActions) { + if (preparedAction instanceof ScheduledActionInfo actionInfo) { + scheduledActions.add(actionInfo); + } else if (preparedAction instanceof ImmediateActionInfo actionInfo) { + immediateActions.add(actionInfo); + } + } + actionExecutor.execute(immediateActions); + actionScheduler.execute(scheduledActions); + }); + } + +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java new file mode 100644 index 00000000..435b65e7 --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/executor/ActionExecutor.java @@ -0,0 +1,22 @@ +package work.slhaf.partner.module.modules.action.dispatcher.executor; + +import work.slhaf.partner.api.agent.factory.capability.annotation.InjectCapability; +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; +import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningSubModule; +import work.slhaf.partner.core.action.ActionCapability; +import work.slhaf.partner.core.action.entity.ImmediateActionInfo; + +import java.util.List; + +@AgentSubModule +public class ActionExecutor extends AgentRunningSubModule, Void> { + + @InjectCapability + private ActionCapability actionCapability; + + @Override + public Void execute(List immediateActions) { + + return null; + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.java new file mode 100644 index 00000000..3c7d0878 --- /dev/null +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/dispatcher/scheduler/ActionScheduler.java @@ -0,0 +1,16 @@ +package work.slhaf.partner.module.modules.action.dispatcher.scheduler; + +import work.slhaf.partner.api.agent.factory.module.annotation.AgentSubModule; +import work.slhaf.partner.api.agent.runtime.interaction.flow.abstracts.AgentRunningSubModule; +import work.slhaf.partner.core.action.entity.ScheduledActionInfo; + +import java.util.List; + +@AgentSubModule +public class ActionScheduler extends AgentRunningSubModule, Void> { + @Override + public Void execute(List data) { + + return null; + } +} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java index abfbe049..2629ac05 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/ActionPlanner.java @@ -9,7 +9,12 @@ import work.slhaf.partner.api.chat.pojo.Message; import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; import work.slhaf.partner.common.vector.VectorClient; import work.slhaf.partner.core.action.ActionCapability; -import work.slhaf.partner.core.action.entity.*; +import work.slhaf.partner.core.action.entity.ActionInfo; +import work.slhaf.partner.core.action.entity.ActionStatus; +import work.slhaf.partner.core.action.entity.ImmediateActionInfo; +import work.slhaf.partner.core.action.entity.ScheduledActionInfo; +import work.slhaf.partner.core.action.entity.cache.CacheAdjustData; +import work.slhaf.partner.core.action.entity.cache.CacheAdjustMetaData; import work.slhaf.partner.core.cognation.CognationCapability; import work.slhaf.partner.core.memory.MemoryCapability; import work.slhaf.partner.core.perceive.PerceiveCapability; @@ -129,14 +134,14 @@ public class ActionPlanner extends PreRunningModule { } private void setupPendingActionInfo(PartnerRunningFlowContext context, ConfirmerResult result) { - //TODO 需考虑未确认任务的失效或者拒绝时机 + //TODO 需考虑未确认任务的失效或者拒绝时机，在action core中实现 List uuids = result.getUuids(); if (uuids == null) { return; } String contextUuid = context.getUuid(); - List pendingActions = actionCapability.popPendingAction(context.getUserId()); - for (MetaActionInfo actionInfo : pendingActions) { + List pendingActions = actionCapability.popPendingAction(context.getUserId()); + for (ActionInfo actionInfo : pendingActions) { if (uuids.contains(actionInfo.getUuid())) { actionCapability.putPreparedAction(contextUuid, actionInfo); } @@ -146,11 +151,11 @@ public class ActionPlanner extends PreRunningModule { private void setupActionInfo(List evaluatorResults, PartnerRunningFlowContext context) { for (EvaluatorResult evaluatorResult : evaluatorResults) { - MetaActionInfo metaActionInfo = assemblyHelper.buildMetaActionInfo(evaluatorResult); + ActionInfo actionInfo = assemblyHelper.buildMetaActionInfo(evaluatorResult); if (evaluatorResult.isNeedConfirm()) { - actionCapability.putPendingActions(context.getUserId(), metaActionInfo); + actionCapability.putPendingActions(context.getUserId(), actionInfo); } else { - actionCapability.putPreparedAction(context.getUuid(), metaActionInfo); + actionCapability.putPreparedAction(context.getUuid(), actionInfo); } } } @@ -165,7 +170,7 @@ public class ActionPlanner extends PreRunningModule { } private void setupPendingActions(HashMap map, String userId) { - List actionInfos = actionCapability.listPendingAction(userId); + List actionInfos = actionCapability.listPendingAction(userId); if (actionInfos == null || actionInfos.isEmpty()) { map.put("[待确认行动] <待确认行动信息>", "无待确认行动"); return; @@ -176,7 +181,7 @@ public class ActionPlanner extends PreRunningModule { } private void setupPreparedActions(HashMap map, String uuid) { - List actionInfos = actionCapability.listPreparedAction(uuid); + List actionInfos = actionCapability.listPreparedAction(uuid); if (actionInfos == null || actionInfos.isEmpty()) { map.put("[预备行动] <预备行动信息>", "无预备行动"); return; @@ -186,11 +191,10 @@ public class ActionPlanner extends PreRunningModule { } } - private String generateActionStr(MetaActionInfo metaActionInfo) { - ActionData actionData = metaActionInfo.getActionData(); - return "<行动倾向>" + " : " + metaActionInfo.getTendency() + - "<行动原因>" + " : " + actionData.getReason() + - "<工具描述>" + " : " + actionData.getDescription(); + private String generateActionStr(ActionInfo actionInfo) { + return "<行动倾向>" + " : " + actionInfo.getTendency() + + "<行动原因>" + " : " + actionInfo.getReason() + + "<工具描述>" + " : " + actionInfo.getDescription(); } @Override @@ -225,11 +229,11 @@ public class ActionPlanner extends PreRunningModule { return input; } - private MetaActionInfo buildMetaActionInfo(EvaluatorResult evaluatorResult) { + private ActionInfo buildMetaActionInfo(EvaluatorResult evaluatorResult) { return switch (evaluatorResult.getType()) { case PLANNING -> { ScheduledActionInfo actionInfo = new ScheduledActionInfo(); - actionInfo.setActionData(evaluatorResult.getActionData()); + actionInfo.setActionChain(evaluatorResult.getActionChain()); actionInfo.setScheduleContent(evaluatorResult.getScheduleContent()); actionInfo.setStatus(ActionStatus.PREPARE); actionInfo.setUuid(UUID.randomUUID().toString()); @@ -237,7 +241,7 @@ public class ActionPlanner extends PreRunningModule { } case IMMEDIATE -> { ImmediateActionInfo actionInfo = new ImmediateActionInfo(); - actionInfo.setActionData(evaluatorResult.getActionData()); + actionInfo.setActionChain(evaluatorResult.getActionChain()); actionInfo.setStatus(ActionStatus.PREPARE); actionInfo.setUuid(UUID.randomUUID().toString()); yield actionInfo; @@ -248,7 +252,7 @@ public class ActionPlanner extends PreRunningModule { private ConfirmerInput buildConfirmerInput(PartnerRunningFlowContext context) { ConfirmerInput confirmerInput = new ConfirmerInput(); confirmerInput.setInput(context.getInput()); - List pendingActions = actionCapability.listPendingAction(context.getUserId()); + List pendingActions = actionCapability.listPendingAction(context.getUserId()); confirmerInput.setActionInfos(pendingActions); return confirmerInput; } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/entity/ConfirmerInput.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/entity/ConfirmerInput.java index 88fc4a9a..54f0247c 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/entity/ConfirmerInput.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/confirmer/entity/ConfirmerInput.java @@ -2,13 +2,13 @@ package work.slhaf.partner.module.modules.action.planner.confirmer.entity; import lombok.Data; import work.slhaf.partner.api.chat.pojo.Message; -import work.slhaf.partner.core.action.entity.MetaActionInfo; +import work.slhaf.partner.core.action.entity.ActionInfo; import java.util.List; @Data public class ConfirmerInput { private String input; - private List actionInfos; + private List actionInfos; private List recentMessages; } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java index 797edc1b..1f7232b7 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/planner/evaluator/entity/EvaluatorResult.java @@ -1,8 +1,10 @@ package work.slhaf.partner.module.modules.action.planner.evaluator.entity; import lombok.Data; -import work.slhaf.partner.core.action.entity.ActionData; import work.slhaf.partner.core.action.entity.ActionType; +import work.slhaf.partner.core.action.entity.MetaAction; + +import java.util.List; @Data public class EvaluatorResult { @@ -10,6 +12,6 @@ public class EvaluatorResult { private boolean needConfirm; private ActionType type; private String scheduleContent; - private ActionData actionData; + private List actionChain; private String tendency; } diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionDispatcher.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionDispatcher.java deleted file mode 100644 index 7b2c8805..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/ActionDispatcher.java +++ /dev/null @@ -1,4 +0,0 @@ -package work.slhaf.partner.module.modules.action.scheduler; - -public class ActionDispatcher { -} diff --git a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/TaskScheduler.java b/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/TaskScheduler.java deleted file mode 100644 index 72e88c4c..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/module/modules/action/scheduler/TaskScheduler.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.partner.module.modules.action.scheduler; - -/** - * 负责综合前置模块 - */ -public class TaskScheduler { -}