From cb1a25e9d5e35f19897968724d7bca4df911c672 Mon Sep 17 00:00:00 2001 From: slhafzjw Date: Thu, 16 Oct 2025 11:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=20ActiveData=20=EF=BC=8C?= =?UTF-8?q?=E5=85=B6=E9=80=BB=E8=BE=91=E5=9B=9E=E5=BD=92=E8=87=B3=20CacheC?= =?UTF-8?q?ore=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AD=A5=E5=B0=86=E5=AF=B9=20Cac?= =?UTF-8?q?heCore=20=E5=8F=8A=20CoordinateManager=20=E4=B8=AD=E7=9A=84=20c?= =?UTF-8?q?ognation=20=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slhaf/partner/core/cache/CacheCore.java | 29 +++++++----- .../core/cognation/pojo/ActiveData.java | 45 ------------------- 2 files changed, 19 insertions(+), 55 deletions(-) delete mode 100644 Partner-Main/src/main/java/work/slhaf/partner/core/cognation/pojo/ActiveData.java diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cache/CacheCore.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cache/CacheCore.java index f1a316e4..3bb9fd57 100644 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cache/CacheCore.java +++ b/Partner-Main/src/main/java/work/slhaf/partner/core/cache/CacheCore.java @@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityCore; import work.slhaf.partner.api.agent.factory.capability.annotation.CapabilityMethod; import work.slhaf.partner.core.PartnerCore; -import work.slhaf.partner.core.cognation.pojo.ActiveData; import work.slhaf.partner.core.memory.pojo.EvaluatedSlice; import work.slhaf.partner.core.memory.pojo.MemoryResult; import work.slhaf.partner.core.memory.pojo.MemorySlice; @@ -62,7 +61,7 @@ public class CacheCore extends PartnerCore { */ private Set selectedSlices = new HashSet<>(); - private ActiveData activeData = new ActiveData(); + private HashMap> activatedSlices = new HashMap<>(); public CacheCore() throws IOException, ClassNotFoundException { } @@ -85,7 +84,7 @@ public class CacheCore extends PartnerCore { } @CapabilityMethod - public HashMap getDialogMap(){ + public HashMap getDialogMap() { return dialogMap; } @@ -183,38 +182,48 @@ public class CacheCore extends PartnerCore { @CapabilityMethod public void updateActivatedSlices(String userId, List memorySlices) { - activeData.updateActivatedSlices(userId, memorySlices); + activatedSlices.put(userId, memorySlices); log.debug("[CoordinatedManager] 已更新激活切片, userId: {}", userId); } @CapabilityMethod public String getActivatedSlicesStr(String userId) { - return activeData.getActivatedSlicesStr(userId); + if (activatedSlices.containsKey(userId)) { + StringBuilder str = new StringBuilder(); + activatedSlices.get(userId).forEach(slice -> str.append("\n\n").append("[").append(slice.getDate()).append("]\n") + .append(slice.getSummary())); + return str.toString(); + } else { + return null; + } } @CapabilityMethod public HashMap> getActivatedSlices() { - return activeData.getActivatedSlices(); + return activatedSlices; } @CapabilityMethod public void clearActivatedSlices(String userId) { - activeData.clearActivatedSlices(userId); + activatedSlices.remove(userId); } @CapabilityMethod public boolean hasActivatedSlices(String userId) { - return activeData.hasActivatedSlices(userId); + if (!activatedSlices.containsKey(userId)) { + return false; + } + return !activatedSlices.get(userId).isEmpty(); } @CapabilityMethod public int getActivatedSlicesSize(String userId) { - return activeData.getActivatedSlices().get(userId).size(); + return activatedSlices.get(userId).size(); } @CapabilityMethod public List getActivatedSlices(String userId) { - return activeData.getActivatedSlices().get(userId); + return activatedSlices.get(userId); } @Override diff --git a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/pojo/ActiveData.java b/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/pojo/ActiveData.java deleted file mode 100644 index 2bffa94b..00000000 --- a/Partner-Main/src/main/java/work/slhaf/partner/core/cognation/pojo/ActiveData.java +++ /dev/null @@ -1,45 +0,0 @@ -package work.slhaf.partner.core.cognation.pojo; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import work.slhaf.partner.api.common.entity.PersistableObject; -import work.slhaf.partner.core.memory.pojo.EvaluatedSlice; - -import java.io.Serial; -import java.util.HashMap; -import java.util.List; - -@EqualsAndHashCode(callSuper = true) -@Data -public class ActiveData extends PersistableObject { - private HashMap> activatedSlices = new HashMap<>(); - - @Serial - private static final long serialVersionUID = 1L; - - public void updateActivatedSlices(String userId, List memorySlices) { - activatedSlices.put(userId, memorySlices); - } - - public String getActivatedSlicesStr(String userId) { - if (activatedSlices.containsKey(userId)) { - StringBuilder str = new StringBuilder(); - activatedSlices.get(userId).forEach(slice -> str.append("\n\n").append("[").append(slice.getDate()).append("]\n") - .append(slice.getSummary())); - return str.toString(); - } else { - return null; - } - } - - public void clearActivatedSlices(String userId) { - activatedSlices.remove(userId); - } - - public boolean hasActivatedSlices(String userId) { - if (!activatedSlices.containsKey(userId)){ - return false; - } - return !activatedSlices.get(userId).isEmpty(); - } -}