diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java index f6a43d9..2111727 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java @@ -378,9 +378,9 @@ public class ArticleController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.setEntity(lymsPushMessages); if(null!=lymsPushMessages.getStartDate()&&null!=lymsPushMessages.getEndDate()){ - queryWrapper.ge("plan_time", lymsPushMessages.getStartDate()).le("plan_time",lymsPushMessages.getEndDate()); + queryWrapper.ge("push_time", lymsPushMessages.getStartDate()).le("push_time",lymsPushMessages.getEndDate()); } - queryWrapper.orderByDesc("plan_time"); + queryWrapper.orderByDesc("push_time"); Page lymsPushMessagesPage=lymsPushMessagesService.page(page,queryWrapper); baseResponse.setObject(lymsPushMessagesPage); baseResponse.setErrormsg("成功"); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTask.java index d67303c..5c65f71 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTask.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.lyms.talkonlineweb.domain.*; import com.lyms.talkonlineweb.result.BaseResponse; import com.lyms.talkonlineweb.service.*; +import com.lyms.talkonlineweb.util.Constant; import com.lyms.talkonlineweb.util.DateUtil; import com.lyms.talkonlineweb.util.StringUtil; import com.lyms.talkonlineweb.util.WeiXinUtil; @@ -39,10 +40,10 @@ public class PushArticleTask { @Autowired private LymsDictService lymsDictService; -// final String gzopenid ="oQEmP6rFmf0lOb--mUf4_MAZPXEQ";//测试：公众号关注的微信openId - final String template_id ="ZDxcRDJ3okC9Lbzpfhr_v4e8W1VWrho-f5uHW_VZHTg";//公众号模板:诊后注意事项id - - @Scheduled(cron = "0 0 9 * * ?")//每天上午9点执行文章推送 + /** + * 每天上午9点执行文章推送 + */ + @Scheduled(cron = "0 0 9 * * ?") public void pushArtcle(){ String token= AccessTokenServlet.accessToken; Map param=new HashMap<>(); @@ -108,7 +109,7 @@ public class PushArticleTask { map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177")); map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177")); map.put("remark",new DataEntity("预祝您早日康复","#173177")); - Integer code= WeiXinUtil.SendWeChatMsg(token,lymsPushMessage.getGzopenid(),template_id,map); + Integer code= WeiXinUtil.SendWeChatMsg(token,lymsPushMessage.getGzopenid(), Constant.GZ_TEMPLATE_ID,map); if(null==code||code!=0){ //更新到LymsPushMessages记录 lymsPushMessage.setState(2);//推送状态：0待推送（9点开始推送） 1成功 2失败。（在备注写失败原因） @@ -131,7 +132,7 @@ public class PushArticleTask { map.put("keyword2",new DataEntity(lymsPushMessage.getHname(),"#173177")); map.put("keyword3",new DataEntity(lymsPushMessage.getDname(),"#173177")); map.put("remark",new DataEntity("预祝您早日康复","#173177")); - Integer code= WeiXinUtil.SendWeChatMsg(token,lymsPushMessage.getGzopenid(),template_id,map); + Integer code= WeiXinUtil.SendWeChatMsg(token,lymsPushMessage.getGzopenid(),Constant.GZ_TEMPLATE_ID,map); if(null==code||code!=0){ //更新到LymsPushMessages记录 lymsPushMessage.setState(2);//推送状态：0待推送（9点开始推送） 1成功 2失败。（在备注写失败原因） diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTaskData.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTaskData.java index 76b28d5..89faffe 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTaskData.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/PushArticleTaskData.java @@ -44,8 +44,10 @@ public class PushArticleTaskData { @Autowired private LymsDictService lymsDictService; - - @Scheduled(cron = "0 0 0 * * ?")//每天0点执行-要推送的文章存到数据库 + /** + * 每天0点执行-要推送的文章存到数据库 + */ + @Scheduled(cron = "0 0 0 * * ?") public void pushArtcleData(){ Map param=new HashMap<>(); param.put("vtype",999); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java index 4c2757d..ab28768 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/Constant.java @@ -46,6 +46,10 @@ public class Constant { */ public static final String WX_SECRET = "005ab68859ca2504b7217dac4c903cd2"; /** + * 公众号发送消息模板 + */ + public static final String GZ_TEMPLATE_ID ="ZDxcRDJ3okC9Lbzpfhr_v4e8W1VWrho-f5uHW_VZHTg"; + /** * 公众号的appid */ public static final String GZ_APP_ID ="wxd3c36244d006cb90"; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java index e1c9111..97f5551 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/util/WeiXinUtil.java @@ -72,6 +72,11 @@ public class WeiXinUtil { Map paramMap = new HashMap(); paramMap.put("touser", openid); paramMap.put("template_id", template_id); + //跳转到小程序用到miniprogram集合参数 + Map miniprogramMap = new HashMap(); + miniprogramMap.put("appid",Constant.PAT_APP_ID); + miniprogramMap.put("pagepath","/pages/login/login"); + paramMap.put("miniprogram", miniprogramMap); paramMap.put("data", dataMap); String result= repeatDoGetPost(sendMsgApi,"POST",paramMap); if(StringUtil.isEmpty(result)){ @@ -98,7 +103,6 @@ public class WeiXinUtil { // 接口地址 String reqUrl = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + Constant.GZ_APP_ID + "&secret=" + Constant.GZ_SECRET + "&code=" + code + "&grant_type="+Constant.GZ_AUTH; log.info(reqUrl); -// String result = HttpUtil.getData(reqUrl); String result = repeatDoGetPost(reqUrl,"GET",null); log.info("result :" + result); if (StringUtils.isEmpty(result)) {