|
|
@@ -29,6 +29,7 @@ import com.fs.enums.NodeTypeEnum;
|
|
|
import com.fs.enums.TaskTypeEnum;
|
|
|
import com.fs.his.config.CidPhoneConfig;
|
|
|
import com.fs.system.service.ISysConfigService;
|
|
|
+import com.fs.voice.utils.StringUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
import java.util.*;
|
|
|
@@ -268,12 +269,13 @@ public class AiCallTaskNode extends AbstractWorkflowNode {
|
|
|
try{
|
|
|
CompanyConfig companyConfig = companyConfigMapper.selectCompanyConfigByKey(robotic.getCompanyId(), "cId.config");
|
|
|
CidPhoneConfig cidConf = JSONObject.parseObject(companyConfig.getConfigValue(), CidPhoneConfig.class);
|
|
|
- if(null != cidConf && StringUtils.isNotBlank(cidConf.getCallbackUrl())){
|
|
|
+ if(null != cidConf && !StringUtil.strIsNullOrEmpty(cidConf.getCallbackUrl())){
|
|
|
callBackUrl = cidConf.getCallbackUrl();
|
|
|
}
|
|
|
+
|
|
|
//读取总后台配置
|
|
|
- if(StringUtils.isBlank(callBackUrl)){
|
|
|
- String s = configService.selectConfigByKey("cId.config");
|
|
|
+ if(StringUtil.strIsNullOrEmpty(callBackUrl)){
|
|
|
+ String s = configService.selectConfigByKey("cid.config");
|
|
|
JSONObject obj = JSONObject.parseObject(s);
|
|
|
if(null != obj && obj.containsKey("callbackUrl") && StringUtils.isNotBlank(obj.getString("callbackUrl"))){
|
|
|
callBackUrl = obj.getString("callbackUrl");
|