|
|
@ -3,7 +3,6 @@ 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; |
|
|
@ -82,12 +81,18 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
@Value("${wx.message.analysisSecret}") |
|
|
|
private String analysisSecret; |
|
|
|
|
|
|
|
@Value("${wx.message.analysisTemplate}") |
|
|
|
private String analysisTemplate; |
|
|
|
|
|
|
|
@Value("${wx.message.workAppId}") |
|
|
|
private String workAppId; |
|
|
|
|
|
|
|
@Value("${wx.message.workSecret}") |
|
|
|
private String workSecret; |
|
|
|
|
|
|
|
@Value("${wx.message.workTemplate}") |
|
|
|
private String workTemplate; |
|
|
|
|
|
|
|
/** |
|
|
|
* 注册审核失败服务消息模版 |
|
|
|
*/ |
|
|
@ -191,7 +196,7 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 小程序消息推送 |
|
|
|
* 小程序消息推送demo |
|
|
|
* |
|
|
|
* @return com.elink.esua.epdc.commons.tools.utils.Result |
|
|
|
* @author wanggonfeng |
|
|
@ -232,15 +237,6 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result sendMessage(SendMessageFormDTO formDto) { |
|
|
|
// 模板ID
|
|
|
|
String templateId = ""; |
|
|
|
if(1 == formDto.getType()){//通知
|
|
|
|
templateId = WxSendMessageUtils.notice_template_id; |
|
|
|
}else if(2 == formDto.getType()){//话题
|
|
|
|
templateId = WxSendMessageUtils.topic_template_id; |
|
|
|
}else{ |
|
|
|
throw new RenException("消息推送类型错误!"); |
|
|
|
} |
|
|
|
|
|
|
|
// 获取openID
|
|
|
|
Result<UserWorkAndAnalyOpenIdDTO> userIdsResult = adminFeignClient.userRelationWorkAndAnalyOpenId(); |
|
|
@ -258,7 +254,7 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
String analysis_access_token = WxSendMessageUtils.getAccess_token(analysisAppId, analysisSecret); |
|
|
|
// 拼接URL
|
|
|
|
String analysis_url = WxSendMessageUtils.url + analysis_access_token; |
|
|
|
Integer analysisResult = sendOpenIdListMessage(analyOpenIdList, templateId,analysis_url); |
|
|
|
Integer analysisResult = sendOpenIdListMessage(analyOpenIdList, analysisTemplate,analysis_url); |
|
|
|
log.info("本次小程序消息推送数据端共【" + analyOpenIdList.size() + "】接收者,发送成功【" + analysisResult + "】条。"); |
|
|
|
} |
|
|
|
if(null != workOpenIdList && workOpenIdList.size() > 0){ |
|
|
@ -266,8 +262,8 @@ public class MessageServiceImpl implements MessageService { |
|
|
|
String work_access_token = WxSendMessageUtils.getAccess_token(workAppId, workSecret); |
|
|
|
// 拼接URL
|
|
|
|
String work_url = WxSendMessageUtils.url + work_access_token; |
|
|
|
Integer workResult = sendOpenIdListMessage(workOpenIdList,templateId,work_url); |
|
|
|
log.info("本次小程序消息推送数据端共【" + workOpenIdList.size() + "】接收者,发送成功【" + workResult + "】条。"); |
|
|
|
Integer workResult = sendOpenIdListMessage(workOpenIdList,workTemplate,work_url); |
|
|
|
log.info("本次小程序消息推送工作端共【" + workOpenIdList.size() + "】接收者,发送成功【" + workResult + "】条。"); |
|
|
|
} |
|
|
|
|
|
|
|
return new Result().ok("消息推送成功!"); |
|
|
|