From 01bbc8f0563b33dd5ce6d59f76c3bae9931615dd Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 05 六月 2024 17:32:07 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java | 58 ++++++++++++++++++---------------------------------------- 1 files changed, 18 insertions(+), 40 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java index 8500f89..2506350 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrLibaTemplateController.java @@ -1,16 +1,17 @@ package com.ruoyi.web.controller.smartor; import com.alibaba.fastjson2.JSON; -import com.google.gson.Gson; +import com.github.pagehelper.util.StringUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.base.BaseException; +import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.config.PhoneUtils; -import com.smartor.config.RabbitMqConfig; +import com.smartor.config.RabbitMqCallPhoneConfig; import com.smartor.domain.IvrLibaTemplate; import com.smartor.domain.IvrLibaTemplateVO; import com.smartor.domain.Test1Vo; @@ -19,19 +20,12 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import org.springframework.amqp.AmqpException; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageBuilder; -import org.springframework.amqp.core.MessagePostProcessor; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 闅忚妯℃澘搴揅ontroller @@ -47,11 +41,14 @@ @Autowired private IIvrLibaTemplateService ivrLibaTemplateService; - @Autowired - private RabbitTemplate rabbitTemplate; +// @Autowired +// private RabbitTemplate rabbitTemplate; @Autowired private PhoneUtils phoneUtils; + + @Autowired + private RabbitMqCallPhoneConfig rabbitMqCallPhoneConfig; /** * 鏌ヨ妯℃澘搴撳垪琛� @@ -60,7 +57,8 @@ @PreAuthorize("@ss.hasPermi('smartor:template:list')") @PostMapping("/list") public TableDataInfo list(@RequestBody IvrLibaTemplate ivrLibaTemplate) { - startPage(); + //鍒嗛〉 + PageUtils.startPageByPost(ivrLibaTemplate.getPageNum(), ivrLibaTemplate.getPageSize()); List<IvrLibaTemplate> list = ivrLibaTemplateService.selectIvrLibaTemplateList(ivrLibaTemplate); return getDataTable(list); } @@ -139,8 +137,8 @@ @ApiOperation("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢") @PostMapping("/selectInfoByCondition") public AjaxResult selectInfoByCondition(@RequestBody IvrLibaTemplateVO ivrLibaTemplateVO) { - if (ObjectUtils.isEmpty(ivrLibaTemplateVO)) { - throw new BaseException("鏌ヨ妯℃澘璇︽儏鍏ュ弬涓虹┖锛岃妫�鏌ュ叆鍙�"); + if (ivrLibaTemplateVO.getID() == null) { + return success(); } return success(ivrLibaTemplateService.selectInfoByCondition(ivrLibaTemplateVO)); } @@ -152,39 +150,19 @@ @PostMapping("/queryRabbitmq") public AjaxResult queryRabbitmq(@RequestBody Test1Vo test1Vo) { -// rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME, "phone.001", "娴嬭瘯鏁版嵁001"); -// rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME, "phone.002", "娴嬭瘯鏁版嵁002"); -// rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME, "phone.003", "娴嬭瘯鏁版嵁003"); -// rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME, routintKey, message, new MessagePostProcessor() { -// @Override -// public Message postProcessMessage(Message message) throws AmqpException { -//// message.getMessageProperties().setDelay(times); -// message.getMessageProperties().getHeaders().put("x-delay", times); -////message.getMessageProperties().setExpiration(); -// return message; -// } -// }); - log.info("-------------鍚姩鍜ㄨ搴旂瓟瓒呮椂鎻愰啋寤惰繜闃熷垪-------------"); String data = JSON.toJSONString(test1Vo.getTestVo()); String substring = data.substring(1, data.length() - 1); + rabbitMqCallPhoneConfig.sendMessage("phone_exchange", "phone.123", substring, test1Vo.getTimes()); - this.rabbitTemplate.convertAndSend(RabbitMqConfig.phone_exchange, RabbitMqConfig.routing_key, substring, message -> { - //娉ㄦ剰杩欓噷鏃堕棿鍙互浣縧ong锛岃�屼笖鏄缃甴eader - message.getMessageProperties().setHeader("x-delay", test1Vo.getTimes()); - return message; - }); log.info("-------------寤惰繜闃熷垪{}ms鍚庢墽琛�.-------------", test1Vo.getTimes()); return success(); } - - /** - * 寮�濮嬫墽琛�(娴嬭瘯鐢�) - */ - @GetMapping("/addUser2") - public AjaxResult addUser2() { - String s = phoneUtils.ob("","","","","","","","3001","",true); - return AjaxResult.success(s); + @GetMapping("/tts") + public AjaxResult tts(@RequestParam("fileText") String fileText, @RequestParam("uuid") String uuid) { + new PhoneUtils().ttsPlayback(fileText, uuid); + return success(); } + } -- Gitblit v1.9.3