From e52b0e34fc06372aab64c30b526ec289b99c9af7 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 19 六月 2024 10:43:47 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java index eefd066..8bfbfd5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskSingleController.java @@ -3,15 +3,20 @@ 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.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.smartor.domain.*; +import com.smartor.domain.robot.back.RobotAIDialogBack; +import com.smartor.domain.robot.back.RobotCallBack; import com.smartor.service.IIvrTaskSingleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -25,13 +30,13 @@ * @author ruoyi * @date 2024-02-02 */ +@Slf4j @Api(description = "鍗曚竴浠诲姟锛堥殢璁垮鏁欙級") @RestController @RequestMapping("/smartor/tasksingle") public class IvrTaskSingleController extends BaseController { @Autowired private IIvrTaskSingleService ivrTaskcallService; - /** * 鏌ヨ鎮h�呴殢璁夸俊鎭� @@ -72,8 +77,12 @@ @PreAuthorize("@ss.hasPermi('system:task:add')") @Log(title = "鍗曚竴浠诲姟锛堥殢璁匡級", businessType = BusinessType.INSERT) @PostMapping("/insertOrUpdateTask") - public AjaxResult insertOrUpdateHeTask(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { - return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskcallVO)); + public AjaxResult insertOrUpdateHeTask(@RequestBody IvrTaskVO ivrTaskVO) { + + LoginUser loginUser = getLoginUser(); + SysUser user = loginUser.getUser(); + ivrTaskVO.setCreateBy(user.getNickName()); + return toAjax(ivrTaskcallService.insertOrUpdateTask(ivrTaskVO)); } /** @@ -84,29 +93,19 @@ public AjaxResult queryTaskByCondition(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { //鏍规嵁鍏ュ弬鏌ヨ淇℃伅 IvrTaskSingle ivrTaskcall = DtoConversionUtils.sourceToTarget(ivrTaskcallVO, IvrTaskSingle.class); - IvrTaskSingleVO ivrTaskSingleVO = ivrTaskcallService.queryTaskByCondition(ivrTaskcall); - return success(ivrTaskSingleVO); + IvrTaskVO ivrTaskVO = ivrTaskcallService.queryTaskByCondition(ivrTaskcall); + return success(ivrTaskVO); } - /** - * 浠诲姟鍙戦�佹墽琛� - */ - @ApiOperation("浠诲姟鍙戦�佹墽琛�") - @PostMapping("/heTaskSend") - public AjaxResult heTaskSend(@RequestBody IvrTaskSingleVO ivrTaskcallVO) { - return toAjax(ivrTaskcallService.heTaskSend(ivrTaskcallVO)); - } - - - /** - * 鐢佃瘽鍥炶皟浠诲姟 + * 鐢佃瘽鍥炶皟浠诲姟(涓婃捣) */ @ApiOperation("鐢佃瘽鍥炶皟浠诲姟") @PostMapping("/phoneCallBack") public AjaxResult phoneCallBack(@RequestBody PhoneCallBackVO phoneCallBackVO) { - //濡傛灉uuid鍦╮edis涓壘涓嶅埌锛岄偅灏辩洿鎺ユ姤寮傚父 - return success(ivrTaskcallService.phoneCallBack(phoneCallBackVO)); +// log.error("鐢佃瘽鍥炶皟浠诲姟鎴愬姛浜嗕笉锛焮}", phoneCallBackVO); + ivrTaskcallService.phoneCallBack(phoneCallBackVO); + return success(); } } -- Gitblit v1.9.3