ivr

hjzx-api/src/main/resources/application-dev.yml

@@ -76,3 +76,4 @@ spring:
   isNote: 1
   pushUrl: 192.168.1.15:8320/Home/receiveCall
   curlUrl: http://192.168.1.15:8320/
+  middlewareUrl: http://127.0.0.1:9000/

hjzx-api/src/main/resources/application-production.yml

@@ -42,3 +42,4 @@ spring:
   isNote: 1
   pushUrl: 192.168.1.15:8320/Home/receiveCall
   curlUrl: http://192.168.1.15:8320/
+  middlewareUrl: http://127.0.0.1:9000/

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

@@ -2,15 +2,12 @@ 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.StringHelper;
-import api.util.helper.TtsHelper;
-
+import api.util.helper.*;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.var;
@@ -26,11 +23,17 @@ import java.util.stream.Collectors;
 public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements IIvrService{
     public IvrServiceImpl(){ super(false); }
     @Autowired
+    public  static  final String middlewareUrl= SpringHelper.getRequiredProperty("spring.middlewareUrl");
+    @Autowired
+    public  static  final String curlUrl= SpringHelper.getRequiredProperty("spring.curlUrl");
+
+    @Autowired
     private IIvrSqlService iIvrSqlService;
     //新增
     @Override
     public boolean insert(Ivr entity) {
         dealIvr(entity);
+        HttpHelper.sendGet(middlewareUrl+"/ivr/delete");
         return this.save(entity);
     }
 
@@ -38,6 +41,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
     @Override
     public boolean update(Ivr entity) {
         dealIvr(entity);
+        HttpHelper.sendGet(middlewareUrl+"/ivr/delete");
         return this.updateById(entity);
     }
 
@@ -70,7 +74,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             "                    <action application=\"set\" data=\"call_timeout=60\"/>\n" +
             "                    <action application=\"set\" data=\"continue_on_fail=USER_BUSY,NO_ANSWER\"/>\n" +
             "                    <action application=\"export\" data=\"op_type=${op_type}\"/>\n" +
-            "                    <action application=\"bridge\" data=\"{origination_caller_id_name=18538595479,origination_caller_id_number=18538595478,ignore_early_media=true}sofia/gateway/hykj/$1\"/>\n" +
+            "                    <action application=\"bridge\" data=\"{ignore_early_media=true}sofia/gateway/hykj/$1\"/>\n" +
             "                    <action application=\"hangup\" data=\"${originate_disposition}\"/>\n" +
             "                    <action name=\"start_dtmf\"/>\n" +
             "                </condition>\n" +
@@ -180,6 +184,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                             "                    <action application=\"sleep\" data=\"1000\"/>\n" +
                             "                    <action application=\"answer\"/>\n" +
                             "                    <action application=\"set\" data=\"basenumber=$1\"/>\n" +
+                            "                    <action application=\"odbc_query\" inline=\"true\" data=\"call proc_IVRFirst('${uuid}','${caller_id_number}','${basenumber}','${network_addr}')\"/>" +
                             "                    <action application=\"set\" data=\"wait=0\"/>\n" +
                             "                    <action application=\"transfer\" data=\"$1 XML " + toNode.getProperties().getName() + toNode.getId()+ "\"/>\n" +
                             "                </condition>\n" +
@@ -210,11 +215,14 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
     private StringBuilder getXml( List<IvrProperties> nodes ,  List<IvrEdges> paths,IvrProperties currNode,List<String> ids,StringBuilder menuXml) {
 
 
+
         boolean isexist = ids.contains(currNode.getId());
         if (!isexist) {
             ids.add(currNode.getId());
         }
-
+        else {
+            return new StringBuilder();
+        }
         StringBuilder xml = new StringBuilder();
         StringBuilder nextXml = new StringBuilder();
         Map<String, Object> data = currNode.getProperties().getAttr();
@@ -235,10 +243,10 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             }
             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("greet-long").append("=\"").append(curlUrl).append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\" ");
+                mxml.append("greet-short").append("=\"").append(curlUrl).append(TtsHelper.TextToSpeech(data.get("greetShort").toString())).append("\" ");
+                mxml.append("invalid-sound").append("=\"").append(curlUrl).append(TtsHelper.TextToSpeech(data.get("invalidSound").toString())).append("\" ");
+                mxml.append("exit-sound").append("=\"").append(curlUrl).append(TtsHelper.TextToSpeech(data.get("xitSound").toString())).append("\" ");
 
             }
             mxml.append("confirm-macro").append("=\"").append("\" ");
@@ -247,10 +255,10 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             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("inter-digit-timeout").append("=\" ").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("digit-len").append("=\"").append("1\" ");
 
             mxml.append(">\n");
             for (IvrEdges path : nodePaths) {
@@ -312,9 +320,20 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                             var content=  mapper.readValue(model.getSqlContent(), Map.class);
                             if(content!=null)
                             {
-                                xml.append("                 " +
-                                                "   <action application=\"odbc_query\" data=\"").
-                                        append(content.get("content").toString()).append("\"/>\n");
+                                if (Objects.equals(content.get("field").toString(), "curl_response_data"))
+                                {
+                                    xml.append("                 " +
+                                                    "   <action application=\"curl\" data=\"").
+                                            append(content.get("content").toString()).append("\"/>\n");
+                                }
+                                else
+                                {
+                                    xml.append("                 " +
+                                                    "   <action application=\"odbc_query\" data=\"").
+                                            append(content.get("content").toString()).append("\"/>\n");
+                                }
+
+
                             }
                         }
                     }
@@ -376,7 +395,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                     }
                     else
                     {
-                        xml.append("                    <action application=\"playback\" data=\"").append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\"/>\n");
+                        xml.append("                    <action application=\"playback\" data=\"").append(curlUrl).append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\"/>\n");
                     }
                     break;
                 case queue:
@@ -420,6 +439,10 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                 case hangup:
                     xml.append("                    <action application=\"hangup\"/>\n");
                     break;
+                case robot:
+                    xml.append("                    <action application=\"set\" data=\"robot=1\"/>");
+                    xml.append("                    <action application=\"park\"/>");
+                    break;
             }
 
             if (nodePaths.size() > 0) {

hjzx-util/src/main/java/api/util/enums/IvrType.java

@@ -66,5 +66,7 @@ public enum IvrType
      * 挂机
      */
 
-    hangup
+    hangup,
+
+    robot
 }

hjzx-util/src/main/java/api/util/helper/TtsHelper.java

@@ -54,8 +54,7 @@ public class TtsHelper {
     }
     public  static  final String curlUrl= SpringHelper.getRequiredProperty("spring.curlUrl");;
     public static String TextToSpeech(String word) {
-         String path=curlUrl+TextToSpeech(word, "");
-        return path;
+        return  TextToSpeech(word, "");
     }
 
     public static String TextToSpeech(String word, String filename) {
@@ -71,8 +70,8 @@ public class TtsHelper {
         String filePath = file.getAbsolutePath() + "/" + filename + ".wav";
 
         transfer(word,filePath);
-
-        return parentPath+ "/" + filename + ".wav";
+        String path= "/" +parentPath+"/" + filename + ".wav";
+        return path;
     }
 
     public static String TextToSpeechAgent(String word, String filename) {