Merge branch 'master-all' of http://192.168.1.222:3000/jiayi/callcenter-api into master-all

hjzx-api/src/main/java/api/controller/call/IvrController.java

@@ -2,32 +2,53 @@ package api.controller.call;
 
 import api.controller.BaseController;
 import api.entity.database.call.Ivr;
+import api.entity.database.call.Mobile;
+import api.entity.database.call.RepConfig;
 import api.entity.input.PageInput;
 import api.model.AjaxResult;
 import api.service.call.IIvrService;
+import api.service.call.IMobileService;
+import api.service.call.IRepConfigService;
 import api.util.annotation.Anonymous;
 import api.util.annotation.Log;
 import api.util.enums.BusinessType;
+import api.util.helper.HttpHelper;
+import api.util.helper.SpringHelper;
 import api.util.helper.StringHelper;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 @Api(value = "ivr流程管理",tags = "ivr流程管理")
 @RestController
 @RequestMapping("/call/ivr")
+@Anonymous
 public class IvrController extends BaseController {
     @Autowired
     private IIvrService ivrService;
-
+    @Autowired
+    private IRepConfigService configService;
+    @Autowired
+    private IMobileService mobileService;
+    @Autowired
+    public  static  final String middlewareUrl= SpringHelper.getRequiredProperty("spring.middlewareUrl");
     @ApiOperation("列表")
     @Log(title = "查询call_ivr列表",businessType = BusinessType.QUERY)
     @GetMapping
@@ -60,23 +81,143 @@ public class IvrController extends BaseController {
     public AjaxResult add(@RequestBody Ivr input) {
         LambdaQueryWrapper<Ivr> qw = new LambdaQueryWrapper();
         qw.eq(Ivr::getName, input.getName());
+
         if (ivrService.getCount(qw) > 0) {
             return Error("此名称已经存在");
         }
-
-        //input.setCreateBy(CurrentUser().getUserName());
+        LambdaQueryWrapper<Ivr> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.orderByDesc(Ivr::getIvrId).last("limit 1");;
+        Map<String, Object> map = ivrService.getMapFirst(queryWrapper);
+        if (map != null &&map.get("version")!=null&& StringHelper.isNotEmpty(map.get("version").toString()) ) {
+            try {
+                BigDecimal num = new BigDecimal(map.get("version").toString())
+                        .setScale(1, RoundingMode.HALF_UP);
+                // 加上0.1并格式化结果
+                BigDecimal result = num.add(new BigDecimal("0.1"));
+                String formatted = String.format("%.1f", result); // 格式化为一位小数
+                input.setVersion(formatted);
+            }
+            catch (Exception E)
+            {
+            }
+        }
+        input.setState(0L);
         input.setCreateTime(new Date());
         input.setDelFlag("0");
-        boolean result = ivrService.insert(input);
-        if (result) {
-            return Success("成功");
+        boolean n = ivrService.insert(input);
+        if (n) {
+            CompletableFuture.supplyAsync(() -> {
+                ivrService.dealIvr(input);
+                input.setState(1L);
+                ivrService.update(input);
+                return null;
+            }).thenAccept(result -> System.out.println("Result: " + result));
+            return  Success("新增成功");
         } else {
             return Error("新增失败");
         }
+        //input.setCreateBy(CurrentUser().getUserName());
     }
 
+    @ApiOperation("启用ivr")
+    @Log(title = "启用ivr",businessType = BusinessType.UPDATE)
+    @GetMapping("/Enable/{id}")
+    public AjaxResult Enable(@PathVariable long id)  {
+        Ivr model=ivrService.getEntity(id);
+        if (model!=null)
+        {
+            if(model.getState()==0)
+            {
+                return  Error("当前ivr还未生成");
+            }
+            LambdaUpdateWrapper<Ivr> qu=new LambdaUpdateWrapper<>();
+            qu .eq(Ivr::getIsEnable,1L);
+            qu.set(Ivr::getIsEnable,0L);
+            ivrService.updateBatch(qu);
+            model.setIsEnable(1L);
+            HttpHelper.sendGet(middlewareUrl+"/ivr/delete");
+            if (ivrService.update(model))
+            {
+                return  Success("启用成功");
+            }
+            else
+            {
+                return  Error("启用失败");
+            }
+        }
+        else
+        {
+            return  Error("该ivr不存在");
+        }
+    }
+    @ApiOperation("获取当前测试号码")
+    @Log(title = "获取当前测试号码",businessType = BusinessType.QUERY)
+    @GetMapping("/TestPhone")
+    public AjaxResult TestPhone()  {
+        return Success("获取成功",configService.getConfigValue("TestCode"))  ;
+    }
+    @ApiOperation("启用测试ivr")
+    @Log(title = "启用测试ivr",businessType = BusinessType.UPDATE)
+    @GetMapping("/TestEnable/{id}")
+    public AjaxResult TestEnable(@PathVariable long id,@RequestParam String testPhone)  {
+        Ivr model=ivrService.getEntity(id);
+        if (model!=null)
+        {
+            if(model.getState()==0)
+            {
+                return  Error("当前ivr还未生成");
+            }
+            if(model.getIsEnable()==1)
+            {
+                return  Error("当前ivr已启用不可设置为测试ivr");
+            } else if (model.getIsEnable()==2) {
+                return  Error("当前ivr已被设置为测试ivr不用重复设置");
+            }
+            if (StringHelper.isNotEmpty(testPhone))
+            {   String phone1= testPhone.trim();
+                if (phone1.length()!=11)
+                {
+                    return Error("请输入正确的测试手机号码");
+                }
+                String fix = ""; String bfix = ""; String wfix = "0";
+                String zipcode = "0371";
+                int zip = GetZipCodeByPhone(phone1, zipcode);
+                if (zip == 1)
+                {
+                    fix = bfix;
+                }
+                else if (zip == 2)
+                {
+                    fix = wfix;
+                }
+                phone1=fix+phone1;
+                LambdaUpdateWrapper<RepConfig> qr=new LambdaUpdateWrapper<>();
+                qr .eq(RepConfig::getCode,"TestCode");
+                qr.set(RepConfig::getValue,phone1);
+                configService.updateBatch(qr);
 
-
+            }
+            //取消之前的测试ivr
+            LambdaUpdateWrapper<Ivr> qu=new LambdaUpdateWrapper<>();
+            qu .eq(Ivr::getIsEnable,2L);
+            qu.set(Ivr::getIsEnable,0L);
+            ivrService.updateBatch(qu);
+            HttpHelper.sendGet(middlewareUrl+"/ivr/deleteTest");
+            model.setIsEnable(2L);
+            if (ivrService.update(model))
+            {
+                return  Success("启用成功");
+            }
+            else
+            {
+                return  Error("启用失败");
+            }
+        }
+        else
+        {
+            return  Error("该ivr不存在");
+        }
+    }
     @ApiOperation("编辑")
     @Log(title = "编辑call_ivr",businessType = BusinessType.UPDATE)
     @PutMapping
@@ -88,10 +229,17 @@ public class IvrController extends BaseController {
             return Error("此名称已经存在");
         }
         input.setUpdateBy(CurrentUser().getUserName());
+        input.setState(0L);
         input.setUpdateTime(new Date());
-        boolean result = ivrService.update(input);
-        if (result) {
-            return Success("成功");
+        boolean n = ivrService.update(input);
+        if (n) {
+            CompletableFuture.supplyAsync(() -> {
+                ivrService.dealIvr(input);
+                input.setState(1L);
+                ivrService.update(input);
+                return null;
+            }).thenAccept(result -> System.out.println("Result: " + result));
+            return  Success("成功");
         } else {
             return Error("修改失败");
         }
@@ -118,5 +266,79 @@ public class IvrController extends BaseController {
                 "]";
         return Success("成功", JSON.parseArray(json));
     }
+    /// <summary>
+    /// 根据号码和区号判断号码是否为归属地号码
+    /// 返回0为分机号或特殊号码
+    /// 返回1为本地号码
+    /// 返回2为外地号码
+    /// </summary>
+    /// <param name="phone"></param>
+    /// <param name="zipcode"></param>
+    /// <returns></returns>
+    private int GetZipCodeByPhone(String phone,String zipcode)
+    {
+        int res = 0;
+        if (phone.length() >= 7)
+        {
+            //7位及7位以上是固定电话或手机
+            //判断是否手机
+            if (phone.length() == 11 && phone.charAt(0) == '1')
+            {//号码为11位，首位是1，为手机号
+                LambdaQueryWrapper<Mobile> qw = new LambdaQueryWrapper<>();
+                qw.eq( Mobile::getMobilePrefix, phone.substring(0,7));
+                var mobileModel=mobileService.getEntity(qw);
+                if (mobileModel != null)
+                {
+                    if (mobileModel.getLocationCode().equals(zipcode))
+                    {
+                        res = 1;
+                    }
+                    else
+                    {
+                        res = 2;
+                    }
+                }
+            }
+            else
+            {
+                if (phone.length()== 11 && phone.substring(0, 3).equals(zipcode))
+                {//号码为11位
+                    //截取前三位区号判断是否本地
+                    boolean resbd3 = phone.substring(0, 3).equals(zipcode);
+                    //截取前四位区号判断是否本地
+                    boolean resbd4 = phone.substring(0, 4).equals(zipcode);
+                    if (resbd3 || resbd4)
+                    {
+                        res = 3;
+                    }
+                    else
+                    {
+                        res = 4;
+                    }
+                }
+                else if (phone.length() < 11)
+                {//号码小于11位，为本地
+                    if (phone.substring(0, 1).equals("0"))
 
+                    {
+                        if (phone.substring(0, 4).equals(zipcode))
+                            res = 3;
+                        else
+                            res = 4;
+                    }
+                    else
+                        res = 3;
+                }
+                else if (phone.length() > 11 && phone.substring(0, 4).equals(zipcode))
+                {//号码大于11位，截取前四位区号判断是否本地
+                    res = 3;
+                }
+                else
+                {
+                    res = 4;
+                }
+            }
+        }
+        return res;
+    }
 }

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

@@ -6,7 +6,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.8:3306/hjzx_rjmx?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.8:3306/hjzx_xy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
     username: root
     password: 800100
 
@@ -76,3 +76,4 @@ spring:
   isNote: 1
   pushUrl: 192.168.1.15:8320/Home/receiveCall
   curlUrl: http://192.168.1.15:8320/
+  middlewareUrl: http://192.168.1.19: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-entity/src/main/java/api/entity/database/call/Ivr.java

@@ -59,4 +59,11 @@ public class Ivr {
     /** 删除时间 */
     @ApiModelProperty("删除时间")
     private Date delTime;
+    /** 是否启用0否1是 */
+    @ApiModelProperty("是否启用0否1是")
+    private Long isEnable;
+    /** 0生成中1已生成 */
+    @ApiModelProperty("0生成中1已生成")
+    private Long state;
+
 }

hjzx-entity/src/main/java/api/entity/database/call/RepConfig.java

@@ -0,0 +1,25 @@
+package api.entity.database.call;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@TableName("rep_config")
+public class RepConfig {
+    /** 自增主键 */
+    @ApiModelProperty("自增主键")
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+    /** 编码 */
+    @ApiModelProperty("编码")
+    private String code;
+    /** 值 */
+    @ApiModelProperty("值")
+    private String value;
+    /** 描述 */
+    @ApiModelProperty("描述")
+    private String remark;
+}

hjzx-mapper/src/main/java/api/mapper/call/RepConfigMapper.java

@@ -0,0 +1,9 @@
+package api.mapper.call;
+
+import api.entity.database.call.RepConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RepConfigMapper extends BaseMapper<RepConfig> {
+}

hjzx-service/src/main/java/api/service/call/IIvrService.java

@@ -4,4 +4,7 @@ import api.entity.database.call.Ivr;
 import api.service.IBaseService;
 
 public interface IIvrService extends IBaseService<Ivr> {
+    //处理ivr
+    void dealIvr(Ivr entity);
+
 }

hjzx-service/src/main/java/api/service/call/IRepConfigService.java

@@ -0,0 +1,8 @@
+package api.service.call;
+
+import api.entity.database.call.RepConfig;
+import api.service.IBaseService;
+
+public interface IRepConfigService extends IBaseService<RepConfig> {
+    String getConfigValue(String code);
+}

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

@@ -2,22 +2,31 @@ 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.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Data;
 import lombok.var;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import org.w3c.dom.*;
+import org.w3c.dom.Node;
+
+import javax.xml.parsers.*;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -26,18 +35,25 @@ 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);
+       // dealIvr(entity);
+       // HttpHelper.sendGet(middlewareUrl+"/ivr/delete");
         return this.save(entity);
     }
 
     //编辑
     @Override
     public boolean update(Ivr entity) {
-        dealIvr(entity);
+       // dealIvr(entity);
+       // HttpHelper.sendGet(middlewareUrl+"/ivr/delete");
         return this.updateById(entity);
     }
 
@@ -70,7 +86,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" +
@@ -108,7 +124,8 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             "                </menu>\n";
 
     //处理ivr
-    private void dealIvr(Ivr entity){
+    @Override
+    public void dealIvr(Ivr entity){
         ObjectMapper objectMapper = new ObjectMapper();
         List<IvrProperties> propertiesList=new ArrayList<>();
         List<IvrEdges> edgesList=new ArrayList<>();
@@ -174,17 +191,19 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                             "<document type=\"freeswitch/xml\">\n" +
                             "    <section name=\"dialplan\">\n" +
                             contextDefault +
-                            "        <context name=\"public\">\n" +
+                            "     <context name=\"public\">\n" +
                             "            <extension name=\"public_1\">\n" +
                             "                <condition field=\"destination_number\" expression=\"^(.*)$\">\n" +
                             "                    <action application=\"sleep\" data=\"1000\"/>\n" +
                             "                    <action application=\"answer\"/>\n" +
-                            "                    <action application=\"set\" data=\"basenumber=$1\"/>\n" +
-                            "                    <action application=\"set\" data=\"wait=0\"/>\n" +
-                            "                    <action application=\"transfer\" data=\"$1 XML " + toNode.getProperties().getName() + toNode.getId()+ "\"/>\n" +
+                            "                    <action application=\"odbc_query\" inline=\"true\" data=\"call proc_IVRFirst('${uuid}','${caller_id_number}','$1','${network_addr}')\"/>\n" +
+                            (toNode.getType().equals(IvrType.audiodtmf)?
+                            "                    <action application=\"sleep\" data=\"1000\"/>\n " +
+                            "                    <action application=\"ivr\" data=\""+toNode.getProperties().getName()+ toNode.getId()+"\"/>\n":
+                            "                    <action application=\"transfer\" data=\"${destination_number} XML "+toNode.getProperties().getName()+ toNode.getId()+"\"/>\n")+
                             "                </condition>\n" +
                             "            </extension>\n" +
-                            "        </context>\n" +
+                            "        </context>\n"+
                             contextXml +
                             "    </section>\n" +
                             "</document>";
@@ -210,11 +229,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();
@@ -227,18 +249,18 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             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("\" ");
+                mxml.append("greet-long").append("=\"").append(GetPath(data.get("file").toString())).append("\" ");
+                mxml.append("greet-short").append("=\"").append(GetPath(data.get("greetShortUrl").toString())).append("\" ");
+                mxml.append("invalid-sound").append("=\"").append(GetPath(data.get("invalidSoundUrl").toString())).append("\" ");
+                mxml.append("exit-sound").append("=\"").append(GetPath(data.get("xitSoundUrl").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("greet-long").append("=\"").append(GetPath(TtsHelper.TextToSpeech(data.get("content").toString())  )).append("\" ");
+                mxml.append("greet-short").append("=\"").append(GetPath(TtsHelper.TextToSpeech(data.get("greetShort").toString()))).append("\" ");
+                mxml.append("invalid-sound").append("=\"").append(GetPath(TtsHelper.TextToSpeech(data.get("invalidSound").toString()))).append("\" ");
+                mxml.append("exit-sound").append("=\"").append(GetPath(TtsHelper.TextToSpeech(data.get("xitSound").toString()))).append("\" ");
 
             }
             mxml.append("confirm-macro").append("=\"").append("\" ");
@@ -247,10 +269,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) {
@@ -283,9 +305,9 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                 }
                 IvrProperties toNode = nodes.stream().filter(p -> p.getId().equals(path.getTargetNodeId())).findFirst().get();
                 if (toNode.getType().equals(IvrType.audiodtmf)) {
-                    xml.append("                    <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
+                    xml.append("   <action application=\"sleep\" data=\"1000\"/>\n      <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 } else {
-                    xml.append("                    <action application=\"transfer\" data=\"${destination_number} XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
+                    xml.append("     <action application=\"transfer\" data=\"${destination_number} XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 }
                 xml.append("                </condition>\n");
                 xml.append("            </extension>\n");
@@ -312,9 +334,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");
+                                }
+
+
                             }
                         }
                     }
@@ -342,7 +375,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                 }
                 IvrProperties toNode = nodes.stream().filter(p -> p.getId().equals(path.getTargetNodeId())).findFirst().get();
                 if (toNode.getType().equals(IvrType.audiodtmf)) {
-                    xml.append("                    <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
+                    xml.append("           <action application=\"sleep\" data=\"1000\"/>\\n            <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 } else {
                     xml.append("                    <action application=\"transfer\" data=\"${destination_number} XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 }
@@ -372,11 +405,11 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                 case audio:
                     if(Objects.equals(data.get("type").toString(), "audio"))
                     {
-                        xml.append("                    <action application=\"playback\" data=\"").append(data.get("file").toString()).append("\"/>\n");
+                        xml.append("         <action application=\"sleep\" data=\"1000\"/>\n             <action application=\"playback\" data=\"").append(GetPath(data.get("file").toString())).append("\"/>\n");
                     }
                     else
                     {
-                        xml.append("                    <action application=\"playback\" data=\"").append(TtsHelper.TextToSpeech(data.get("content").toString())).append("\"/>\n");
+                        xml.append("         <action application=\"sleep\" data=\"1000\"/>\n                 <action application=\"playback\" data=\"").append(GetPath(TtsHelper.TextToSpeech(data.get("content").toString()))).append("\"/>\n");
                     }
                     break;
                 case queue:
@@ -420,6 +453,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) {
@@ -427,7 +464,7 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
                 IvrEdges path = nodePaths.get(0);
                 IvrProperties toNode = nodes.stream().filter(p -> p.getId().equals(path.getTargetNodeId())).findFirst().get();
                 if (toNode.getType().equals(IvrType.audiodtmf)) {
-                    xml.append("                    <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
+                    xml.append("     <action application=\"sleep\" data=\"1000\"/>\n                     <action application=\"ivr\" data=\"").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 } else {
                     xml.append("                    <action application=\"transfer\" data=\"${destination_number} XML ").append(toNode.getProperties().getName()).append( toNode.getId()).append("\"/>\n");
                 }
@@ -445,4 +482,37 @@ public class IvrServiceImpl extends BaseServiceImpl<IvrMapper, Ivr> implements I
             return xml;
         }
     }
+
+    private  static String GetPath(String filePath)
+    {
+        try
+        {
+            File file = new File(filePath);
+            ObjectMapper mapper = new ObjectMapper();
+            String json= HttpHelper.sendUploadFile(middlewareUrl+"/Home/UploadSpeech",file);
+            AjaxResult ajaxResult = mapper.readValue(json, AjaxResult.class);
+            if (Objects.equals(ajaxResult.state, "success"))
+            {
+                return  ajaxResult.data.toString();
+            }
+            else
+            {
+                return  "";
+            }
+        }
+        catch (Exception e)
+        {
+
+            return  "";
+        }
+
+    }
+    @Data
+    private  static class AjaxResult {
+        private String state;
+        private String message;
+        private Object data;
+    }
+
+
 }

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

@@ -0,0 +1,27 @@
+package api.service.call.impl;
+
+import api.entity.database.call.RepConfig;
+import api.mapper.call.RepConfigMapper;
+import api.service.BaseServiceImpl;
+import api.service.call.IRepConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+import java.util.List;
+import java.util.stream.Collectors;
+@Transactional
+@Service
+public class RepConfigServiceImpl extends BaseServiceImpl<RepConfigMapper, RepConfig> implements IRepConfigService {
+    public RepConfigServiceImpl(){ super(true); }
+
+    @Override
+    public String getConfigValue(String code) {
+        List<RepConfig> configs = getList().stream().filter(p->p.getCode().equals(code)).collect(Collectors.toList());
+        if (configs.size()>0) {
+            return configs.get(0).getValue();
+        } else {
+            return null;
+        }
+    }
+}

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/HttpHelper.java

@@ -20,10 +20,7 @@ import org.springframework.stereotype.Component;
 
 import javax.net.ssl.*;
 import java.io.*;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
+import java.net.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
@@ -45,6 +42,11 @@ public class HttpHelper {
         return sendGet(url, "");
     }
 
+    public static String sendUploadFile(String url,File file) throws IOException {
+        return uploadFile(url, file);
+    }
+
+
     /**
      * 向指定 URL 发送GET方法的请求
      *
@@ -374,7 +376,43 @@ public class HttpHelper {
             httpClient.close();
         }
     }
+    public static String uploadFile(String apiUrl, File file) throws IOException {
+        String BOUNDARY = "----WebKitFormBoundary" + System.currentTimeMillis();
+        HttpURLConnection conn = (HttpURLConnection) new URL(apiUrl).openConnection();
+        conn.setDoOutput(true);
+        conn.setRequestMethod("POST");
+        conn.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + BOUNDARY);
 
+        try (OutputStream os = conn.getOutputStream();
+             InputStream is = new FileInputStream(file)) {
+            // 构建请求体
+            String header = "--" + BOUNDARY + "\r\n" +
+                    "Content-Disposition: form-data; name=\"file\"; filename=\"" + file.getName() + "\"\r\n" +
+                    "Content-Type: application/octet-stream\r\n\r\n";
+            os.write(header.getBytes());
+
+            // 写入文件流
+            byte[] buffer = new byte[4096];
+            int bytesRead;
+            while ((bytesRead = is.read(buffer)) != -1) {
+                os.write(buffer, 0, bytesRead);
+            }
+            os.write(("\r\n--" + BOUNDARY + "--\r\n").getBytes());
+        }
+        StringBuilder result=new StringBuilder();
+        // 处理响应
+        if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+            try (InputStream resIs = conn.getInputStream()) {
+                BufferedReader reader = new BufferedReader(new InputStreamReader(resIs));
+                String line;
+                while ((line = reader.readLine()) != null)
+                {
+                    result.append(line);
+                }
+            }
+        }
+        return result.toString();
+    }
     /**
      * 简化版 - 发送 form-data 格式的 POST 请求(不带请求头)
      *

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 filePath;
     }
 
     public static String TextToSpeechAgent(String word, String filename) {