yzx vor 1 Tag
Ursprung
Commit
864ada3b3e

+ 36 - 1
ruoyi-admin/src/main/java/com/ruoyi/cc/controller/FsConfController.java

@@ -324,6 +324,16 @@ public class FsConfController extends BaseController {
         return "cc/txasrbridgeconf/txasrbridgeconf";
     }
 
+    /**
+     * ASR(腾讯MPS字幕模块)参数配置
+     * @return
+     */
+    @RequiresPermissions("cc:txasr1bridgeconf:view")
+    @GetMapping(value = "/txasr1bridgeconf")
+    public String txAsr1BridgeConf() {
+        return "cc/txasr1bridgeconf/txasr1bridgeconf";
+    }
+
 
     /**
      * 获取ASR配置
@@ -358,6 +368,17 @@ public class FsConfController extends BaseController {
         return getConfigFileJsonData(asrFileName, 5);
     }
 
+    /**
+     * 获取腾讯 ASR1 模块配置
+     * @return
+     */
+    @GetMapping(value = "/getTxBridgeAsr1Conf")
+    @ResponseBody
+    public AjaxResult getTxBridgeAsr1Conf() {
+        String asrFileName = "/autoload_configs/tx_asr1.conf.xml";
+        return getConfigFileJsonData(asrFileName, 5);
+    }
+
     /**
      * 获取FunASR配置
      * @return
@@ -541,6 +562,19 @@ public class FsConfController extends BaseController {
         return saveAndReloadAsrModule(asrFileName, moduleName, params, "tx");
     }
 
+    /**
+     * 保存腾讯 ASR1 模块配置
+     * @param params
+     * @return
+     */
+    @PostMapping(value = "/setTxBridgeAsr1Conf")
+    @ResponseBody
+    public AjaxResult setTxBridgeAsr1Conf(@RequestBody JSONArray params) {
+        String asrFileName = "/autoload_configs/tx_asr1.conf.xml";
+        String moduleName = "mod_tx_asr1";
+        return saveAndReloadAsrModule(asrFileName, moduleName, params, "tx1");
+    }
+
     /**
      * 保存ASR配置
      * @param params
@@ -640,7 +674,7 @@ public class FsConfController extends BaseController {
 
 
     /**
-     * 设置ASR引擎(mod_xunfei_asr、mod_aliyun_asr、mod_ali_asr、mod_tx_asr)
+     * 设置ASR引擎(mod_xunfei_asr、mod_aliyun_asr、mod_ali_asr、mod_tx_asr、mod_tx_asr1
      * @param asrengine
      * @return
      */
@@ -655,6 +689,7 @@ public class FsConfController extends BaseController {
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_aliyun_asr");
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_ali_asr");
                 EslConnectionUtil.sendSyncApiCommand("unload", "mod_tx_asr");
+                EslConnectionUtil.sendSyncApiCommand("unload", "mod_tx_asr1");
 
                 EslMessage resp = EslConnectionUtil.sendSyncApiCommand("load", asrengine.trim());
                 String text = CommonUtils.ListToString(resp.getBodyLines() , '\n');

+ 5 - 1
ruoyi-admin/src/main/java/com/ruoyi/cc/service/impl/FsConfServiceImpl.java

@@ -230,6 +230,9 @@ public class FsConfServiceImpl implements IFsConfService {
                     if ("mod_tx_asr".equals(element.getAttribute("module"))){
                         return "mod_tx_asr";
                     }
+                    if ("mod_tx_asr1".equals(element.getAttribute("module"))){
+                        return "mod_tx_asr1";
+                    }
                     if ("mod_funasr".equals(element.getAttribute("module"))){
                         return "mod_funasr";
                     }
@@ -264,7 +267,8 @@ public class FsConfServiceImpl implements IFsConfService {
                             || "mod_funasr".equals(element.getAttribute("module"))
                             || "mod_aliyun_asr".equals(element.getAttribute("module"))
                             || "mod_ali_asr".equals(element.getAttribute("module"))
-                            || "mod_tx_asr".equals(element.getAttribute("module"))){
+                            || "mod_tx_asr".equals(element.getAttribute("module"))
+                            || "mod_tx_asr1".equals(element.getAttribute("module"))){
                         existAsrMod = true;
                         if (StringUtils.isNotEmpty(asrengine)) {
                             element.setAttribute("module", asrengine);

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages.properties

@@ -2099,3 +2099,7 @@ callTask.form.asrModels=ASR模型
 callTask.form.asrModels.empty=请选择语音识别模型
 ivr.form.ttsModels=TTS模型
 ivr.form.ttsModels.empty=请选择语音合成模型
+
+switchconf.asr.engine.option8=腾讯ASR1
+switchconf.asr.tx1.header=腾讯ASR1参数配置
+_sys.config.config_asr_provider_tx1=腾讯云MPS

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages_en.properties

@@ -2137,3 +2137,7 @@ callTask.form.asrModels=ASR Models
 callTask.form.asrModels.empty=Please Select ASR Models
 ivr.form.ttsModels=TTS Models
 ivr.form.ttsModels.empty=Please Select TTS Models
+
+switchconf.asr.engine.option8=Tencent Cloud MPS ASR
+switchconf.asr.tx1.header=Tencent Cloud MPS ASR Parameter Configuration
+_sys.config.config_asr_provider_tx1=Tencent Cloud MPS

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages_en_US.properties

@@ -2099,3 +2099,7 @@ callTask.form.asrModels=ASR Models
 callTask.form.asrModels.empty=Please Select ASR Models
 ivr.form.ttsModels=TTS Models
 ivr.form.ttsModels.empty=Please Select TTS Models
+
+switchconf.asr.engine.option8=Tencent Cloud MPS ASR
+switchconf.asr.tx1.header=Tencent Cloud MPS ASR Parameter Configuration
+_sys.config.config_asr_provider_tx1=Tencent Cloud MPS

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages_ja_JP.properties

@@ -2099,3 +2099,7 @@ callTask.form.asrModels=ASR Models
 callTask.form.asrModels.empty=Please Select ASR Models
 ivr.form.ttsModels=TTS Models
 ivr.form.ttsModels.empty=Please Select TTS Models
+
+switchconf.asr.engine.option8=Tencent Cloud MPS ASR
+switchconf.asr.tx1.header=Tencent Cloud MPS ASR Parameter Configuration
+_sys.config.config_asr_provider_tx1=Tencent Cloud MPS

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages_zh.properties

@@ -2137,3 +2137,7 @@ callTask.form.asrModels=ASR模型
 callTask.form.asrModels.empty=请选择语音识别模型
 ivr.form.ttsModels=TTS模型
 ivr.form.ttsModels.empty=请选择语音合成模型
+
+switchconf.asr.engine.option8=腾讯ASR1
+switchconf.asr.tx1.header=腾讯ASR1参数配置
+_sys.config.config_asr_provider_tx1=腾讯云MPS

+ 4 - 0
ruoyi-admin/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -2099,3 +2099,7 @@ callTask.form.asrModels=ASR模型
 callTask.form.asrModels.empty=请选择语音识别模型
 ivr.form.ttsModels=TTS模型
 ivr.form.ttsModels.empty=请选择语音合成模型
+
+switchconf.asr.engine.option8=腾讯ASR1
+switchconf.asr.tx1.header=腾讯ASR1参数配置
+_sys.config.config_asr_provider_tx1=腾讯云MPS

+ 1 - 0
ruoyi-admin/src/main/resources/templates/cc/asrengine/asrengine.html

@@ -23,6 +23,7 @@
                         <option value="mod_xunfei_asr" th:text="#{switchconf.asr.engine.option5}"></option>
                         <option value="mod_chinatelecom_asr" th:text="#{switchconf.asr.engine.option6}"></option>
                         <option value="mod_tx_asr" th:text="#{switchconf.asr.engine.option7}"></option>
+                        <option value="mod_tx_asr1" th:text="#{switchconf.asr.engine.option8}"></option>
                     </select>
                 </div>
             </div>