Commit 4da4ae97 authored by Roger Wu's avatar Roger Wu

应用信息增加数字人配置

parent 763f9e2d
...@@ -3,6 +3,7 @@ package cn.com.poc.agent_application.convert; ...@@ -3,6 +3,7 @@ package cn.com.poc.agent_application.convert;
import cn.com.poc.agent_application.domain.*; import cn.com.poc.agent_application.domain.*;
import cn.com.poc.agent_application.dto.AgentApplicationInfoDto; import cn.com.poc.agent_application.dto.AgentApplicationInfoDto;
import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity; import cn.com.poc.agent_application.entity.BizAgentApplicationInfoEntity;
import cn.com.poc.agent_application.entity.DigitalhumanConfig;
import cn.com.poc.agent_application.entity.Variable; import cn.com.poc.agent_application.entity.Variable;
import cn.com.poc.agent_application.entity.VoiceConfig; import cn.com.poc.agent_application.entity.VoiceConfig;
import cn.com.poc.agent_application.model.BizAgentApplicationInfoModel; import cn.com.poc.agent_application.model.BizAgentApplicationInfoModel;
...@@ -85,6 +86,10 @@ public class AgentApplicationInfoConvert { ...@@ -85,6 +86,10 @@ public class AgentApplicationInfoConvert {
VoiceConfig voiceConfig = JsonUtils.deSerialize(model.getVoiceConfig(), VoiceConfig.class); VoiceConfig voiceConfig = JsonUtils.deSerialize(model.getVoiceConfig(), VoiceConfig.class);
entity.setVoiceConfig(voiceConfig); entity.setVoiceConfig(voiceConfig);
} }
if (StringUtils.isNotBlank(model.getDigitalhumanConfig())) {
DigitalhumanConfig digitalhumanConfig = JsonUtils.deSerialize(model.getDigitalhumanConfig(), DigitalhumanConfig.class);
entity.setDigitalhumanConfig(digitalhumanConfig);
}
entity.setIsDeleted(model.getIsDeleted()); entity.setIsDeleted(model.getIsDeleted());
entity.setCreator(model.getCreator()); entity.setCreator(model.getCreator());
entity.setCreatedTime(model.getCreatedTime()); entity.setCreatedTime(model.getCreatedTime());
...@@ -141,6 +146,9 @@ public class AgentApplicationInfoConvert { ...@@ -141,6 +146,9 @@ public class AgentApplicationInfoConvert {
if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) { if (ObjectUtil.isNotEmpty(entity.getVoiceConfig())) {
model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig())); model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig()));
} }
if (ObjectUtil.isNotEmpty(entity.getDigitalhumanConfig())) {
model.setDigitalhumanConfig(JsonUtils.serialize(entity.getDigitalhumanConfig()));
}
model.setIsDeleted(entity.getIsDeleted()); model.setIsDeleted(entity.getIsDeleted());
model.setCreator(entity.getCreator()); model.setCreator(entity.getCreator());
model.setCreatedTime(entity.getCreatedTime()); model.setCreatedTime(entity.getCreatedTime());
...@@ -198,12 +206,26 @@ public class AgentApplicationInfoConvert { ...@@ -198,12 +206,26 @@ public class AgentApplicationInfoConvert {
voiceConfig.setTimbreId(StringUtils.EMPTY); voiceConfig.setTimbreId(StringUtils.EMPTY);
} }
DigitalhumanConfig digitalhumanConfig = new DigitalhumanConfig();
if (ObjectUtil.isNotEmpty(entity.getDigitalhumanConfig())) {
digitalhumanConfig.setEnable(entity.getDigitalhumanConfig().getEnable());
digitalhumanConfig.setTimbreId(entity.getDigitalhumanConfig().getTimbreId());
digitalhumanConfig.setToken(entity.getDigitalhumanConfig().getToken());
digitalhumanConfig.setFigureId(entity.getDigitalhumanConfig().getFigureId());
} else {
digitalhumanConfig.setEnable(CommonConstant.YOrN.N);
digitalhumanConfig.setTimbreId(StringUtils.EMPTY);
digitalhumanConfig.setFigureId(StringUtils.EMPTY);
digitalhumanConfig.setToken(StringUtils.EMPTY);
}
AgentApplicationInfoDto dto = new AgentApplicationInfoDto(); AgentApplicationInfoDto dto = new AgentApplicationInfoDto();
dto.setBaseInfo(baseInfo); dto.setBaseInfo(baseInfo);
dto.setCommConfig(commConfig); dto.setCommConfig(commConfig);
dto.setKnowledgeConfig(knowledgeConfig); dto.setKnowledgeConfig(knowledgeConfig);
dto.setCommModelConfig(commModelConfig); dto.setCommModelConfig(commModelConfig);
dto.setVoiceConfig(voiceConfig); dto.setVoiceConfig(voiceConfig);
dto.setDigitalhumanConfig(digitalhumanConfig);
dto.setUnitIds(entity.getUnitIds()); dto.setUnitIds(entity.getUnitIds());
dto.setDatabaseConfig(databaseConfig); dto.setDatabaseConfig(databaseConfig);
dto.setCreator(entity.getCreator()); dto.setCreator(entity.getCreator());
...@@ -269,6 +291,20 @@ public class AgentApplicationInfoConvert { ...@@ -269,6 +291,20 @@ public class AgentApplicationInfoConvert {
} }
entity.setVoiceConfig(voiceConfig); entity.setVoiceConfig(voiceConfig);
DigitalhumanConfig digitalhumanConfig = new DigitalhumanConfig();
if (ObjectUtil.isNotEmpty(dto.getDigitalhumanConfig())) {
digitalhumanConfig.setEnable(dto.getDigitalhumanConfig().getEnable());
digitalhumanConfig.setTimbreId(dto.getDigitalhumanConfig().getTimbreId());
digitalhumanConfig.setToken(dto.getDigitalhumanConfig().getToken());
digitalhumanConfig.setFigureId(dto.getDigitalhumanConfig().getFigureId());
} else {
digitalhumanConfig.setEnable(CommonConstant.YOrN.N);
digitalhumanConfig.setTimbreId(StringUtils.EMPTY);
digitalhumanConfig.setFigureId(StringUtils.EMPTY);
digitalhumanConfig.setToken(StringUtils.EMPTY);
}
entity.setDigitalhumanConfig(digitalhumanConfig);
entity.setUnitIds(dto.getUnitIds()); entity.setUnitIds(dto.getUnitIds());
entity.setCreator(dto.getCreator()); entity.setCreator(dto.getCreator());
entity.setCreatedTime(dto.getCreatedTime()); entity.setCreatedTime(dto.getCreatedTime());
...@@ -327,6 +363,9 @@ public class AgentApplicationInfoConvert { ...@@ -327,6 +363,9 @@ public class AgentApplicationInfoConvert {
if (StringUtils.isNotBlank(infoQueryItem.getVoiceConfig())) { if (StringUtils.isNotBlank(infoQueryItem.getVoiceConfig())) {
entity.setVoiceConfig(JsonUtils.deSerialize(infoQueryItem.getVoiceConfig(), VoiceConfig.class)); entity.setVoiceConfig(JsonUtils.deSerialize(infoQueryItem.getVoiceConfig(), VoiceConfig.class));
} }
// if (StringUtils.isNotBlank(infoQueryItem())) {
// entity.setVoiceConfig(JsonUtils.deSerialize(infoQueryItem.getVoiceConfig(), VoiceConfig.class));
// }
entity.setIsDeleted(infoQueryItem.getIsDeleted()); entity.setIsDeleted(infoQueryItem.getIsDeleted());
entity.setCreator(infoQueryItem.getCreator()); entity.setCreator(infoQueryItem.getCreator());
entity.setCreatedTime(infoQueryItem.getCreatedTime()); entity.setCreatedTime(infoQueryItem.getCreatedTime());
......
...@@ -3,6 +3,7 @@ package cn.com.poc.agent_application.convert; ...@@ -3,6 +3,7 @@ package cn.com.poc.agent_application.convert;
import cn.com.poc.agent_application.domain.*; import cn.com.poc.agent_application.domain.*;
import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto; import cn.com.poc.agent_application.dto.BizAgentApplicationPublishDto;
import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity; import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
import cn.com.poc.agent_application.entity.DigitalhumanConfig;
import cn.com.poc.agent_application.entity.Variable; import cn.com.poc.agent_application.entity.Variable;
import cn.com.poc.agent_application.entity.VoiceConfig; import cn.com.poc.agent_application.entity.VoiceConfig;
import cn.com.poc.agent_application.model.BizAgentApplicationPublishModel; import cn.com.poc.agent_application.model.BizAgentApplicationPublishModel;
...@@ -179,12 +180,26 @@ public class BizAgentApplicationPublishConvert { ...@@ -179,12 +180,26 @@ public class BizAgentApplicationPublishConvert {
voiceConfig.setTimbreId(StringUtils.EMPTY); voiceConfig.setTimbreId(StringUtils.EMPTY);
} }
DigitalhumanConfig digitalhumanConfig = new DigitalhumanConfig();
if (ObjectUtil.isNotEmpty(dto.getDigitalhumanConfig())) {
digitalhumanConfig.setEnable(dto.getDigitalhumanConfig().getEnable());
digitalhumanConfig.setTimbreId(dto.getDigitalhumanConfig().getTimbreId());
digitalhumanConfig.setToken(dto.getDigitalhumanConfig().getToken());
digitalhumanConfig.setFigureId(dto.getDigitalhumanConfig().getFigureId());
} else {
digitalhumanConfig.setEnable(CommonConstant.YOrN.N);
digitalhumanConfig.setTimbreId(StringUtils.EMPTY);
digitalhumanConfig.setFigureId(StringUtils.EMPTY);
digitalhumanConfig.setToken(StringUtils.EMPTY);
}
dto.setBaseInfo(baseInfo); dto.setBaseInfo(baseInfo);
dto.setCommConfig(commConfig); dto.setCommConfig(commConfig);
dto.setKnowledgeConfig(knowledgeConfig); dto.setKnowledgeConfig(knowledgeConfig);
dto.setCommModelConfig(commModelConfig); dto.setCommModelConfig(commModelConfig);
dto.setVoiceConfig(voiceConfig); dto.setVoiceConfig(voiceConfig);
dto.setDigitalhumanConfig(digitalhumanConfig);
dto.setDatabaseConfig(databaseConfig); dto.setDatabaseConfig(databaseConfig);
dto.setUnitIds(entity.getUnitIds()); dto.setUnitIds(entity.getUnitIds());
dto.setCreator(entity.getCreator()); dto.setCreator(entity.getCreator());
...@@ -248,6 +263,20 @@ public class BizAgentApplicationPublishConvert { ...@@ -248,6 +263,20 @@ public class BizAgentApplicationPublishConvert {
voiceConfig.setDefaultOpen(CommonConstant.YOrN.N); voiceConfig.setDefaultOpen(CommonConstant.YOrN.N);
voiceConfig.setTimbreId(StringUtils.EMPTY); voiceConfig.setTimbreId(StringUtils.EMPTY);
} }
// DigitalhumanConfig digitalhumanConfig = new DigitalhumanConfig();
// if (ObjectUtil.isNotEmpty(dto.getDigitalhumanConfig())) {
// digitalhumanConfig.setEnable(dto.getDigitalhumanConfig().getEnable());
// digitalhumanConfig.setTimbreId(dto.getDigitalhumanConfig().getTimbreId());
// digitalhumanConfig.setToken(dto.getDigitalhumanConfig().getToken());
// digitalhumanConfig.setFigureId(dto.getDigitalhumanConfig().getFigureId());
// } else {
// digitalhumanConfig.setEnable(CommonConstant.YOrN.N);
// digitalhumanConfig.setTimbreId(StringUtils.EMPTY);
// digitalhumanConfig.setFigureId(StringUtils.EMPTY);
// digitalhumanConfig.setToken(StringUtils.EMPTY);
// }
entity.setUnitIds(dto.getUnitIds()); entity.setUnitIds(dto.getUnitIds());
entity.setCreator(dto.getCreator()); entity.setCreator(dto.getCreator());
entity.setCreatedTime(dto.getCreatedTime()); entity.setCreatedTime(dto.getCreatedTime());
......
package cn.com.poc.agent_application.dto; package cn.com.poc.agent_application.dto;
import cn.com.poc.agent_application.domain.*; import cn.com.poc.agent_application.domain.*;
import cn.com.poc.agent_application.entity.DigitalhumanConfig;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
...@@ -22,6 +23,9 @@ public class AgentApplicationInfoDto implements java.io.Serializable { ...@@ -22,6 +23,9 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
private AgentApplicationVoiceConfig voiceConfig; private AgentApplicationVoiceConfig voiceConfig;
private DigitalhumanConfig digitalhumanConfig;
public AgentApplicationBaseInfo getBaseInfo() { public AgentApplicationBaseInfo getBaseInfo() {
return baseInfo; return baseInfo;
} }
...@@ -62,6 +66,14 @@ public class AgentApplicationInfoDto implements java.io.Serializable { ...@@ -62,6 +66,14 @@ public class AgentApplicationInfoDto implements java.io.Serializable {
this.voiceConfig = voiceConfig; this.voiceConfig = voiceConfig;
} }
public DigitalhumanConfig getDigitalhumanConfig() {
return digitalhumanConfig;
}
public void setDigitalhumanConfig(DigitalhumanConfig digitalhumanConfig) {
this.digitalhumanConfig = digitalhumanConfig;
}
public AgentApplicationDatabaseConfig getDatabaseConfig() { public AgentApplicationDatabaseConfig getDatabaseConfig() {
return databaseConfig; return databaseConfig;
} }
......
...@@ -435,6 +435,21 @@ public class BizAgentApplicationInfoEntity { ...@@ -435,6 +435,21 @@ public class BizAgentApplicationInfoEntity {
this.voiceConfig = voiceConfig; this.voiceConfig = voiceConfig;
} }
/**
* 数字人配置
* 声音配置 enable-是否默认开启 timbreId-音色 figureId-数字人形象 token-令牌
*/
private DigitalhumanConfig digitalhumanConfig;
public DigitalhumanConfig getDigitalhumanConfig() {
return digitalhumanConfig;
}
public void setDigitalhumanConfig(DigitalhumanConfig digitalhumanConfig) {
this.digitalhumanConfig = digitalhumanConfig;
}
/** /**
* is_deleted * is_deleted
* 是否删除 1、Y 是 2、N 否 * 是否删除 1、Y 是 2、N 否
......
package cn.com.poc.agent_application.entity;
/**
* @Author:Roger Wu
* @name:DigitalhumanConfig
* @Date:2025-05-21 12:07
*/
public class DigitalhumanConfig {
/**
* 令牌
*/
private String token;
/**
* 是否开启数字人
*/
private String enable;
/**
* 数字人形象
*/
private String figureId;
/**
* 音色
*/
private String timbreId;
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getEnable() {
return enable;
}
public void setEnable(String enable) {
this.enable = enable;
}
public String getFigureId() {
return figureId;
}
public void setFigureId(String figureId) {
this.figureId = figureId;
}
public String getTimbreId() {
return timbreId;
}
public void setTimbreId(String timbreId) {
this.timbreId = timbreId;
}
}
...@@ -538,6 +538,21 @@ public class BizAgentApplicationInfoModel extends BaseModelClass implements Seri ...@@ -538,6 +538,21 @@ public class BizAgentApplicationInfoModel extends BaseModelClass implements Seri
this.voiceConfig = voiceConfig; this.voiceConfig = voiceConfig;
super.addValidField("voiceConfig"); super.addValidField("voiceConfig");
} }
/**
* 数字人配置
* 声音配置 enable-是否默认开启 timbreId-音色 figureId-数字人形象 token-令牌
*/
private java.lang.String digitalhumanConfig;
@Column(name = "digitalhuman_config", length = 2147483647)
public String getDigitalhumanConfig() {
return digitalhumanConfig;
}
public void setDigitalhumanConfig(String digitalhumanConfig) {
this.digitalhumanConfig = digitalhumanConfig;
}
/** /**
* is_deleted * is_deleted
......
...@@ -215,6 +215,9 @@ public class BizAgentApplicationInfoServiceImpl extends BaseServiceImpl ...@@ -215,6 +215,9 @@ public class BizAgentApplicationInfoServiceImpl extends BaseServiceImpl
if (entity.getVoiceConfig() != null) { if (entity.getVoiceConfig() != null) {
model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig())); model.setVoiceConfig(JsonUtils.serialize(entity.getVoiceConfig()));
} }
if (entity.getDigitalhumanConfig() != null) {
model.setDigitalhumanConfig(JsonUtils.serialize(entity.getDigitalhumanConfig()));
}
if (StringUtils.isNotBlank(entity.getIsDocumentParsing())) { if (StringUtils.isNotBlank(entity.getIsDocumentParsing())) {
model.setIsDocumentParsing(entity.getIsDocumentParsing()); model.setIsDocumentParsing(entity.getIsDocumentParsing());
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment