From 98d61ad472df848bba78a45b80126687d5ad7529 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 12 十月 2024 18:30:02 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java | 18 +++++++++---------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java | 3 ++-
smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml | 3 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 3 ++-
smartor/src/main/java/com/smartor/domain/PullTaskVO.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 2 +-
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java | 2 +-
smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java | 2 +-
smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml | 5 ++++-
9 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 2c95a25..45edd51 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -195,7 +195,8 @@
if (StringUtils.isEmpty(value)) {
value = "," + serviceSubtask2.getId().toString() + ",";
} else {
- value = value + "," + serviceSubtask2.getId().toString() + ",";
+ if (!value.contains("," + serviceSubtask2.getId().toString()))
+ value = value + "," + serviceSubtask2.getId().toString() + ",";
}
}
redisCache.setCacheObject("cache-0", value);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
index ff6129d..a1a97a1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java
@@ -19,12 +19,12 @@
import java.util.List;
/**
- * 闅忚浠诲姟闅忚妯℃澘搴揅ontroller
+ * 璇煶浠诲姟妯℃澘搴揅ontroller
*
* @author ruoyi
* @date 2024-05-13
*/
-@Api(description = "闅忚浠诲姟闅忚妯℃澘搴揅ontroller")
+@Api(description = "璇煶浠诲姟妯℃澘搴揅ontroller")
@RestController
@RequestMapping("/smartor/ivrTaskTemplate")
public class IvrTaskTemplateController extends BaseController {
@@ -34,7 +34,7 @@
/**
* 鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*/
- @ApiOperation("鏌ヨ闅忚浠诲姟闅忚妯℃澘搴撳垪琛�")
+ @ApiOperation("鏌ヨ璇煶浠诲姟妯℃澘搴撳垪琛�")
//@PreAuthorize("@ss.hasPermi('system:template:list')")
@PostMapping("/list")
public TableDataInfo list(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
@@ -47,7 +47,7 @@
* 瀵煎嚭闅忚浠诲姟闅忚妯℃澘搴撳垪琛�
*/
//@PreAuthorize("@ss.hasPermi('system:template:export')")
- @ApiOperation("瀵煎嚭闅忚浠诲姟闅忚妯℃澘搴撳垪琛�")
+ @ApiOperation("瀵煎嚭璇煶浠诲姟妯℃澘搴撳垪琛�")
@PostMapping("/export")
public void export(HttpServletResponse response, IvrTaskTemplate ivrTaskTemplate) {
List<IvrTaskTemplate> list = ivrTaskTemplateService.selectIvrTaskTemplateList(ivrTaskTemplate);
@@ -59,7 +59,7 @@
* 鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�
*/
//@PreAuthorize("@ss.hasPermi('system:template:query')")
- @ApiOperation("鑾峰彇闅忚浠诲姟闅忚妯℃澘搴撹缁嗕俊鎭�")
+ @ApiOperation("鑾峰彇璇煶浠诲姟妯℃澘搴撹缁嗕俊鎭�")
@GetMapping(value = "/getInfo/{ID}")
public AjaxResult getInfo(@PathVariable("ID") Long ID) {
return success(ivrTaskTemplateService.selectIvrTaskTemplateByID(ID));
@@ -69,7 +69,7 @@
* 鏂板闅忚浠诲姟闅忚妯℃澘搴�
*/
//@PreAuthorize("@ss.hasPermi('system:template:add')")
- @ApiOperation("鏂板闅忚浠诲姟闅忚妯℃澘搴�")
+ @ApiOperation("鏂板璇煶浠诲姟妯℃澘搴�")
@PostMapping("/add")
public AjaxResult add(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
return toAjax(ivrTaskTemplateService.insertIvrTaskTemplate(ivrTaskTemplate));
@@ -79,7 +79,7 @@
* 鏂板鎴栦慨鏀归殢璁夸换鍔￠殢璁挎ā鏉垮簱
*/
//@PreAuthorize("@ss.hasPermi('system:template:add')")
- @ApiOperation("鏂板鎴栦慨鏀归殢璁夸换鍔￠殢璁挎ā鏉垮簱")
+ @ApiOperation("鏂板鎴栬闊抽殢璁夸换鍔℃ā鏉垮簱")
@PostMapping("/saveOrUpdateTempScript")
public AjaxResult saveOrUpdateTempScript(@RequestBody IvrTaskTemplateVO ivrTaskTemplateVO) {
return AjaxResult.success(ivrTaskTemplateService.saveOrUpdateTempScript(ivrTaskTemplateVO));
@@ -89,7 +89,7 @@
* 淇敼闅忚浠诲姟闅忚妯℃澘搴�
*/
//@PreAuthorize("@ss.hasPermi('system:template:edit')")
- @ApiOperation("淇敼闅忚浠诲姟闅忚妯℃澘搴�")
+ @ApiOperation("淇敼璇煶浠诲姟妯℃澘搴�")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody IvrTaskTemplate ivrTaskTemplate) {
return toAjax(ivrTaskTemplateService.updateIvrTaskTemplate(ivrTaskTemplate));
@@ -99,7 +99,7 @@
* 鍒犻櫎闅忚浠诲姟闅忚妯℃澘搴�
*/
//@PreAuthorize("@ss.hasPermi('system:template:remove')")
- @ApiOperation("鍒犻櫎闅忚浠诲姟闅忚妯℃澘搴�")
+ @ApiOperation("鍒犻櫎璇煶浠诲姟妯℃澘搴�")
@GetMapping("/remove/{IDs}")
public AjaxResult remove(@PathVariable Long[] IDs) {
return toAjax(ivrTaskTemplateService.deleteIvrTaskTemplateByIDs(IDs));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index e66deca..06f9e73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -170,7 +170,8 @@
@ApiOperation("閫氳瘽璁板綍鍥炶皟")
@PostMapping("/recordAccept")
public AjaxResult recordAccept(@RequestBody ServiceSubTaskDetailReq serviceSubTaskDetailReq) {
- return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+// return toAjax(serviceSubtaskService.saveQuestionAnswerPhone(serviceSubTaskDetailReq));
+ return success();
}
/**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 05e47ac..870c985 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -94,7 +94,7 @@
* 閲嶇疆瀵嗙爜
*/
@Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping("/updatePwd")
+ @PostMapping("/updatePwd")
public AjaxResult updatePwd(String oldPassword, String newPassword)
{
LoginUser loginUser = getLoginUser();
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 38c4b6e..d10a33f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -108,7 +108,7 @@
// 杩囨护璇锋眰
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
- .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo", "/socket", "/API_ESB_Service", "/API_ESB_Service/Run", "/magic/web/**", "/smartor/serviceSubtask/phoneCallBack", "/smartor/serviceSubtask/taskPull", "/smartor/serviceSubtask/phoneCallBackYQ", "/smartor/robot/callstatus", "/smartor/robot/aidialog", "/smartor/robot/cdrinfo", "/getToken", "/smartor/subtaskAnswer/getQuestionCache", "/smartor/subtaskAnswer/saveQuestionCache", "/smartor/servicetask/getScriptInfoByCondition", "/smartor/subtaskAnswer/saveQuestionAnswer","/smartor/import/download").permitAll()
+ .antMatchers("/login", "/register", "/captchaImage", "/qrcode/generateStaticHtml", "/qrcode/getQRcode", "/qrcode/getFormDate", "/chat", "/system/file/admin/uploadFile", "/smartor/dingtalk/sendNotification", "/patient/read/patientInfo", "/socket", "/API_ESB_Service", "/API_ESB_Service/Run", "/magic/web/**", "/smartor/serviceSubtask/phoneCallBack", "/smartor/serviceSubtask/taskPull", "/smartor/serviceSubtask/phoneCallBackYQ", "/smartor/robot/callstatus", "/smartor/robot/aidialog", "/smartor/robot/cdrinfo", "/getToken", "/smartor/subtaskAnswer/getQuestionCache", "/smartor/subtaskAnswer/saveQuestionCache", "/smartor/servicetask/getScriptInfoByCondition", "/smartor/subtaskAnswer/saveQuestionAnswer","/smartor/import/download","/smartor/serviceSubtask/recordAccept").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll().antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
// 闄や笂闈㈠鐨勬墍鏈夎姹傚叏閮ㄩ渶瑕侀壌鏉冭璇�
diff --git a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
index 59ff3f7..8fe714b 100644
--- a/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
+++ b/smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java
@@ -261,7 +261,7 @@
* 涓嬩竴棰�
*/
@ApiModelProperty(value = "涓嬩竴棰�")
- private Integer nextScriptno;
+ private Long nextScriptno;
/**
* 鏄惁瀛樺湪鎿嶄綔锛�1 鏂板 2淇敼 3鍒犻櫎
diff --git a/smartor/src/main/java/com/smartor/domain/PullTaskVO.java b/smartor/src/main/java/com/smartor/domain/PullTaskVO.java
index a29bfc6..59b642b 100644
--- a/smartor/src/main/java/com/smartor/domain/PullTaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/PullTaskVO.java
@@ -67,5 +67,5 @@
* 鎸囧畾asr鐨剈rl璺緞锛堣繖涓矾寰勯渶瑕佹垜浠繖杈规彁渚涳紝鍏ュ弬鍙互鍙傝�冩枃妗ｏ級
*/
@ApiModelProperty(value = " 鎸囧畾asr鐨剈rl璺緞锛堣繖涓矾寰勯渶瑕佹垜浠繖杈规彁渚涳紝鍏ュ弬鍙互鍙傝�冩枃妗ｏ級")
- private String asrcallback = "http://35z1t16164.qicp.vip/smartor/serviceSubtask/phoneCallBackYQ";
+ private String asrcallback = "http://192.168.2.2:8095/smartor/serviceSubtask/phoneCallBackYQ";
}
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
index 7e4e9e1..711ac83 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaExtemplateMapper.xml
@@ -34,6 +34,7 @@
resultMap="IvrLibaExtemplateResult">
<include refid="selectIvrLibaExtemplateVo"/>
<where>
+ del_flag=0
<if test="extName != null and extName != ''">and extName like concat('%', #{extName}, '%')</if>
<if test="language != null and language != ''">and language = #{language}</if>
<if test="note != null and note != ''">and note = #{note}</if>
@@ -129,4 +130,4 @@
#{ID}
</foreach>
</delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
index ae9c65b..08bb74d 100644
--- a/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/IvrLibaScriptMapper.xml
@@ -87,10 +87,13 @@
resultMap="IvrLibaScriptResult">
<include refid="selectIvrLibaScriptVo"/>
<where>
+ del_flag=0
<if test="id != null ">and id = #{id}</if>
<if test="deptIds != null and deptIds != ''">and deptIds = #{deptIds}</if>
<if test="deptNames != null and deptNames != ''">and deptNames like concat('%', #{deptNames}, '%')</if>
- <if test="scriptTopic != null and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic}, '%')</if>
+ <if test="scriptTopic != null and scriptTopic != ''">and script_topic like concat('%', #{scriptTopic},
+ '%')
+ </if>
<if test="campus != null and campus != ''">and campus = #{campus}</if>
<if test="tag != null and tag != ''">and tag = #{tag}</if>
<if test="suitway != null and suitway != ''">and suitway = #{suitway}</if>
--
Gitblit v1.9.3