From 1ad8325c8fa452b95408cf7b97fdff9c96f97c96 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 29 May 2020 18:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=B7=A5=E5=85=B7=E4=BB=A5=E5=8F=8Ademo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/MessageServiceImpl.java | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java index 736f21a8d..6a2f0861f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service.impl; import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; import cn.binarywang.wx.miniapp.bean.WxMaUniformMessage; import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisKeys; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -235,6 +236,18 @@ public class MessageServiceImpl implements MessageService { @Override public Result sendMessage(SendMessageFormDTO formDto) { + // 模板ID + String value = ""; + if(1 == formDto.getType()){ + //通知 + value = "您有新的通知，请登录小程序查看！"; + }else if(2 == formDto.getType()){ + //话题 + value = "您有新的话题，请登录小程序查看！"; + }else{ + throw new RenException("消息推送类型错误！"); + } + // 获取openID Result userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId(); if(userIdsResult == null || userIdsResult.getData() == null){ @@ -251,7 +264,7 @@ public class MessageServiceImpl implements MessageService { String analysis_access_token = WxSendMessageUtils.getAccess_token(analysisAppId, analysisSecret); // 拼接URL String analysis_url = url + analysis_access_token; - Integer analysisResult = sendOpenIdListMessage(analyOpenIdList, analysisTemplate,analysis_url); + Integer analysisResult = sendOpenIdListMessage(analyOpenIdList, analysisTemplate,analysis_url,value); log.info("本次小程序消息推送数据端共【" + analyOpenIdList.size() + "】接收者，发送成功【" + analysisResult + "】条。"); } if(null != workOpenIdList && workOpenIdList.size() > 0){ @@ -259,14 +272,14 @@ public class MessageServiceImpl implements MessageService { String work_access_token = WxSendMessageUtils.getAccess_token(workAppId, workSecret); // 拼接URL String work_url = url + work_access_token; - Integer workResult = sendOpenIdListMessage(workOpenIdList,workTemplate,work_url); + Integer workResult = sendOpenIdListMessage(workOpenIdList,workTemplate,work_url,value); log.info("本次小程序消息推送工作端共【" + workOpenIdList.size() + "】接收者，发送成功【" + workResult + "】条。"); } return new Result().ok("消息推送成功！"); } - private Integer sendOpenIdListMessage(List openIdList,String templateId,String url){ + private Integer sendOpenIdListMessage(List openIdList,String templateId,String url,String value){ AtomicInteger ai = new AtomicInteger(0); SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List> list = new ArrayList<>(); @@ -277,7 +290,7 @@ public class MessageServiceImpl implements MessageService { // 配置模板内容 Map m = new HashMap<>(5); TemplateData keyword1 = new TemplateData(); - keyword1.setValue("您有新的话题，请登录小程序查看！"); + keyword1.setValue(value); m.put("thing1", keyword1); TemplateData keyword2 = new TemplateData(); String dateStr = sdf.format(new Date());