|
@@ -5,9 +5,9 @@ import com.boman.common.core.utils.StringUtils;
|
|
import com.boman.domain.SysUser;
|
|
import com.boman.domain.SysUser;
|
|
import com.boman.domain.TemplateData;
|
|
import com.boman.domain.TemplateData;
|
|
import com.boman.domain.dto.AjaxResult;
|
|
import com.boman.domain.dto.AjaxResult;
|
|
|
|
+import com.boman.domain.dto.WxMsgDto;
|
|
import com.boman.system.api.RemoteUserService;
|
|
import com.boman.system.api.RemoteUserService;
|
|
import com.boman.wechat.config.WechatProperties;
|
|
import com.boman.wechat.config.WechatProperties;
|
|
-import com.boman.wechat.dto.WxMssVo;
|
|
|
|
import com.boman.wechat.service.WxPushService;
|
|
import com.boman.wechat.service.WxPushService;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
@@ -52,13 +52,13 @@ public class WxPushServiceImpl implements WxPushService {
|
|
if(users == null || users.size() <= 0) {
|
|
if(users == null || users.size() <= 0) {
|
|
return "推送失败,没有选择推送人员";
|
|
return "推送失败,没有选择推送人员";
|
|
}
|
|
}
|
|
- List<WxMssVo> vos = new ArrayList<>();
|
|
|
|
|
|
+ List<WxMsgDto> vos = new ArrayList<>();
|
|
for(SysUser user : users) {
|
|
for(SysUser user : users) {
|
|
if(StringUtils.isEmpty(user.getOpenId())) {
|
|
if(StringUtils.isEmpty(user.getOpenId())) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
//拼接推送的模版
|
|
//拼接推送的模版
|
|
- WxMssVo wxMssVo = new WxMssVo();
|
|
|
|
|
|
+ WxMsgDto wxMssVo = new WxMsgDto();
|
|
wxMssVo.setTouser(user.getOpenId());//用户openid
|
|
wxMssVo.setTouser(user.getOpenId());//用户openid
|
|
wxMssVo.setTemplate_id(templateId);//模版id
|
|
wxMssVo.setTemplate_id(templateId);//模版id
|
|
Map<String, TemplateData> msgMap = new HashMap<>(5);
|
|
Map<String, TemplateData> msgMap = new HashMap<>(5);
|