ivr

hjzx-service/src/main/java/api/service/call/impl/IvrServiceImpl.java

@@ -2,14 +2,15 @@ package api.service.call.impl;
 
 import api.entity.database.call.Ivr;
 import api.entity.input.call.*;
+
 import api.mapper.call.IvrMapper;
 import api.service.call.IIvrService;
 import api.service.BaseServiceImpl;
 import api.service.call.IIvrSqlService;
 import api.util.enums.IvrType;
-import api.util.helper.IpHelper;
 import api.util.helper.StringHelper;
 import api.util.helper.TtsHelper;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.var;
@@ -208,8 +209,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
     //获取xml
     private StringBuilder getXml( List<IvrProperties> nodes ,  List<IvrEdges> paths,IvrProperties currNode,List<String> ids,StringBuilder menuXml) {
 
-        String ip= IpHelper.getIp4();
-        String url ="http://" + ip + ":8120";
+
         boolean isexist = ids.contains(currNode.getId());
         if (!isexist) {
             ids.add(currNode.getId());
@@ -224,46 +224,46 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
         //放音收号节点
         if (currNode.getType().equals(IvrType.audiodtmf)) {
 
-                StringBuilder mxml = new StringBuilder("                <menu name=\"" + currNode.getProperties().getName()+ currNode.getId() + "\" ");
-                if (Objects.equals(data.get("type").toString(), "audio"))
-                {
-                    mxml.append("greet-long").append("=\"").append(data.get("file").toString()).append("\" ");
-                    mxml.append("greet-short").append("=\"").append(data.get("greetShortUrl").toString()).append("\" ");
-                    mxml.append("invalid-sound").append("=\"").append(data.get("invalidSoundUrl").toString()).append("\" ");
-                    mxml.append("exit-sound").append("=\"").append(data.get("xitSoundUrl").toString()).append("\" ");
+            StringBuilder mxml = new StringBuilder("                <menu name=\"" + currNode.getProperties().getName()+ currNode.getId() + "\" ");
+            if (Objects.equals(data.get("type").toString(), "audio"))
+            {
+                mxml.append("greet-long").append("=\"").append(data.get("file").toString()).append("\" ");
+                mxml.append("greet-short").append("=\"").append(data.get("greetShortUrl").toString()).append("\" ");
+                mxml.append("invalid-sound").append("=\"").append(data.get("invalidSoundUrl").toString()).append("\" ");
+                mxml.append("exit-sound").append("=\"").append(data.get("xitSoundUrl").toString()).append("\" ");
 
-                }
-                else
-                {
-                    mxml.append("greet-long").append("=\"").append(url).append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\" ");
-                    mxml.append("greet-short").append("=\"").append(url).append(TtsHelper.TextToSpeech(data.get("greetShort").toString())).append("\" ");
-                    mxml.append("invalid-sound").append("=\"").append(url).append(TtsHelper.TextToSpeech(data.get("invalidSound").toString())).append("\" ");
-                    mxml.append("exit-sound").append("=\"").append(url).append(TtsHelper.TextToSpeech(data.get("xitSound").toString())).append("\" ");
+            }
+            else
+            {
+                mxml.append("greet-long").append("=\"").append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\" ");
+                mxml.append("greet-short").append("=\"").append(TtsHelper.TextToSpeech(data.get("greetShort").toString())).append("\" ");
+                mxml.append("invalid-sound").append("=\"").append(TtsHelper.TextToSpeech(data.get("invalidSound").toString())).append("\" ");
+                mxml.append("exit-sound").append("=\"").append(TtsHelper.TextToSpeech(data.get("xitSound").toString())).append("\" ");
 
+            }
+            mxml.append("confirm-macro").append("=\"").append("\" ");
+            mxml.append("confirm-key").append("=\"").append("\" ");
+            mxml.append("tts-engine").append("=\"").append("\" ");
+            mxml.append("tts-voice").append("=\"").append("\" ");
+            mxml.append("confirm-attempts").append("=\"").append("\" ");
+            mxml.append("timeout").append("=\"").append(data.get("timeout").toString()).append("\" ");
+            mxml.append("inter-digit-timeout").append("\" ");
+            mxml.append("max-failures").append("=\"").append(data.get("maxFailures").toString()).append("\" ");
+            mxml.append("max-timeouts").append("=\"").append(data.get("maxTimeouts").toString()).append("\" ");
+            mxml.append("digit-len").append("=\"").append("\" ");
+
+            mxml.append(">\n");
+            for (IvrEdges path : nodePaths) {
+                IvrProperties toNode = nodes.stream().filter(p -> p.getId().equals(path.getTargetNodeId())).findFirst().get();
+                if (toNode.getType().equals(IvrType.audiodtmf)) {
+                    mxml.append("                    <entry action=\"menu-sub\" digits=\"").append(path.getProperties().getOutParams().getExpression()).append("\" param=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
+                } else {
+                    mxml.append("                    <entry action=\"menu-exec-app\" digits=\"").append(path.getProperties().getOutParams().getExpression()).append("\" param=\"transfer ").append(path.getProperties().getOutParams().getExpression()).append(" XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 }
-               mxml.append("confirm-macro").append("=\"").append("\" ");
-              mxml.append("confirm-key").append("=\"").append("\" ");
-               mxml.append("tts-engine").append("=\"").append("\" ");
-              mxml.append("tts-voice").append("=\"").append("\" ");
-              mxml.append("confirm-attempts").append("=\"").append("\" ");
-               mxml.append("timeout").append("=\"").append(data.get("timeout").toString()).append("\" ");
-              mxml.append("inter-digit-timeout").append("\" ");
-               mxml.append("max-failures").append("=\"").append(data.get("maxFailures").toString()).append("\" ");
-               mxml.append("max-timeouts").append("=\"").append(data.get("maxTimeouts").toString()).append("\" ");
-                mxml.append("digit-len").append("=\"").append("\" ");
-
-                mxml.append(">\n");
-                for (IvrEdges path : nodePaths) {
-                    IvrProperties toNode = nodes.stream().filter(p -> p.getId().equals(path.getTargetNodeId())).findFirst().get();
-                    if (toNode.getType().equals(IvrType.audiodtmf)) {
-                        mxml.append("                    <entry action=\"menu-sub\" digits=\"").append(path.getProperties().getOutParams().getExpression()).append("\" param=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
-                    } else {
-                        mxml.append("                    <entry action=\"menu-exec-app\" digits=\"").append(path.getProperties().getOutParams().getExpression()).append("\" param=\"transfer ").append(path.getProperties().getOutParams().getExpression()).append(" XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
-                    }
-                    nextXml.append(getXml(nodes,paths, toNode, ids, menuXml));
-                }
-                mxml.append("                </menu>\n");
-                menuXml.append(mxml);
+                nextXml.append(getXml(nodes,paths, toNode, ids, menuXml));
+            }
+            mxml.append("                </menu>\n");
+            menuXml.append(mxml);
 
 
         }
@@ -370,14 +370,14 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                     }
                     break;
                 case audio:
-                     if(Objects.equals(data.get("type").toString(), "audio"))
-                     {
-                         xml.append("                    <action application=\"playback\" data=\"").append(data.get("file").toString()).append("\"/>\n");
-                     }
-                     else
-                     {
-                         xml.append("                    <action application=\"playback\" data=\"").append(url).append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\"/>\n");
-                     }
+                    if(Objects.equals(data.get("type").toString(), "audio"))
+                    {
+                        xml.append("                    <action application=\"playback\" data=\"").append(data.get("file").toString()).append("\"/>\n");
+                    }
+                    else
+                    {
+                        xml.append("                    <action application=\"playback\" data=\"").append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\"/>\n");
+                    }
                     break;
                 case queue:
                     xml.append("                    <action application=\"set\" data=\"hangup_after_bridge=true\"/>\n");