From 94d3bc1411a2b5fb1978bc6908b957a800b1cb26 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 02 Apr 2024 12:50:19 +0800
Subject: [PATCH] 短信优化+议事
---
src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml | 2 +-
src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java | 39 +++++++++++++++++++++++++++------------
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 4 ++++
3 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 46c5cdc..c79a502 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -114,6 +114,10 @@
or ja.article_range is null or ja.article_range = '')
</if>
+ <if test="article.districtId == null ">
+ and ja.article_range is null
+ </if>
+
<if test="article.householdId != null">
and (FIND_IN_SET ( #{article.householdId}, jpd.user_ids )
OR jpd.user_ids IS NULL or jpd.user_ids = '')
diff --git a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
index 9de46ab..24268e9 100644
--- a/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
+++ b/src/main/java/org/springblade/modules/discuss/mapper/UserTopicsMapper.xml
@@ -202,7 +202,7 @@
LEFT JOIN blade_user bu ON jh.associated_user_id = bu.id AND bu.is_deleted = 0
LEFT JOIN jczz_house jhs on jhs.house_code= jda.address_code
<where>
- and jt.discuss_content = '候选人'
+ and jt.discuss_content = '业委会成员候选名单'
<if test="id != null ">and jut.id = #{id}</if>
<if test="name != null and name != ''">
and bu.name like concat('%',#{name},'%')
diff --git a/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java b/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
index d36a576..4c49e02 100644
--- a/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sms/service/impl/SmsSendServiceImpl.java
@@ -32,6 +32,7 @@
import org.springblade.modules.sms.entity.SmsTemplateEntity;
import org.springblade.modules.sms.mapper.SmsTemplateMapper;
import org.springblade.modules.sms.service.ISmsSendService;
+import org.springblade.modules.sms.service.ISmsTemplateService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -50,22 +51,37 @@
@Service
public class SmsSendServiceImpl extends ServiceImpl<SmsTemplateMapper, SmsTemplateEntity> implements ISmsSendService {
@Autowired
- private BladeRedis redisTemplate;
+ private BladeRedis redisTemplate;
private static Logger logger = LoggerFactory.getLogger(SmsSendServiceImpl.class);
-
+ // 确保这些字符串被适当地定义和管理
public static final String SMS_VALIDATE_PHONE = "sms:validate:code:";
public static final String SMS_VALIDATE_PHONE_NUM = "sms:validate:phone:";
+ private static final String SMS_SEND_FAILED = "短信发送失败！";
+ private static final String MESSAGE_SOP_EQUALS_MES_RESPONSE_CODE = "message_sop_equalsMes_response";
+ private static final String SEND_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
-// @Autowired
-// private SmsConfig smsConfig;
@Autowired
private ISmsService iSmsService;
+ @Autowired
+ private ISmsTemplateService iSmsTemplateService;
+
@Override
public Boolean smsSend(String phone) {
- Sms serviceOne = iSmsService.getOne(Wrappers.<Sms>lambdaQuery().eq(Sms::getSmsCode, "106575361457"));
+ Sms serviceOne = iSmsService.getOne(Wrappers.<Sms>lambdaQuery().eq(Sms::getStatus, 2));
+ if (serviceOne == null) {
+ logger.error("未找到状态为2的Sms服务");
+ return false;
+ }
+ SmsTemplateEntity smsTemplateEntity = iSmsTemplateService.getOne(Wrappers.<SmsTemplateEntity>lambdaQuery()
+ .eq(SmsTemplateEntity::getId, serviceOne.getTemplateId()));
+ if (smsTemplateEntity == null) {
+ logger.error("未找到对应的短信模板");
+ return false;
+ }
+
//发送的手机号
List<Map> phonesList = new ArrayList<>();
@@ -82,12 +98,11 @@
//短信主题
String subject = "对外接口不同内容发送-动态模板";
//短信内容
- String content = "您正在验证投票操作，验证码：#P_1#。如非本人操作，则密码可能已泄露，建议立即修改密码或联系客服。";
-// String content = "尊敬的#P_1#，你得工资#P_2#,测试#P_3#";
+ String content = smsTemplateEntity.getContent();
//短信模板
String template_id = null;
//发送时间
- SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat df = new SimpleDateFormat(SEND_TIME_FORMAT);
String send_time = df.format(new Date());
//优先级，高级=5，中级=3，低级=1
String priority = "1";
@@ -105,9 +120,9 @@
params.put("sop_create_by", serviceOne.getSmsCode());
String s = null;
try {
- s = testGet(params, "message.sop.differentMes",serviceOne);
+ s = testGet(params, "message.sop.differentMes", serviceOne);
JSONObject jsonObject = JSON.parseObject(s);
- JSONObject messageSopEqualsMesResponse = (JSONObject) jsonObject.get("message_sop_equalsMes_response");
+ JSONObject messageSopEqualsMesResponse = (JSONObject) jsonObject.get(MESSAGE_SOP_EQUALS_MES_RESPONSE_CODE);
if (messageSopEqualsMesResponse.get("code").equals(200)) {
// 将验证码存入redis
redisTemplate.setEx(SMS_VALIDATE_PHONE + phone, code, 300L);
@@ -115,13 +130,13 @@
return true;
}
} catch (Exception e) {
- logger.error("短信发送失败！", e);
+ logger.error(SMS_SEND_FAILED, e);
throw new RuntimeException(e);
}
return false;
}
- public String testGet(Object bizContent, String method,Sms serviceOne) throws Exception {
+ public String testGet(Object bizContent, String method, Sms serviceOne) throws Exception {
// 公共请求参数
Map<String, String> params = new HashMap<String, String>();
--
Gitblit v1.9.3