记得上下班打卡 | git大法好,push需谨慎

Commit fbbdee24 authored by 张国柄's avatar 张国柄

opt;

parent 5b9523cb
...@@ -12,6 +12,17 @@ public class SmsMessage implements Serializable, Cloneable { ...@@ -12,6 +12,17 @@ public class SmsMessage implements Serializable, Cloneable {
private String templateCode; private String templateCode;
private ObjectNode templateParam; private ObjectNode templateParam;
public SmsMessage() {
}
public SmsMessage(String json) {
SmsMessage smsMessage = JsonUtils.fromJson(json, SmsMessage.class);
this.phone = smsMessage.getPhone();
this.signName = smsMessage.getSignName();
this.templateCode = smsMessage.getTemplateCode();
this.templateParam = smsMessage.getTemplateParam();
}
public String getPhone() { public String getPhone() {
return phone; return phone;
} }
...@@ -60,4 +71,8 @@ public class SmsMessage implements Serializable, Cloneable { ...@@ -60,4 +71,8 @@ public class SmsMessage implements Serializable, Cloneable {
this.templateParam.put(key, val); this.templateParam.put(key, val);
return this; return this;
} }
public String toJson() {
return JsonUtils.toJson(this);
}
} }
...@@ -173,7 +173,7 @@ public class AdamLoginController { ...@@ -173,7 +173,7 @@ public class AdamLoginController {
SmsMessage smsMessage = SmsMessage.builder().setPhone(mobile).setSignName(SmsEnum.ADSignName.正在现场.name()) SmsMessage smsMessage = SmsMessage.builder().setPhone(mobile).setSignName(SmsEnum.ADSignName.正在现场.name())
.setTemplateCode(SmsEnum.ADTemplate.SMS_109535335.name()) .setTemplateCode(SmsEnum.ADTemplate.SMS_109535335.name())
.setTemplateParam("code", smsCode); .setTemplateParam("code", smsCode);
rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_CODE, smsMessage); rabbitTemplate.convertAndSend(MQConst.EX_LNS_SMS_SENDER, MQConst.RK_SMS_CODE, smsMessage.toJson());
adamRdmService.setSmsCodeByMobile(mobile, smsCode); adamRdmService.setSmsCodeByMobile(mobile, smsCode);
return ResponseDto.success(); return ResponseDto.success();
} else { } else {
......
...@@ -68,8 +68,8 @@ public class ConsumerAdamUCenterProcessor { ...@@ -68,8 +68,8 @@ public class ConsumerAdamUCenterProcessor {
log.info("CONSUMER SQL ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag); log.info("CONSUMER SQL ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag);
String msgBody = new String(msg.getBody()); String msgBody = new String(msg.getBody());
log.debug("CONSUMER SQL ==> Preparing:{}", msgBody); log.debug("CONSUMER SQL ==> Preparing:{}", msgBody);
SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msgBody, SqlMapping.SqlMessage.class);
try { try {
SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msgBody, SqlMapping.SqlMessage.class);
Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs()); Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls); log.debug("CONSUMER SQL result of execution:{}", rstBatchSqls);
if (rstBatchSqls) { if (rstBatchSqls) {
...@@ -90,8 +90,8 @@ public class ConsumerAdamUCenterProcessor { ...@@ -90,8 +90,8 @@ public class ConsumerAdamUCenterProcessor {
log.info("CONSUMER SMS ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag); log.info("CONSUMER SMS ==> [consumerQueue:{},deliveryTag:{}]", consumerQueue, deliveryTag);
String msgBody = new String(msg.getBody()); String msgBody = new String(msg.getBody());
log.debug("CONSUMER SMS ==> Preparing:{}", msgBody); log.debug("CONSUMER SMS ==> Preparing:{}", msgBody);
SmsMessage smsMessage = JsonUtils.fromJson(msgBody, SmsMessage.class);
try { try {
SmsMessage smsMessage = JsonUtils.fromJson(msgBody, SmsMessage.class);
boolean result = smsProcessor.aliyunDysmsSend(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString()); boolean result = smsProcessor.aliyunDysmsSend(smsMessage.getPhone(), smsMessage.getSignName(), smsMessage.getTemplateCode(), smsMessage.getTemplateParam().toString());
log.debug("CONSUMER SMS result of execution:{}", result); log.debug("CONSUMER SMS result of execution:{}", result);
if (result) { if (result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment