Merge branch 'task/1004454' into 'release'

Task/1004454

See merge request !8

pom.xml

@@ -151,7 +151,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>3.7.7</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

src/main/java/cn/com/poc/agent_application/convert/AgentApplicationInfoConvert.java

 package cn.com.poc.agent_application.convert;
 
-import cn.com.poc.agent_application.domain.AgentApplicationBaseInfo;
-import cn.com.poc.agent_application.domain.AgentApplicationCommConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationCommModelConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationKnowledgeConfig;
+import cn.com.poc.agent_application.domain.*;
 import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
 import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity;
 import cn.com.poc.agent_application.entity.Variable;
+import cn.com.poc.agent_application.entity.VoiceConfig;
 import cn.com.poc.agent_application.model.BizAgentApplicationInfoModel;
 import cn.com.poc.agent_application.query.AgentApplicationInfoQueryItem;
 import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
+import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.com.poc.expose.dto.SearchAgentApplicationDto;
 import cn.hutool.core.util.ObjectUtil;
@@ -72,6 +71,10 @@ public class AgentApplicationInfoConvert {
         if (StringUtils.isNotBlank(model.getUnitIds())) {
             entity.setUnitIds(JsonUtils.deSerialize(model.getUnitIds(), String[].class));
         }
+        if (StringUtils.isNotBlank(model.getVoiceConfig())) {
+            VoiceConfig voiceConfig = JsonUtils.deSerialize(model.getVoiceConfig(), VoiceConfig.class);
+            entity.setVoiceConfig(voiceConfig);
+        }
         entity.setIsDeleted(model.getIsDeleted());
         entity.setCreator(model.getCreator());
         entity.setCreatedTime(model.getCreatedTime());
@@ -114,6 +117,9 @@ public class AgentApplicationInfoConvert {
         if (ArrayUtils.isNotEmpty(entity.getUnitIds())) {
             model.setUnitIds(JsonUtil.toJson(entity.getUnitIds()));
         }
+        if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) {
+            model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig()));
+        }
         model.setIsDeleted(entity.getIsDeleted());
         model.setCreator(entity.getCreator());
         model.setCreatedTime(entity.getCreatedTime());
@@ -154,11 +160,21 @@ public class AgentApplicationInfoConvert {
         commModelConfig.setTemperature(entity.getTemperature());
         commModelConfig.setCommunicationTurn(entity.getCommunicationTurn());
 
+        AgentApplicationVoiceConfig voiceConfig = new AgentApplicationVoiceConfig();
+        if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) {
+            voiceConfig.setDefaultOpen(entity.getVoiceConfig().getDefaultOpen());
+            voiceConfig.setTimbreId(entity.getVoiceConfig().getTimbreId());
+        } else {
+            voiceConfig.setDefaultOpen(CommonConstant.YOrN.N);
+            voiceConfig.setTimbreId(StringUtils.EMPTY);
+        }
+
         AgentApplicationInfoDto dto = new AgentApplicationInfoDto();
         dto.setBaseInfo(baseInfo);
         dto.setCommConfig(commConfig);
         dto.setKnowledgeConfig(knowledgeConfig);
         dto.setCommModelConfig(commModelConfig);
+        dto.setVoiceConfig(voiceConfig);
         dto.setUnitIds(entity.getUnitIds());
         dto.setCreator(entity.getCreator());
         dto.setCreatedTime(entity.getCreatedTime());
@@ -204,6 +220,16 @@ public class AgentApplicationInfoConvert {
             entity.setCommunicationTurn(dto.getCommModelConfig().getCommunicationTurn());
         }
 
+        VoiceConfig voiceConfig = new VoiceConfig();
+        if (ObjectUtil.isNotEmpty(dto.getVoiceConfig())) {
+            voiceConfig.setDefaultOpen(dto.getVoiceConfig().getDefaultOpen());
+            voiceConfig.setTimbreId(dto.getVoiceConfig().getTimbreId());
+        } else {
+            voiceConfig.setDefaultOpen(CommonConstant.YOrN.N);
+            voiceConfig.setTimbreId(StringUtils.EMPTY);
+        }
+        entity.setVoiceConfig(voiceConfig);
+
         entity.setUnitIds(dto.getUnitIds());
         entity.setCreator(dto.getCreator());
         entity.setCreatedTime(dto.getCreatedTime());
@@ -248,6 +274,9 @@ public class AgentApplicationInfoConvert {
         if (StringUtils.isNotBlank(infoQueryItem.getUnitIds())) {
             entity.setUnitIds(JsonUtils.deSerialize(infoQueryItem.getUnitIds(), String[].class));
         }
+        if (StringUtils.isNotBlank(infoQueryItem.getVoiceConfig())) {
+            entity.setVoiceConfig(JsonUtils.deSerialize(infoQueryItem.getVoiceConfig(), VoiceConfig.class));
+        }
         entity.setIsDeleted(infoQueryItem.getIsDeleted());
         entity.setCreator(infoQueryItem.getCreator());
         entity.setCreatedTime(infoQueryItem.getCreatedTime());

src/main/java/cn/com/poc/agent_application/convert/BizAgentApplicationPublishConvert.java

 package cn.com.poc.agent_application.convert;
 
-import cn.com.poc.agent_application.domain.AgentApplicationBaseInfo;
-import cn.com.poc.agent_application.domain.AgentApplicationCommConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationCommModelConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationKnowledgeConfig;
+import cn.com.poc.agent_application.domain.*;
 import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.entity.Variable;
+import cn.com.poc.agent_application.entity.VoiceConfig;
 import cn.com.poc.agent_application.model.BizAgentApplicationPublishModel;
+import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -58,6 +57,10 @@ public class BizAgentApplicationPublishConvert {
         if (StringUtils.isNotBlank(model.getUnitIds())) {
             entity.setUnitIds(JsonUtils.deSerialize(model.getUnitIds(), String[].class));
         }
+        if (StringUtils.isNotBlank(model.getVoiceConfig())) {
+            VoiceConfig voiceConfig = JsonUtils.deSerialize(model.getVoiceConfig(), VoiceConfig.class);
+            entity.setVoiceConfig(voiceConfig);
+        }
         entity.setIsDeleted(model.getIsDeleted());
         entity.setCreator(model.getCreator());
         entity.setCreatedTime(model.getCreatedTime());
@@ -97,6 +100,10 @@ public class BizAgentApplicationPublishConvert {
         if (ArrayUtils.isNotEmpty(entity.getUnitIds())) {
             model.setUnitIds(JsonUtil.toJson(entity.getUnitIds()));
         }
+        if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) {
+            model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig()));
+        }
+
         model.setIsDeleted(entity.getIsDeleted());
         model.setCreator(entity.getCreator());
         model.setCreatedTime(entity.getCreatedTime());
@@ -136,10 +143,21 @@ public class BizAgentApplicationPublishConvert {
         commModelConfig.setTemperature(entity.getTemperature());
         commModelConfig.setCommunicationTurn(entity.getCommunicationTurn());
 
+        AgentApplicationVoiceConfig voiceConfig = new AgentApplicationVoiceConfig();
+        if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) {
+            voiceConfig.setDefaultOpen(entity.getVoiceConfig().getDefaultOpen());
+            voiceConfig.setTimbreId(entity.getVoiceConfig().getTimbreId());
+        } else {
+            voiceConfig.setDefaultOpen(CommonConstant.YOrN.N);
+            voiceConfig.setTimbreId(StringUtils.EMPTY);
+        }
+
+
         dto.setBaseInfo(baseInfo);
         dto.setCommConfig(commConfig);
         dto.setKnowledgeConfig(knowledgeConfig);
         dto.setCommModelConfig(commModelConfig);
+        dto.setVoiceConfig(voiceConfig);
         dto.setUnitIds(entity.getUnitIds());
         dto.setCreator(entity.getCreator());
         dto.setCreatedTime(entity.getCreatedTime());
@@ -185,6 +203,14 @@ public class BizAgentApplicationPublishConvert {
             entity.setTemperature(dto.getCommModelConfig().getTemperature());
         }
 
+        VoiceConfig voiceConfig = new VoiceConfig();
+        if (ObjectUtil.isNotEmpty(dto.getVoiceConfig())) {
+            voiceConfig.setDefaultOpen(dto.getVoiceConfig().getDefaultOpen());
+            voiceConfig.setTimbreId(dto.getVoiceConfig().getTimbreId());
+        } else {
+            voiceConfig.setDefaultOpen(CommonConstant.YOrN.N);
+            voiceConfig.setTimbreId(StringUtils.EMPTY);
+        }
         entity.setUnitIds(dto.getUnitIds());
         entity.setCreator(dto.getCreator());
         entity.setCreatedTime(dto.getCreatedTime());

src/main/java/cn/com/poc/agent_application/domain/AgentApplicationVoiceConfig.java

+package cn.com.poc.agent_application.domain;
+
+public class AgentApplicationVoiceConfig {
+
+    /**
+     * 是否默认开启 Y-是 N-否
+     */
+    private String defaultOpen;
+
+    /**
+     * 音色ID
+     */
+    private String timbreId;
+
+    public String getDefaultOpen() {
+        return defaultOpen;
+    }
+
+    public void setDefaultOpen(String defaultOpen) {
+        this.defaultOpen = defaultOpen;
+    }
+
+    public String getTimbreId() {
+        return timbreId;
+    }
+
+    public void setTimbreId(String timbreId) {
+        this.timbreId = timbreId;
+    }
+}

src/main/java/cn/com/poc/agent_application/dto/AgentApplicationInfoDto.java

 package cn.com.poc.agent_application.dto;
 
-import cn.com.poc.agent_application.domain.AgentApplicationBaseInfo;
-import cn.com.poc.agent_application.domain.AgentApplicationCommConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationCommModelConfig;
-import cn.com.poc.agent_application.domain.AgentApplicationKnowledgeConfig;
+import cn.com.poc.agent_application.domain.*;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
@@ -21,6 +18,8 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
 
     private AgentApplicationCommModelConfig commModelConfig;
 
+    private AgentApplicationVoiceConfig voiceConfig;
+
     public AgentApplicationBaseInfo getBaseInfo() {
         return baseInfo;
     }
@@ -53,6 +52,14 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
         this.commModelConfig = commModelConfig;
     }
 
+    public AgentApplicationVoiceConfig getVoiceConfig() {
+        return voiceConfig;
+    }
+
+    public void setVoiceConfig(AgentApplicationVoiceConfig voiceConfig) {
+        this.voiceConfig = voiceConfig;
+    }
+
     /**
      * unit_ids
      * 组件ID
@@ -113,7 +120,7 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
     /**
      * isCollect
      * 当前用户是否收藏 1、Y 是 2、N 否
-     * */
+     */
     private String isCollect;
 
     public String getIsCollect() {
@@ -124,29 +131,31 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
         this.isCollect = isCollect;
     }
 
-    /** agent_publish_id
-     *发布应用的ID
+    /**
+     * agent_publish_id
+     * 发布应用的ID
      */
     private java.lang.Integer agentPublishId;
 
-    public java.lang.Integer getAgentPublishId(){
+    public java.lang.Integer getAgentPublishId() {
         return this.agentPublishId;
     }
 
-    public void setAgentPublishId(java.lang.Integer agentPublishId){
+    public void setAgentPublishId(java.lang.Integer agentPublishId) {
         this.agentPublishId = agentPublishId;
     }
 
-    /** is_sale
-     *是否上架应用 1、Y 是 2、N 否
+    /**
+     * is_sale
+     * 是否上架应用 1、Y 是 2、N 否
      */
     private java.lang.String isSale;
 
-    public java.lang.String getIsSale(){
+    public java.lang.String getIsSale() {
         return this.isSale;
     }
 
-    public void setIsSale(java.lang.String isSale){
+    public void setIsSale(java.lang.String isSale) {
         this.isSale = isSale;
     }
 

src/main/java/cn/com/poc/agent_application/entity/BizAgentApplicationInfoEntity.java

 package cn.com.poc.agent_application.entity;
 
+import cn.com.poc.agent_application.domain.AgentApplicationVoiceConfig;
+
 import javax.persistence.Column;
 import java.util.Arrays;
 import java.util.List;
@@ -329,6 +331,22 @@ public class BizAgentApplicationInfoEntity {
         this.isDocumentParsing = isDocumentParsing;
     }
 
+
+
+    /**
+     * voice_config
+     * 声音配置 defaultOpen- 是否默认开启  timbreId-音色
+     */
+    private VoiceConfig voiceConfig;
+
+    public VoiceConfig getVoiceConfig() {
+        return voiceConfig;
+    }
+
+    public void setVoiceConfig(VoiceConfig voiceConfig) {
+        this.voiceConfig = voiceConfig;
+    }
+
     /**
      * is_deleted
      * 是否删除 1、Y 是 2、N 否

src/main/java/cn/com/poc/agent_application/entity/BizAgentApplicationPublishEntity.java

@@ -330,6 +330,18 @@ public class BizAgentApplicationPublishEntity {
         this.isDocumentParsing = isDocumentParsing;
     }
 
+    /**
+     * voice_config
+     */
+    private VoiceConfig voiceConfig;
+
+    public VoiceConfig getVoiceConfig() {
+        return voiceConfig;
+    }
+
+    public void setVoiceConfig(VoiceConfig voiceConfig) {
+        this.voiceConfig = voiceConfig;
+    }
 
     /**
      * is_deleted

src/main/java/cn/com/poc/agent_application/entity/VoiceConfig.java

+package cn.com.poc.agent_application.entity;
+
+public class VoiceConfig {
+
+    /**
+     * 是否默认开启 Y-是 N-否
+     */
+    private String defaultOpen;
+
+    /**
+     * 音色ID
+     */
+    private String timbreId;
+
+
+    public String getDefaultOpen() {
+        return defaultOpen;
+    }
+
+    public void setDefaultOpen(String defaultOpen) {
+        this.defaultOpen = defaultOpen;
+    }
+
+    public String getTimbreId() {
+        return timbreId;
+    }
+
+    public void setTimbreId(String timbreId) {
+        this.timbreId = timbreId;
+    }
+}

src/main/java/cn/com/poc/agent_application/query/AgentApplicationInfoQuery.sql

@@ -22,6 +22,7 @@ select distinct
     variable_structure,
     is_long_memory,
     is_document_parsing,
+    voice_config,
     is_deleted,
     CREATOR,
     CREATED_TIME,

src/main/java/cn/com/poc/agent_application/query/AgentApplicationInfoQueryItem.java

@@ -363,6 +363,19 @@ public class AgentApplicationInfoQueryItem extends BaseItemClass implements Seri
         this.isDocumentParsing = isDocumentParsing;
     }
 
+    /**
+     * voice_config
+     */
+    private java.lang.String voiceConfig;
+
+    @Column(name = "voice_config")
+    public java.lang.String getVoiceConfig() {
+        return this.voiceConfig;
+    }
+
+    public void setVoiceConfig(java.lang.String voiceConfig) {
+        this.voiceConfig = voiceConfig;
+    }
 
     /**
      * is_deleted

src/main/java/cn/com/poc/agent_application/service/BizAgentApplicationPublishService.java

@@ -12,7 +12,7 @@ public interface BizAgentApplicationPublishService extends BaseService {
 
     BizAgentApplicationPublishEntity get(java.lang.Integer id) throws Exception;
 
-    BizAgentApplicationPublishEntity getByAgentId(String agentId) throws Exception;
+    BizAgentApplicationPublishEntity getByAgentId(String agentId);
 
     List<BizAgentApplicationPublishEntity> findByExample(BizAgentApplicationPublishEntity example, PagingInfo pagingInfo) throws Exception;
 

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationInfoServiceImpl.java

@@ -213,8 +213,15 @@ public class BizAgentApplicationInfoServiceImpl extends BaseServiceImpl
         if (entity.getTemperature() != null) {
             Assert.isTrue(entity.getTemperature() > 0 && entity.getTemperature() <= 1.0, "temperature is error,must greater than 0, less than or equal to 1.9");
         }
-        model.setIsDocumentParsing(entity.getIsDocumentParsing());
-        model.setIsLongMemory(entity.getIsLongMemory());
+        if (entity.getVoiceConfig() != null) {
+            model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig()));
+        }
+        if (StringUtils.isNotBlank(entity.getIsDocumentParsing())) {
+            model.setIsDocumentParsing(entity.getIsDocumentParsing());
+        }
+        if (StringUtils.isNotBlank(entity.getIsLongMemory())) {
+            model.setIsLongMemory(entity.getIsLongMemory());
+        }
         model.setTemperature(entity.getTemperature());
         model.setTopP(entity.getTopP());
         model.setContinuousQuestionStatus(entity.getContinuousQuestionStatus());

src/main/java/cn/com/poc/agent_application/service/impl/BizAgentApplicationPublishServiceImpl.java

@@ -14,8 +14,6 @@ import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.convert.BizAgentApplicationPublishConvert;
 import cn.com.poc.agent_application.repository.BizAgentApplicationPublishRepository;
 import cn.com.yict.framemax.data.model.PagingInfo;
-import cn.hutool.core.bean.BeanUtil;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -52,7 +50,7 @@ public class BizAgentApplicationPublishServiceImpl extends BaseServiceImpl
     }
 
     @Override
-    public BizAgentApplicationPublishEntity getByAgentId(String agentId) throws Exception {
+    public BizAgentApplicationPublishEntity getByAgentId(String agentId) {
         Assert.notNull(agentId);
         BizAgentApplicationPublishModel model = new BizAgentApplicationPublishModel();
         model.setAgentId(agentId);

src/main/java/cn/com/poc/expose/aggregate/AgentApplicationService.java

@@ -2,6 +2,7 @@ package cn.com.poc.expose.aggregate;
 
 import cn.com.poc.agent_application.query.MemberCollectQueryItem;
 import cn.com.yict.framemax.data.model.PagingInfo;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -46,4 +47,21 @@ public interface AgentApplicationService {
      */
     List<MemberCollectQueryItem> getCollectedApplications(Long memberId, PagingInfo pagingInfo);
 
+    /**
+     * 获取用户在当前应用的自动播放配置
+     *
+     * @param memberId 用户ID
+     * @param agentId  应用ID
+     */
+    String autoPlayByAgentId(Long memberId, String agentId);
+
+    /**
+     * 设置用户在当前应用的自动播放配置
+     *
+     * @param memberId 用户ID
+     * @param agentId  应用ID
+     * @param autoPlay 自动播放配置 Y/N
+     */
+    String enableAutoPlay(Long memberId, String agentId, String autoPlay);
+
 }

src/main/java/cn/com/poc/expose/aggregate/impl/AgentApplicationServiceImpl.java

@@ -6,6 +6,7 @@ import cn.com.poc.agent_application.constant.AgentApplicationGCConfigConstants;
 import cn.com.poc.agent_application.entity.BizAgentApplicationDialoguesRecordEntity;
 import cn.com.poc.agent_application.entity.BizAgentApplicationGcConfigEntity;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
+import cn.com.poc.agent_application.entity.VoiceConfig;
 import cn.com.poc.agent_application.query.MemberCollectQueryCondition;
 import cn.com.poc.agent_application.query.MemberCollectQueryItem;
 import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
@@ -62,6 +63,11 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
      */
     final private String MEMBER_RECOMMEND_QUESTIONS_LAST = AGENT_APPLICATION_RECOMMEND_QUESTIONS + "MEMBER_LAST:";
 
+    /**
+     * 应用自动播放Key
+     */
+    final private String AGENT_APPLICATION_AUTO_PLAY = "AGENT_APPLICATION_AUTO_PLAY:";
+
 
     @Resource
     private BizMemberAgentApplicationCollectService bizMemberAgentApplicationCollectService;
@@ -266,6 +272,33 @@ public class AgentApplicationServiceImpl implements AgentApplicationService {
         return memberCollectQueryItems;
     }
 
+    @Override
+    public String autoPlayByAgentId(Long memberId, String agentId) {
+        String result = CommonConstant.YOrN.N;
+        String redisKey = AGENT_APPLICATION_RECOMMEND_QUESTIONS + memberId + ":" + agentId;
+        if (redisService.hasKey(redisKey)) {
+            result = (String) redisService.get(redisKey);
+        } else {
+            BizAgentApplicationPublishEntity publishEntity = bizAgentApplicationPublishService.getByAgentId(agentId);
+            if (publishEntity == null) {
+                throw new I18nMessageException("exception/application.does.not.exist");
+            }
+            VoiceConfig voiceConfig = publishEntity.getVoiceConfig();
+            if (voiceConfig != null) {
+                String isAutoPlay = voiceConfig.getDefaultOpen();
+                result = isAutoPlay;
+            }
+            redisService.set(redisKey, result, 30 * 60 * 60 * 24);
+        }
+        return result;
+    }
+
+    @Override
+    public String enableAutoPlay(Long memberId, String agentId, String autoPlay) {
+        String redisKey = AGENT_APPLICATION_RECOMMEND_QUESTIONS + memberId + ":" + agentId;
+        redisService.set(redisKey, autoPlay, 30 * 60 * 60 * 24);
+        return autoPlay;
+    }
 
     private void createCNQuestion() {
         Message message = new Message();

src/main/java/cn/com/poc/expose/rest/AgentApplicationRest.java

@@ -86,4 +86,18 @@ public interface AgentApplicationRest extends BaseRest {
      */
     List<DialoguesContextDto> getDialogueContext(@RequestParam String dialogueId) throws Exception;
 
+    /**
+     * 获取用户在当前应用的自动播放配置
+     *
+     * @param agentId 应用ID
+     */
+    String autoPlayByAgentId(@RequestParam String agentId);
+
+    /**
+     * 设置用户在当前应用的自动播放配置
+     *
+     * @param agentId  应用ID
+     * @param autoPlay 自动播放配置 Y/N
+     */
+    String enableAutoPlay(@RequestParam String agentId, @RequestParam String autoPlay);
 }

src/main/java/cn/com/poc/expose/rest/impl/AgentApplicationRestImpl.java

 package cn.com.poc.expose.rest.impl;
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationInfoService;
-import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
 import cn.com.poc.agent_application.convert.AgentApplicationInfoConvert;
 import cn.com.poc.agent_application.convert.BizAgentApplicationPublishConvert;
 import cn.com.poc.agent_application.dto.AgentApplicationCreateContinueQuesDto;
@@ -232,4 +231,20 @@ public class AgentApplicationRestImpl implements AgentApplicationRest {
         }
         return null;
     }
+
+    @Override
+    public String autoPlayByAgentId(String agentId) {
+        Assert.notBlank(agentId);
+        UserBaseEntity currentUser = BlContext.getCurrentUser();
+        return agentApplicationService.autoPlayByAgentId(currentUser.getUserId(), agentId);
+    }
+
+    @Override
+    public String enableAutoPlay(String agentId, String autoPlay) {
+        Assert.notBlank(agentId);
+        Assert.notBlank(autoPlay);
+        Assert.isTrue(CommonConstant.YOrN.N.equals(autoPlay) || CommonConstant.YOrN.Y.equals(autoPlay));
+        UserBaseEntity currentUser = BlContext.getCurrentUser();
+        return agentApplicationService.enableAutoPlay(currentUser.getUserId(), agentId, autoPlay);
+    }
 }

src/main/java/cn/com/poc/message/service/impl/AgentApplicationConsumerServiceImpl.java

@@ -2,12 +2,10 @@ package cn.com.poc.message.service.impl;
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
-import cn.com.poc.agent_application.service.BizAgentApplicationDialoguesRecordService;
 import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.message.entity.AgentApplicationClickEventMessage;
 import cn.com.poc.message.service.AgentApplicationConsumerService;
 import cn.com.poc.message.topic.AgentApplicationTopic;
-import cn.com.yict.framemax.core.service.BaseService;
 import cn.com.yict.framemax.tumbleweed.client.annotation.Consumer;
 import org.springframework.stereotype.Service;
 

src/test/java/cn/com/poc/AgentApplicationInfoTest.java

@@ -2,29 +2,31 @@ package cn.com.poc;
 
 
 import cn.com.poc.agent_application.aggregate.AgentApplicationInfoService;
+import cn.com.poc.agent_application.entity.Variable;
+import cn.com.poc.agent_application.utils.AgentApplicationTools;
 import cn.com.poc.common.service.RedisService;
-import cn.com.poc.common.utils.BlContext;
 import cn.com.poc.expose.aggregate.AgentApplicationService;
-import cn.com.poc.thirdparty.resource.demand.ai.aggregate.DemandKnowledgeService;
-import cn.com.poc.thirdparty.resource.demand.ai.function.long_memory.SetLongMemoryConstants;
-import cn.com.poc.thirdparty.resource.demand.ai.function.value_memory.GetValueMemory;
-import cn.com.poc.thirdparty.resource.demand.ai.function.value_memory.SetValueMemoryConstants;
+import cn.com.poc.thirdparty.resource.demand.ai.function.html_reader.HtmlReaderFunction;
+import cn.com.poc.thirdparty.resource.demand.ai.function.memory_variable_writer.MemoryVariableWriter;
 import cn.com.yict.framemax.core.spring.SingleContextInitializer;
-import cn.com.yict.framemax.security.oauth.support.UsernameOauthTokenAuthenticationToken;
 import com.google.common.collect.Lists;
-import org.apache.commons.collections4.ListUtils;
+import io.github.furstenheim.*;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import javax.annotation.Resource;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(initializers = SingleContextInitializer.class)
@@ -43,8 +45,48 @@ public class AgentApplicationInfoTest {
 
     @Test
     public void del() {
-        String contentKey = SetValueMemoryConstants.REDIS_PREFIX;
-        redisService.del(contentKey);
+    }
+
+    @Test
+    public void html2MD() throws IOException {
+        // 创建资源符对象
+        URL url = new URL("https://blog.csdn.net/jxlhljh/article/details/124506103");
+        // 创建连接
+        URLConnection conn = url.openConnection();
+        // 获取输入流
+        InputStream inputStream = conn.getInputStream();
+        // 缓冲区，读取输入流内容，64KB
+        char[] buffer = new char[1024 * 64];
+        int len;
+        StringBuilder sb = new StringBuilder();
+        // 转换为字符流
+        InputStreamReader isr = new InputStreamReader(inputStream);
+        // 循环读取
+        while ((len = isr.read(buffer)) != -1) {
+            sb.append(buffer, 0, len);
+        }
+//        System.out.println(sb.toString());
+        // 关闭资源
+        inputStream.close();
+        isr.close();
+
+        String htmlStr = sb.toString();
+
+        OptionsBuilder optionsBuilder = OptionsBuilder.anOptions();
+        Options options = optionsBuilder.withBr("-")
+                .withLinkStyle(LinkStyle.REFERENCED)
+                .withLinkReferenceStyle(LinkReferenceStyle.SHORTCUT)
+                // more options
+                .build();
+        CopyDown converter = new CopyDown(options);
+        String markdownText = converter.convert(htmlStr);
+
+        FileOutputStream fileOutputStream = new FileOutputStream("D:\\test.md");
+        fileOutputStream.write(markdownText.getBytes());
+        fileOutputStream.flush();
+        fileOutputStream.close();
+//        System.out.println(markdownText);
+
     }
 
 
@@ -80,14 +122,83 @@ public class AgentApplicationInfoTest {
 
     @Test
     public void getValueMemory() {
-        String agentId = "d56d9a6a90ed435d831f84bc1af50547";
-        String contentKey = SetValueMemoryConstants.REDIS_PREFIX + agentId + ":" + "204";
-        System.out.println(redisService.hmget(contentKey));
-//        Set<Object> keySet = result.keySet();
-//        for (Object key : keySet) {
-//            Object value = result.get(key);
-//            System.out.println("key:" + key + ",value:" + value);
-//        }
+    }
+
+    @Test
+    public void getFunctionConfig() {
+
+        System.out.println(new HtmlReaderFunction().getLLMConfig());
+    }
+
+
+    @Test
+    public void updateStructVariable() {
+        String agentId = "1";
+        List<Variable> originals = null;
+        List<Variable> transformed = null;
+        String identifier = AgentApplicationTools.identifier(agentId, agentId);
+        if (CollectionUtils.isEmpty(transformed)) {
+            // 清除所有字段
+            MemoryVariableWriter.clean(identifier);
+        }
+        // 原【变量记忆】为空，则不需要处理
+        if (originals == null) {
+            return;
+        }
+        // 1. 获取需要删除的字段集合
+        // 2. 获取需要更新值的字段集合
+        Set<String> delKeys = new HashSet<>();
+        Set<String> updateKeys = new HashSet<>();
+        for (Variable variable : originals) {
+            String key = variable.getKey();
+            boolean needDel = transformed.stream().noneMatch(v -> v.getKey().equals(key));
+            if (needDel) {
+                delKeys.add(key);
+            }
+
+            boolean needUpdate = transformed.stream().anyMatch(v -> v.getKey().equals(key));
+            if (needUpdate) {
+                Optional<Variable> target = transformed.stream().filter(v -> v.getKey().equals(key)).findFirst();
+                if (StringUtils.isBlank(target.get().getVariableDefault())) {
+                    continue;
+                }
+                Map<Object, Object> map = MemoryVariableWriter.get(identifier);
+                String value = map.get(key).toString();
+                if (StringUtils.isBlank(value)) {
+                    updateKeys.add(key);
+                }
+            }
+        }
+        // 3. 获取需要新增的字段集合
+        Set<String> addKeys = new HashSet<>();
+        for (Variable variable : transformed) {
+            String key = variable.getKey();
+            boolean needAdd = originals.stream().noneMatch(v -> v.getKey().equals(key));
+            if (needAdd) {
+                addKeys.add(key);
+            }
+        }
+        // 删除
+        if (!delKeys.isEmpty()) {
+            MemoryVariableWriter.delItem(identifier, delKeys.toArray(new String[0]));
+        }
+
+        if (!addKeys.isEmpty()) {
+            Map<String, Object> map = new HashMap<>();
+            for (String key : addKeys) {
+                Variable variable = transformed.stream().filter(v -> v.getKey().equals(key)).findFirst().get();
+                map.put(variable.getKey(), variable.getVariableDefault());
+            }
+            MemoryVariableWriter.addItem(identifier, map);
+        }
+        if (!updateKeys.isEmpty()) {
+            Map<String, Object> map = new HashMap<>();
+            for (String key : updateKeys) {
+                Variable variable = transformed.stream().filter(v -> v.getKey().equals(key)).findFirst().get();
+                map.put(variable.getKey(), variable.getVariableDefault());
+            }
+            MemoryVariableWriter.addItem(identifier, map);
+        }
     }
 
 }