代码提交

liusheng

2024-10-12 98d61ad472df848bba78a45b80126687d5ad7529

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -195,6 +195,7 @@
                                if (StringUtils.isEmpty(value)) {
                                    value = "," + serviceSubtask2.getId().toString() + ",";
                                } else {
                                    if (!value.contains("," + serviceSubtask2.getId().toString()))
                                    value = value + "," + serviceSubtask2.getId().toString() + ",";
                                }
                            }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/IvrTaskTemplateController.java

@@ -19,12 +19,12 @@
import java.util.List;

/**
 * 随访任务随访模板库Controller
 * 语音任务模板库Controller
 *
 * @author ruoyi
 * @date 2024-05-13
 */
@Api(description = "随访任务随访模板库Controller")
@Api(description = "语音任务模板库Controller")
@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));

 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();
    }

    /**

 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();

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -108,7 +108,7 @@
                // 过滤请求
                .authorizeRequests()
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                .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()
                // 除上面外的所有请求全部需要鉴权认证

 smartor/src/main/java/com/smartor/domain/IvrLibaTemplateScript.java

@@ -261,7 +261,7 @@
     * 下一题
     */
    @ApiModelProperty(value = "下一题")
    private Integer nextScriptno;
    private Long nextScriptno;

    /**
     * 是否存在操作：1 新增 2修改 3删除

 smartor/src/main/java/com/smartor/domain/PullTaskVO.java

@@ -67,5 +67,5 @@
     * 指定asr的url路径（这个路径需要我们这边提供，入参可以参考文档）
     */
    @ApiModelProperty(value = " 指定asr的url路径（这个路径需要我们这边提供，入参可以参考文档）")
    private String asrcallback = "http://35z1t16164.qicp.vip/smartor/serviceSubtask/phoneCallBackYQ";
    private String asrcallback = "http://192.168.2.2:8095/smartor/serviceSubtask/phoneCallBackYQ";
}

 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>

 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>