1.修改结构dto的出入参数

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

@@ -6,6 +6,7 @@ import cn.com.poc.agent_application.domain.AgentApplicationCommModelConfig;
 import cn.com.poc.agent_application.domain.AgentApplicationKnowledgeConfig;
 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.model.BizAgentApplicationInfoModel;
 import cn.com.poc.agent_application.query.AgentApplicationInfoQueryItem;
 import cn.com.poc.agent_application.query.PublishAgentApplicationQueryItem;
@@ -16,6 +17,11 @@ import com.tencent.core.utils.JsonUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 public class AgentApplicationInfoConvert {
 
@@ -129,7 +135,21 @@ public class AgentApplicationInfoConvert {
         commConfig.setContinuousQuestionStatus(entity.getContinuousQuestionStatus());
         commConfig.setContinuousQuestionSystem(entity.getContinuousQuestionSystem());
         commConfig.setContinuousQuestionTurn(entity.getContinuousQuestionTurn());
-        commConfig.setVariableStructure(entity.getVariableStructure());
+        List<Variable> variables = new ArrayList<>();
+        String[] variableStructure = entity.getVariableStructure();
+        for (int i = 0; i < variableStructure.length; i++) {
+            Variable variable = new Variable();
+            String input = variableStructure[i];
+            // 定义正则表达式模式
+            Pattern pattern = Pattern.compile("(key|default):([^,]+)");
+            Matcher matcher = pattern.matcher(input);
+            if (matcher.find()) {
+                variable.setKey(matcher.group(1));
+                variable.setVariableDefault(matcher.group(2));
+                variables.add(variable);
+            }
+        }
+        commConfig.setVariableStructure(variables);
         commConfig.setIsLongMemory(entity.getIsLongMemory());
 
 
@@ -175,7 +195,14 @@ public class AgentApplicationInfoConvert {
             entity.setContinuousQuestionSystem(dto.getCommConfig().getContinuousQuestionSystem());
             entity.setContinuousQuestionTurn(dto.getCommConfig().getContinuousQuestionTurn());
             if (ObjectUtil.isNotEmpty(dto.getCommConfig().getVariableStructure())) {
-                entity.setVariableStructure(dto.getCommConfig().getVariableStructure());
+                List<Variable> variables = dto.getCommConfig().getVariableStructure();
+                String[] result = new String[variables.size()];
+                for (int i = 0; i < variables.size(); i++) {
+                    String key = variables.get(i).getKey();
+                    String variableDefault = variables.get(i).getVariableDefault();
+                    result[i] = "key:" + key + "," + "default:" + variableDefault;
+                }
+                entity.setVariableStructure(result);
             }
             entity.setIsLongMemory(dto.getCommConfig().getIsLongMemory());
         }

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

@@ -4,8 +4,8 @@ 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.dto.BizAgentApplicationPublishDto;
 import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
+import cn.com.poc.agent_application.entity.Variable;
 import cn.com.poc.agent_application.model.BizAgentApplicationMallModel;
 import cn.com.poc.agent_application.entity.BizAgentApplicationMallEntity;
 import cn.com.poc.agent_application.dto.BizAgentApplicationMallDto;
@@ -13,6 +13,11 @@ import cn.com.poc.agent_application.service.BizAgentApplicationPublishService;
 import cn.com.poc.agent_application.service.impl.BizAgentApplicationPublishServiceImpl;
 import cn.com.poc.common.utils.SpringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 public class BizAgentApplicationMallConvert {
 
@@ -68,7 +73,21 @@ public class BizAgentApplicationMallConvert {
             commConfig.setContinuousQuestionStatus(publishEntity.getContinuousQuestionStatus());
             commConfig.setContinuousQuestionSystem(publishEntity.getContinuousQuestionSystem());
             commConfig.setContinuousQuestionTurn(publishEntity.getContinuousQuestionTurn());
-            commConfig.setVariableStructure(publishEntity.getVariableStructure());
+            List<Variable> variables = new ArrayList<>();
+            String[] variableStructure = publishEntity.getVariableStructure();
+            for (int i = 0; i < variableStructure.length; i++) {
+                Variable variable = new Variable();
+                String input = variableStructure[i];
+                // 定义正则表达式模式
+                Pattern pattern = Pattern.compile("(key|default):([^,]+)");
+                Matcher matcher = pattern.matcher(input);
+                if (matcher.find()) {
+                    variable.setKey(matcher.group(1));
+                    variable.setVariableDefault(matcher.group(2));
+                    variables.add(variable);
+                }
+            }
+            commConfig.setVariableStructure(variables);
             commConfig.setIsLongMemory(publishEntity.getIsLongMemory());
         }
 

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

@@ -6,6 +6,7 @@ import cn.com.poc.agent_application.domain.AgentApplicationCommModelConfig;
 import cn.com.poc.agent_application.domain.AgentApplicationKnowledgeConfig;
 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.model.BizAgentApplicationPublishModel;
 import cn.com.poc.common.utils.JsonUtils;
 import cn.hutool.core.util.ObjectUtil;
@@ -13,6 +14,11 @@ import com.tencent.core.utils.JsonUtil;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 public class BizAgentApplicationPublishConvert {
 
@@ -116,7 +122,21 @@ public class BizAgentApplicationPublishConvert {
         commConfig.setContinuousQuestionStatus(entity.getContinuousQuestionStatus());
         commConfig.setContinuousQuestionSystem(entity.getContinuousQuestionSystem());
         commConfig.setContinuousQuestionTurn(entity.getContinuousQuestionTurn());
-        commConfig.setVariableStructure(entity.getVariableStructure());
+        List<Variable> variables = new ArrayList<>();
+        String[] variableStructure = entity.getVariableStructure();
+        for (int i = 0; i < variableStructure.length; i++) {
+            Variable variable = new Variable();
+            String input = variableStructure[i];
+            // 定义正则表达式模式
+            Pattern pattern = Pattern.compile("(key|default):([^,]+)");
+            Matcher matcher = pattern.matcher(input);
+            if (matcher.find()) {
+                variable.setKey(matcher.group(1));
+                variable.setVariableDefault(matcher.group(2));
+                variables.add(variable);
+            }
+        }
+        commConfig.setVariableStructure(variables);
         commConfig.setIsLongMemory(entity.getIsLongMemory());
 
         AgentApplicationKnowledgeConfig knowledgeConfig = new AgentApplicationKnowledgeConfig();
@@ -162,7 +182,14 @@ public class BizAgentApplicationPublishConvert {
             entity.setContinuousQuestionTurn(dto.getCommConfig().getContinuousQuestionTurn());
             entity.setIsLongMemory(dto.getCommConfig().getIsLongMemory());
             if (ObjectUtil.isNotEmpty(dto.getCommConfig().getVariableStructure())) {
-                entity.setVariableStructure(dto.getCommConfig().getVariableStructure());
+                List<Variable> variables = dto.getCommConfig().getVariableStructure();
+                String[] result = new String[variables.size()];
+                for (int i = 0; i < variables.size(); i++) {
+                    String key = variables.get(i).getKey();
+                    String variableDefault = variables.get(i).getVariableDefault();
+                    result[i] = "key:" + key + "," + "default:" + variableDefault;
+                }
+                entity.setVariableStructure(result);
             }
         }
 

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

 package cn.com.poc.agent_application.domain;
 
+import cn.com.poc.agent_application.entity.Variable;
+
+import java.util.List;
+
 /**
  * agent应用对话配置
  */
@@ -79,13 +83,13 @@ public class AgentApplicationCommConfig {
      * variable_structure
      * 变量结构
      */
-    private java.lang.String[] variableStructure;
+    private List<Variable> variableStructure;
 
-    public java.lang.String[] getVariableStructure() {
-        return this.variableStructure;
+    public List<Variable> getVariableStructure() {
+        return variableStructure;
     }
 
-    public void setVariableStructure(java.lang.String[] variableStructure) {
+    public void setVariableStructure(List<Variable> variableStructure) {
         this.variableStructure = variableStructure;
     }
 

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

+package cn.com.poc.agent_application.entity;
+
+public class Variable {
+    private String key;
+    private String variableDefault;
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getVariableDefault() {
+        return variableDefault;
+    }
+
+    public void setVariableDefault(String variableDefault) {
+        this.variableDefault = variableDefault;
+    }
+
+    @Override
+    public String toString() {
+        return "Variable{" +
+                "key='" + key + '\'' +
+                ", variableDefault='" + variableDefault + '\'' +
+                '}';
+    }
+}