From a16ba88d4a496de6f9ac9b8b575bcb15b8b4493f Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 25 Apr 2025 15:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=BB=98=E8=AE=A4=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysMessageServiceImpl.java | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java index c5d9ced93..d1c2fbeaa 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysMessageServiceImpl.java @@ -295,47 +295,47 @@ public class SysMessageServiceImpl extends ServiceImpl configEntityList = sysSystemConfigMapper.selectList(Wrappers.lambdaQuery().eq(SysSystemConfigEntity::getConfigType, SystemConfigTypeEnum.SMS.getValue()).eq(SysSystemConfigEntity::getConfigStatus, YesNoEnum.YES.getCode()).eq(SysSystemConfigEntity::getConfigKey, messageSmsDTO.getBizCode())); - if (CollUtil.isEmpty(configEntityList)) { - return R.failed("发送失败，短信通道配置不存在"); - } +// List configEntityList = sysSystemConfigMapper.selectList(Wrappers.lambdaQuery().eq(SysSystemConfigEntity::getConfigType, SystemConfigTypeEnum.SMS.getValue()).eq(SysSystemConfigEntity::getConfigStatus, YesNoEnum.YES.getCode()).eq(SysSystemConfigEntity::getConfigKey, messageSmsDTO.getBizCode())); +// if (CollUtil.isEmpty(configEntityList)) { +// return R.failed("发送失败，短信通道配置不存在"); +// } - SysSystemConfigEntity configEntity = configEntityList.get(0); - JSONObject configMap = JSONUtil.parseObj(configEntity.getConfigValue()); +// SysSystemConfigEntity configEntity = configEntityList.get(0); +// JSONObject configMap = JSONUtil.parseObj(configEntity.getConfigValue()); // 组装SMS4J 的发送对象 - SmsBlend smsBlend = SmsFactory.getSmsBlend(messageSmsDTO.getBizCode()); - if (Objects.isNull(smsBlend)) { - Class targetClass = Arrays.stream(SUPPORT_CONFIG_CLAZZ).filter(config -> config.getSimpleName().toLowerCase().contains(configMap.getStr(MessageSmsDTO.Fields.supplier))).findFirst().orElseThrow(() -> new CheckedException("发送失败，短信通道配置不存在")); - BaseConfig baseConfig = (BaseConfig) JSONUtil.toBean(configEntity.getConfigValue(), targetClass); - - // 如果渠道扩展参数不为空则增加特性化参数 - if (StrUtil.isNotBlank(configMap.getStr(MessageSmsDTO.Fields.extParams))) { - JSONObject extParams = configMap.getJSONObject(MessageSmsDTO.Fields.extParams); - BeanUtil.copyProperties(extParams, baseConfig); - } - - baseConfig.setConfigId(configEntity.getConfigKey()); - SmsFactory.createSmsBlend(baseConfig); - smsBlend = SmsFactory.getSmsBlend(messageSmsDTO.getBizCode()); - } +// SmsBlend smsBlend = SmsFactory.getSmsBlend(messageSmsDTO.getBizCode()); +// if (Objects.isNull(smsBlend)) { +// Class targetClass = Arrays.stream(SUPPORT_CONFIG_CLAZZ).filter(config -> config.getSimpleName().toLowerCase().contains(configMap.getStr(MessageSmsDTO.Fields.supplier))).findFirst().orElseThrow(() -> new CheckedException("发送失败，短信通道配置不存在")); +// BaseConfig baseConfig = (BaseConfig) JSONUtil.toBean(configEntity.getConfigValue(), targetClass); +// +// // 如果渠道扩展参数不为空则增加特性化参数 +// if (StrUtil.isNotBlank(configMap.getStr(MessageSmsDTO.Fields.extParams))) { +// JSONObject extParams = configMap.getJSONObject(MessageSmsDTO.Fields.extParams); +// BeanUtil.copyProperties(extParams, baseConfig); +// } +// +// baseConfig.setConfigId(configEntity.getConfigKey()); +// SmsFactory.createSmsBlend(baseConfig); +// smsBlend = SmsFactory.getSmsBlend(messageSmsDTO.getBizCode()); +// } // 异步发送短信 - SysLogDTO sysLog = SysLogUtils.getSysLog(); - Long start = System.currentTimeMillis(); - sysLog.setTenantId(TenantContextHolder.getTenantId()); - for (String mobile : messageSmsDTO.getMobiles()) { - smsBlend.sendMessageAsync(mobile, configMap.getStr(MessageSmsDTO.Fields.templateId), messageSmsDTO.getParams(), smsResponse -> { - log.info("发送短信结果:{}", smsResponse); - sysLog.setTitle(String.format("发送短信 %s", mobile)); - sysLog.setLogType(LogTypeEnum.NORMAL.getType()); - sysLog.setServiceId(SystemConfigTypeEnum.SMS.getValue()); - sysLog.setParams(JacksonSensitiveFieldUtil.writeValueAsString(smsResponse)); - sysLog.setTime(System.currentTimeMillis() - start); - sysLog.setException(JacksonSensitiveFieldUtil.writeValueAsString(smsResponse)); - remoteLogService.saveLog(sysLog); - }); - } +// SysLogDTO sysLog = SysLogUtils.getSysLog(); +// Long start = System.currentTimeMillis(); +// sysLog.setTenantId(TenantContextHolder.getTenantId()); +// for (String mobile : messageSmsDTO.getMobiles()) { +// smsBlend.sendMessageAsync(mobile, configMap.getStr(MessageSmsDTO.Fields.templateId), messageSmsDTO.getParams(), smsResponse -> { +// log.info("发送短信结果:{}", smsResponse); +// sysLog.setTitle(String.format("发送短信 %s", mobile)); +// sysLog.setLogType(LogTypeEnum.NORMAL.getType()); +// sysLog.setServiceId(SystemConfigTypeEnum.SMS.getValue()); +// sysLog.setParams(JacksonSensitiveFieldUtil.writeValueAsString(smsResponse)); +// sysLog.setTime(System.currentTimeMillis() - start); +// sysLog.setException(JacksonSensitiveFieldUtil.writeValueAsString(smsResponse)); +// remoteLogService.saveLog(sysLog); +// }); +// } return R.ok(); }