From 7f9eaaec74f3b36e8973a3f225aad06166b4964b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 11 Jan 2019 15:49:12 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=9F=AD=E4=BF=A1=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=8A=A0=E5=85=A5=E6=97=A5=E5=BF=97=E4=BF=A1?= =?UTF-8?q?=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/MsgSendingSchedule.java | 53 +++++++------------ 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index ef745c1c2..b5f52bacd 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -1,21 +1,24 @@ package com.iformall.schedule; +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.enums.EnumMsgSendStatus; +import com.iformall.enums.EnumMsgStatus; import com.iformall.enums.EnumVerifyCode; -import com.iformall.exception.MallinkException; import com.iformall.mapper.WxMsgConfigMapper; import com.iformall.mapper.WxMsgMapper; import com.iformall.service.PushLimitService; -import com.iformall.utils.*; +import com.iformall.utils.DateUtils; +import com.iformall.utils.WiwideUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import java.util.*; +import java.util.List; @Component public class MsgSendingSchedule { @@ -32,75 +35,59 @@ public class MsgSendingSchedule { private PushLimitService pushLimitService; - @Scheduled(cron = "0 1 * * * ?") // 每小时第一分钟执行 + @Scheduled(cron = "0 46 * * * ?") // 每小时第一分钟执行 public void sendmsgschedule() { - logger.info("sendmsg定时任务启动"); - - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00"); + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd 14:00:00"); WxMsg wxMsg = new WxMsg(); wxMsg.setIsright(0); wxMsg.setSendtime(systemTime); List list = wxMsgMapper.findList(wxMsg); - + logger.info("将要发送的短信列表:" + JSONArray.toJSONString(list)); for(WxMsg msg:list){ - boolean checkTime = false; - try { - checkTime = pushLimitService.checkSendTime(wxMsg.getTenantId()); - } catch (MallinkException e) { - logger.error(e.getMessage()); - } - if (checkTime) { - sendmsg(msg); - } + sendmsg(msg); } - logger.info("sendmsg定时任务结束"); } public void sendmsg(WxMsg wxMsg){ - - - + logger.info("发送短信开始----------"); //从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setTenantId(wxMsg.getTenantId()); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); - if (wxMsgConfigs.size() == 0) return; + if (wxMsgConfigs.size() == 0) { + logger.info("短信相关配置不存在"); + return; + } wxMsgConfig = wxMsgConfigs.get(0); - if(wxMsgConfig.getRemains()==0){ logger.info("短信数量为0"); return; } - if(wxMsgConfig.getRemains()