From 2cba0d00dc45998105129a0c26cb546282cd39a8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 05 六月 2024 13:44:23 +0800
Subject: [PATCH] 随访功能测试：模板、任务、定时发送、公众号发送，流程走通
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
index d38093c..738811e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.smartor;
+import com.github.pagehelper.ISelect;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.HttpStatus;
@@ -9,16 +10,20 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DtoConversionUtils;
import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.smartor.domain.IvrTask;
+import com.smartor.domain.IvrTaskScriptQues;
import com.smartor.domain.IvrTaskVO;
import com.smartor.domain.IvrTaskSingle;
import com.smartor.service.IIvrTaskService;
import com.smartor.service.IIvrTaskSingleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +37,7 @@
* @author smartor
* @date 2023-03-24
*/
+@Slf4j
@Api(description = "闅忚浠诲姟")
@RestController
@RequestMapping("/smartor/ivrtask")
@@ -41,6 +47,12 @@
@Autowired
private IIvrTaskSingleService iIvrTaskCallService;
+
+ @Value("${pub_key}")
+ private String pub_key;
+
+ @Value("${pri_key}")
+ private String pri_key;
/**
* 鏌ヨ璇煶浠诲姟鍒楄〃
@@ -52,13 +64,6 @@
PageUtils.startPageByPost(ivrTask.getPageNum(), ivrTask.getPageSize());
List<IvrTask> list = ivrTaskService.selectIvrTaskList(ivrTask);
List<IvrTaskVO> ivrTaskVOS = DtoConversionUtils.sourceToTarget(list, IvrTaskVO.class);
-
- //璁剧疆鍒嗛〉
- TableDataInfo rspData = new TableDataInfo();
- rspData.setCode(HttpStatus.SUCCESS);
- rspData.setMsg("鏌ヨ鎴愬姛");
- rspData.setRows(null);
- rspData.setTotal(0);
if (CollectionUtils.isNotEmpty(ivrTaskVOS)) {
for (IvrTaskVO ivrTaskVO : ivrTaskVOS) {
@@ -74,18 +79,20 @@
ivrTaskVO.setWfs(wfs);
}
}
+ //鑾峰彇total
+ long total = PageUtils.count(new ISelect() {
+ @Override
+ public void doSelect() {
+ ivrTask.setPageNum(null);
+ ivrTask.setPageSize(null);
+ ivrTaskService.selectIvrTaskList(ivrTask);
+ }
+ });
- //鐢ㄤ簬鍒嗛〉
- ivrTask.setPageNum(null);
- ivrTask.setPageSize(null);
- List<IvrTask> ivrTasks = ivrTaskService.selectIvrTaskList(ivrTask);
- rspData.setCode(HttpStatus.SUCCESS);
- rspData.setMsg("鏌ヨ鎴愬姛");
- rspData.setRows(ivrTaskVOS);
- rspData.setTotal(new PageInfo(ivrTasks).getTotal());
+ return getDataTable2(total, ivrTaskVOS);
}
- return rspData;
+ return getDataTable2(0, ivrTaskVOS);
}
/**
@@ -156,5 +163,19 @@
return toAjax(ivrTaskService.deleteIvrTaskByTaskid(taskId));
}
+ /**
+ * 閫氳繃浠诲姟ID鍜屾偅鑰匢D鑾峰彇鍗曚釜浜虹殑棰樼洰淇℃伅
+ *
+ * @return
+ */
+ @ApiOperation("閫氳繃浠诲姟ID鍜屾偅鑰匢D鑾峰彇鍗曚釜浜虹殑棰樼洰淇℃伅")
+ @PostMapping("/getScriptInfoByCondition")
+ public TableDataInfo getScriptInfoByCondition(@RequestBody IvrTaskScriptQues ivrTaskScriptQues) {
+ RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
+ Long tid = Long.valueOf(rsaPublicKeyExample.decryptedData(ivrTaskScriptQues.getParam1(), pri_key));
+ Long pid = Long.valueOf(rsaPublicKeyExample.decryptedData(ivrTaskScriptQues.getParam2(), pri_key));
+ log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
+ return getDataTable(ivrTaskService.getScriptInfoByCondition(tid, pid));
+ }
}
--
Gitblit v1.9.3