From 531f42586c1f5db9e9e90db96d53989dc1351d97 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 17 Jan 2019 14:38:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E6=97=B6=E5=B8=A6=E4=B8=8A?= =?UTF-8?q?modelId]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/MsgSendingSchedule.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index d01adca38..f2c1ba3ba 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -4,12 +4,13 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.iformall.domain.po.WxMsg; import com.iformall.domain.po.WxMsgConfig; +import com.iformall.domain.po.WxMsgModel; import com.iformall.enums.EnumMsgSendStatus; import com.iformall.enums.EnumMsgStatus; import com.iformall.enums.EnumVerifyCode; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgMapper; -import com.iformall.service.PushLimitService; +import com.iformall.mapper.WxMsgModelMapper; import com.iformall.utils.DateUtils; import com.iformall.utils.WiwideUtil; import org.slf4j.Logger; @@ -34,6 +35,9 @@ public class MsgSendingSchedule { @Autowired private WxMsgConfigMapper wxMsgConfigMapper; + @Autowired + private WxMsgModelMapper wxMsgModelMapper; + /** * 每小时第一分钟执行 */ @@ -78,7 +82,13 @@ public class MsgSendingSchedule { String signature = wxMsg.getSignature(); String msg = wxMsg.getMsg(); String notifyUrl = wxMsgConfig.getNotifyurl(); - String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString()); + Integer modelId = null; + Long modelIdParam = wxMsg.getModelId(); + if (modelIdParam != null) { + WxMsgModel wxMsgModel = wxMsgModelMapper.selectByPrimaryKey(modelIdParam); + modelId = wxMsgModel.getModelId(); + } + String result = WiwideUtil.sendMsg(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId); logger.info("短信返回结果:" + result); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString();