linwe
2024-08-12 c99a50faea926e3c5de693cdaabb89c457189eed
短信指定楼栋发送优化
3 files modified
21 ■■■■■ changed files
src/main/java/org/springblade/modules/sms/controller/SmsSendController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java 14 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/sms/controller/SmsSendController.java
@@ -109,9 +109,9 @@
    @GetMapping("/batchSendNotice")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "批量发送通知")
    public R<SmsTemplateVO> batchSendNotice(@RequestParam("templateId") Long smsTaskId) {
    public void batchSendNotice(@RequestParam("smsTaskId") Long smsTaskId) {
        Boolean aBoolean = iSmsSendService.batchSendNotice( smsTaskId);
        return R.status(aBoolean);
        // return R.status(aBoolean);
    }
src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
@@ -362,7 +362,7 @@
        SmsTaskEntity smsTaskEntity = taskService.getById(smsTaskId);
        List<User> phoneList = taskService.selectSmsTaskListByPhone(smsTaskEntity);
        if (CollectionUtil.isEmpty(phoneList)) {
            logger.error("未查询到电话好好");
            logger.error("未查询到电话号码!");
            return false;
        }
@@ -377,6 +377,7 @@
            logger.error("未找到对应的短信模板");
            return false;
        }
        ISmsRecordService smsRecordService = SpringUtils.getBean(ISmsRecordService.class);
        Boolean aBoolean = false;
        for (User user : phoneList) {
            // 发送的手机号
@@ -408,8 +409,12 @@
            // 创建人主键
            params.put("sop_create_by", serviceOne.getSmsCode());
            // 短信发送记录
            saveSmsRecord(user.getPhone(), serviceOne, user.getName(), content);
            aBoolean = sendSmsGet(serviceOne, params);
            SmsRecordEntity smsRecordEntity = saveSmsRecord(user.getPhone(), serviceOne, user.getName(), content);
            aBoolean = false; //sendSmsGet(serviceOne, params);
            if (aBoolean){
                smsRecordEntity.setStatus(2);
                smsRecordService.updateById(smsRecordEntity);
            }
        }
        return aBoolean;
@@ -454,7 +459,7 @@
     * @param code       短信中的验证码
     * @param content    短信内容,其中可能包含占位符"#P_1#"用于被验证码替换
     */
    private static void saveSmsRecord(String phone, Sms serviceOne, String code, String content) {
    private static SmsRecordEntity saveSmsRecord(String phone, Sms serviceOne, String code, String content) {
        // 通过Spring工具类获取短信记录服务的实例
        ISmsRecordService smsRecordService = SpringUtils.getBean(ISmsRecordService.class);
        // 创建一个新的短信记录实体
@@ -469,6 +474,7 @@
        smsRecordEntity.setCreateUser(AuthUtil.getUserId());
        // 保存短信记录实体
        smsRecordService.save(smsRecordEntity);
        return smsRecordEntity;
    }
    public String sendSms(Object bizContent, String method, Sms serviceOne) throws Exception {
src/main/java/org/springblade/modules/smsTask/mapper/SmsTaskMapper.xml
@@ -84,9 +84,10 @@
        LEFT JOIN jczz_house jh ON jhd.house_code = jh.house_code
        LEFT JOIN jczz_district jd ON jd.aoi_code = jh.district_code
        LEFT JOIN jczz_sms_task jst ON jst.district_id = jd.id
        LEFT JOIN jczz_doorplate_address jda on jda.address_code = jhd.house_code
        <where>
            <if test="id != null">jst.id = #{id}</if>
            <if test="buildingCode != null  and buildingCode != ''">and building_code = #{buildingCode}</if>
            <if test="buildingCode != null  and buildingCode != ''">and jda.building_code = #{buildingCode}</if>
            and jhd.relationship = 1
            and bu.phone is not null
        </where>