修改

midware-entity/src/main/java/midware/entity/database/rep/Ai.java

@@ -25,6 +25,12 @@ public class Ai {
     /** 内容 */
     //@ApiModelProperty("内容")
     private String result;
+    /** 意图id */
+    //@ApiModelProperty("意图id")
+    private Integer nluId;
+    /** 意图名称 */
+    //@ApiModelProperty("意图名称")
+    private String nluName;
     /** 创建时间 */
     //@ApiModelProperty("创建时间")
     private Date createTime;

midware-service/src/main/java/midware/service/eslclient/EslEventListenerAi.java

@@ -3,6 +3,7 @@ package midware.service.eslclient;
 import com.alibaba.fastjson2.JSON;
 import lombok.extern.slf4j.Slf4j;
 import midware.entity.database.rep.Ai;
+import midware.service.eslclient.entity.Channel;
 import midware.service.init.EslClientService;
 import midware.util.enums.EslEventEnum;
 import midware.util.helper.HttpHelper;
@@ -88,6 +89,105 @@ public class EslEventListenerAi implements IEslEventListener {
     public void backgroundJobResultReceived(EslEvent event) {}
 
     //ai回答
+//    private void aiAnswer(String chanId, String text) {
+//        EslClientService eslClientService = SpringHelper.getBean(EslClientService.class);
+//        eslClientService.playBreak(chanId);
+//        eslClientService.playBack("/home/wav/zyyt/好的.wav", chanId);
+//
+//        Ai ai = new Ai();
+//        ai.setUuid(chanId);
+//        ai.setType(1);
+//        ai.setResult(text);
+//        ai.setCreateTime(new Date());
+//        synchronized (EslCommon.ais) {
+//            EslCommon.ais.add(ai);
+//        }
+//        List<String> stops = Arrays.asList("停", "停止", "暂停", "闭嘴", "住口", "别说了", "行了", "好了", "够了", "烦死了", "打住", "跳过", "不需要了", "等一下", "不用说了");
+//        List<String> agains = Arrays.asList("再听一遍", "重听", "重庆", "你听", "没有听清", "听不清", "再说一遍");
+//        String zw = text.replaceAll("[^\\u4e00-\\u9fa5]", "");
+//        if (text.contains("人工")) {//人工
+//            stopAsr(chanId, eslClientService);
+//            eslClientService.playBack("/home/wav/zyyt/转人工.wav", chanId);
+//            try {
+//                Thread.sleep(3000);
+//                eslClientService.transferQueue(chanId);
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
+//        } else if (agains.contains(zw)) {//重听
+//            eslClientService.playBack(EslCommon.getSessionById(chanId).getVideoPath(), chanId);
+//            try {
+//                Thread.sleep(2000);
+//                resumeAsr(chanId, eslClientService);
+//            } catch (InterruptedException e) {
+//                throw new RuntimeException(e);
+//            }
+//        } else if (stops.contains(zw)) {//停止
+//            resumeAsr(chanId, eslClientService);
+//        } else {
+//            if (text.length() > 5) {
+//                String rt = "无效输入";
+//                Map<String, String> ps = new HashMap<>();
+////                ps.put("text",text);
+////                String result = HttpHelper.post("http://192.168.1.7:3000/predict", JSON.toJSONString(ps));
+////                if (StringHelper.isNotEmpty(result)) {
+////                    Map map = JSON.parseObject(result, Map.class);
+////                    if (map.get("success").toString().equals("true")) {
+////                        List<Map> maps = JSON.parseArray(map.get("predictions").toString(), Map.class);
+////                        Map rtMap = maps.get(0);
+////                        rt = rtMap.get("label").toString();
+////                        float bl = Float.parseFloat(rtMap.get("confidence").toString());
+////                        if (bl >= 0.4) rt = "无效输入(" + rt + "-" + bl + ")";
+////                    }
+////                }
+//                ps.put("sender", String.valueOf(System.currentTimeMillis()));
+//                ps.put("message", text);
+//                String url=SpringHelper.getRequiredProperty("common.rasa");
+//                String result = HttpHelper.post(url, JSON.toJSONString(ps));
+//                if (StringHelper.isNotEmpty(result)) {
+//                    List<Map> maps = JSON.parseArray(result, Map.class);
+//                    rt = maps.get(0).get("text").toString();
+//                }
+//                if (!rt.startsWith("无效输入")) {
+//                    String path = "/home/wav/zyyt/" + rt + ".wav";
+//                    EslCommon.getSessionById(chanId).setVideoPath(path);
+//                    eslClientService.playBack(path, chanId);
+//                    try {
+//                        Thread.sleep(2000);
+//                        resumeAsr(chanId, eslClientService);
+//                    } catch (InterruptedException e) {
+//                        throw new RuntimeException(e);
+//                    }
+//                } else {
+//                    eslClientService.playBack("/home/wav/zyyt/无法回答转人工.wav", chanId);
+//                    stopAsr(chanId, eslClientService);
+//                    try {
+//                        Thread.sleep(5000);
+//                        eslClientService.transferQueue(chanId);
+//                    } catch (InterruptedException e) {
+//                        throw new RuntimeException(e);
+//                    }
+//                }
+//                Ai ai1 = new Ai();
+//                ai1.setUuid(chanId);
+//                ai1.setType(2);
+//                ai1.setResult(rt);
+//                ai1.setCreateTime(new Date());
+//                synchronized (EslCommon.ais) {
+//                    EslCommon.ais.add(ai1);
+//                }
+//            } else {
+//                eslClientService.playBack("/home/wav/zyyt/时间太短请重说.wav", chanId);
+//                try {
+//                    Thread.sleep(2000);
+//                    resumeAsr(chanId, eslClientService);
+//                } catch (InterruptedException e) {
+//                    throw new RuntimeException(e);
+//                }
+//            }
+//        }
+//    }
+
     private void aiAnswer(String chanId, String text) {
         EslClientService eslClientService = SpringHelper.getBean(EslClientService.class);
         eslClientService.playBreak(chanId);
@@ -98,92 +198,78 @@ public class EslEventListenerAi implements IEslEventListener {
         ai.setType(1);
         ai.setResult(text);
         ai.setCreateTime(new Date());
-        synchronized (EslCommon.ais) {
-            EslCommon.ais.add(ai);
-        }
-        List<String> stops = Arrays.asList("停", "停止", "暂停", "闭嘴", "住口", "别说了", "行了", "好了", "够了", "烦死了", "打住", "跳过", "不需要了", "等一下", "不用说了");
-        List<String> agains = Arrays.asList("再听一遍", "重听", "重庆", "你听", "没有听清", "听不清", "再说一遍");
-        String zw = text.replaceAll("[^\\u4e00-\\u9fa5]", "");
-        if (text.contains("人工")) {//人工
-            stopAsr(chanId, eslClientService);
-            eslClientService.playBack("/home/wav/zyyt/转人工.wav", chanId);
-            try {
-                Thread.sleep(3000);
-                eslClientService.transferQueue(chanId);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
-            }
-        } else if (agains.contains(zw)) {//重听
-            eslClientService.playBack(EslCommon.getSessionById(chanId).getVideoPath(), chanId);
-            try {
-                Thread.sleep(2000);
-                resumeAsr(chanId, eslClientService);
-            } catch (InterruptedException e) {
-                throw new RuntimeException(e);
+
+        if (text.length() > 5) {
+            String rt = "无效输入";
+            Map<String, String> ps = new HashMap<>();
+            ps.put("sender", String.valueOf(System.currentTimeMillis()));
+            ps.put("message", text);
+            String url = SpringHelper.getRequiredProperty("common.rasa");
+            String result = HttpHelper.post(url, JSON.toJSONString(ps));
+            if (StringHelper.isNotEmpty(result)) {
+                List<Map> maps = JSON.parseArray(result, Map.class);
+                rt = maps.get(0).get("text").toString();
             }
-        } else if (stops.contains(zw)) {//停止
-            resumeAsr(chanId, eslClientService);
-        } else {
-            if (text.length() > 5) {
-                String rt = "无效输入";
-                Map<String, String> ps = new HashMap<>();
-//                ps.put("text",text);
-//                String result = HttpHelper.post("http://192.168.1.7:3000/predict", JSON.toJSONString(ps));
-//                if (StringHelper.isNotEmpty(result)) {
-//                    Map map = JSON.parseObject(result, Map.class);
-//                    if (map.get("success").toString().equals("true")) {
-//                        List<Map> maps = JSON.parseArray(map.get("predictions").toString(), Map.class);
-//                        Map rtMap = maps.get(0);
-//                        rt = rtMap.get("label").toString();
-//                        float bl = Float.parseFloat(rtMap.get("confidence").toString());
-//                        if (bl >= 0.4) rt = "无效输入(" + rt + "-" + bl + ")";
-//                    }
-//                }
-                ps.put("sender", String.valueOf(System.currentTimeMillis()));
-                ps.put("message", text);
-                String url=SpringHelper.getRequiredProperty("common.rasa");
-                String result = HttpHelper.post(url, JSON.toJSONString(ps));
-                if (StringHelper.isNotEmpty(result)) {
-                    List<Map> maps = JSON.parseArray(result, Map.class);
-                    rt = maps.get(0).get("text").toString();
-                }
-                if (!rt.startsWith("无效输入")) {
-                    String path = "/home/wav/zyyt/" + rt + ".wav";
-                    EslCommon.getSessionById(chanId).setVideoPath(path);
-                    eslClientService.playBack(path, chanId);
-                    try {
-                        Thread.sleep(2000);
-                        resumeAsr(chanId, eslClientService);
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                } else {
-                    eslClientService.playBack("/home/wav/zyyt/无法回答转人工.wav", chanId);
-                    stopAsr(chanId, eslClientService);
-                    try {
-                        Thread.sleep(5000);
-                        eslClientService.transferQueue(chanId);
-                    } catch (InterruptedException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-                Ai ai1 = new Ai();
-                ai1.setUuid(chanId);
-                ai1.setType(2);
-                ai1.setResult(rt);
-                ai1.setCreateTime(new Date());
-                synchronized (EslCommon.ais) {
-                    EslCommon.ais.add(ai1);
+            if (!rt.startsWith("无效输入")) {
+                String[] rts = rt.split("\\|");
+                ai.setNluId(Integer.valueOf(rts[0]));
+                ai.setNluName(rts[1]);
+                switch (rts[2]) {
+                    case "1"://放音
+                        eslClientService.playBack(rts[3], chanId);
+                        try {
+                            Thread.sleep(2000);
+                            resumeAsr(chanId, eslClientService);
+                        } catch (InterruptedException e) {
+                            throw new RuntimeException(e);
+                        }
+                        break;
+                    case "2"://转人工
+                        stopAsr(chanId, eslClientService);
+                        eslClientService.playBack("/home/wav/zyyt/转人工.wav", chanId);
+                        try {
+                            Thread.sleep(3000);
+                            eslClientService.transferQueue(chanId);
+                        } catch (InterruptedException e) {
+                            throw new RuntimeException(e);
+                        }
+                        break;
+                    case "3"://api
+                        break;
+                    case "4"://挂机
+                        eslClientService.killApp(chanId);
+                        break;
+                    case "5"://转移
+                        Channel cl = EslCommon.getChanById(chanId);
+                        eslClientService.transfer(chanId, cl.getNumber(), rts[3], "");
+                        break;
                 }
+
             } else {
-                eslClientService.playBack("/home/wav/zyyt/时间太短请重说.wav", chanId);
+                eslClientService.playBack("/home/wav/zyyt/无法回答转人工.wav", chanId);
+                stopAsr(chanId, eslClientService);
                 try {
-                    Thread.sleep(2000);
-                    resumeAsr(chanId, eslClientService);
+                    Thread.sleep(5000);
+                    eslClientService.transferQueue(chanId);
                 } catch (InterruptedException e) {
                     throw new RuntimeException(e);
                 }
             }
+
+            ai.setType(2);
+            ai.setResult(rt);
+            ai.setCreateTime(new Date());
+            synchronized (EslCommon.ais) {
+                EslCommon.ais.add(ai);
+            }
+        } else {
+            eslClientService.playBack("/home/wav/zyyt/时间太短请重说.wav", chanId);
+            try {
+                Thread.sleep(2000);
+                resumeAsr(chanId, eslClientService);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
         }
     }