代码提交

liusheng

2025-11-07 f5412313edae1ffae3d5471e5eca8dde4695f0d2

代码提交

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

@@ -403,7 +403,7 @@
                        if (StringUtils.isNotEmpty(data) && data.contains("result=0")) {
                            s = "true";
                        } else {
                            setFailPreachForm(serviceSubtask, sendPreachform, "短信发送失败", "5");
                            setFailPreachForm(serviceSubtask, sendPreachform, "短信发送失败: " + data, "5");
                            throw new BaseException("短信发送失败");
                        }
                    }

 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -12,7 +12,7 @@
        <!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
        <setting name="defaultExecutorType" value="SIMPLE"/>
        <!-- 指定 MyBatis 所用日志的具体实现 -->
        <setting name="logImpl" value="STDOUT_LOGGING"/>
<!--        <setting name="logImpl" value="STDOUT_LOGGING"/>-->
        <!-- 使用驼峰命名法转换字段 -->
        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
    </settings>

 ruoyi-common/src/main/java/com/ruoyi/common/dx/MessageSend.java

@@ -25,7 +25,7 @@
        com.ruoyi.common.dx.SmsService service = new SmsService();
        SmsServiceSoap soap = service.getSmsServiceSoap();
        String result = soap.i5GSend("202508291634227086", "T202508291635259440", UUID.randomUUID().toString(), sMessageContent, sMessageType, sUserNumber, sScheduleTime);
        log.info("----短信返回的数据为：{}", result);
        log.info("----短信返回的数据为：{},    ----sMessageContent的值为:{},", result, sMessageContent);
        return result;
    }
}

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

@@ -192,6 +192,14 @@
    private Date senddate;

    /**
     * 新的创建时间（用来做查询参数用）
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = " 发送日期 ", width = 30, dateFormat = "yyyy-MM-dd")
    @ApiModelProperty(value = "新的创建时间")
    private Date createTimeNew;

    /**
     * 上午开始发送时间限制
     */
    @Excel(name = " 上午开始发送时间限制 ")

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -721,6 +721,7 @@
            ServiceSubtask ss = new ServiceSubtask();
            ss.setTaskid(Long.valueOf(taskId));
            ss.setPatid(serviceSubtask.getPatid());
            ss.setCreateTimeNew(new Date());
            List<Integer> list = serviceSubtaskMapper.selectSendstateByCondition(ss);
            if (CollectionUtils.isNotEmpty(list)) return true;


 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java

@@ -508,10 +508,11 @@
        }
        List<Map<String, String>> mapList = new ArrayList<>();

        if (ivrTaskMap != null) {
        for (Map<String, String> map : ivrTaskMap.values()) {
            mapList.add(map);
        }

        }
        //将模板问题话术里的通配符替换
        for (SvyTaskTemplateScriptVO svyTaskTemplateScriptVO : svyTaskTemplateScriptVOS) {
            if (StringUtils.isNotEmpty(svyTaskTemplateScriptVO.getScriptContent())) {

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -478,6 +478,9 @@
        JOIN service_subtask b on a.taskid = b.taskid and a.pat_cycle = 0 and b.del_flag = 0
        <where>b.taskid = #{taskid}
            and b.patid = #{patid}
            <if test="createTime != null and createTime != ''">
                DATE_FORMAT(b.create_time, '%Y-%m-%d') LIKE CONCAT(#{createTimeNew}, '%')
            </if>
            <if test="sendstate != null ">and b.sendstate = #{sendstate}</if>
        </where>
    </select>