Commit 37f2daac authored by 吴泽佳's avatar 吴泽佳

早报 访问链接修改4

parent 79e50cae
......@@ -11,14 +11,8 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.tanpu.common.constant.BizStatus;
import com.tanpu.feo.feojob.config.MorningPaperProperties;
import com.tanpu.feo.feojob.dao.user.entity.DaySelection;
import com.tanpu.feo.feojob.dao.user.entity.DaySubjectEntity;
import com.tanpu.feo.feojob.dao.user.entity.OrgExtEntity;
import com.tanpu.feo.feojob.dao.user.entity.UserInfoEntity;
import com.tanpu.feo.feojob.dao.user.mapper.DaySelectionMapper;
import com.tanpu.feo.feojob.dao.user.mapper.DaySubjectMapper;
import com.tanpu.feo.feojob.dao.user.mapper.OrgExtMapper;
import com.tanpu.feo.feojob.dao.user.mapper.UserInfoMapper;
import com.tanpu.feo.feojob.dao.user.entity.*;
import com.tanpu.feo.feojob.dao.user.mapper.*;
import com.tanpu.feo.feojob.feign.wxcp.FeignClientForWxCp;
import com.tanpu.feo.feojob.feign.wxmp.FeignClientForWxMp;
import lombok.extern.slf4j.Slf4j;
......@@ -64,6 +58,8 @@ public class DaySubJob {
private FeignClientForWxMp feignClientForWxMp;
@Resource
private DaySelectionMapper daySelectionMapper;
@Resource
private OrgMapper orgMapper;
@Scheduled(cron = "0 30 7 * * ? ") //
......@@ -103,48 +99,56 @@ public class DaySubJob {
.eq(UserInfoEntity::getOrgId, orgId)
.eq(UserInfoEntity::getLevel, "2");
List<UserInfoEntity> userInfoEntities = userInfoMapper.selectList(queryWrapper);
userInfoEntities.stream().forEach(userInfoEntity -> {
List<DaySubjectEntity> daySubjectEntities = stringListMap.get(orgId);
daySubjectEntities.forEach(daySubjectEntity -> {
HashMap<String, String> parmMap = new HashMap<>();
parmMap.put("type", "text");
String wxOpenId = userInfoEntity.getUiOpenid();
String wxcpUId = userInfoEntity.getWxcpUid();
if (StringUtils.isNotBlank(wxcpUId)) {
// 1 企业微信 推送
String agentId = jsonKeyInfo.getStr("agentId");
String corpId = jsonKeyInfo.getStr("corpId");
// ww=corpId&orgCode=orgId
StringBuilder sb = new StringBuilder();
sb.append(mainTitle).append("\n\n")
.append(morningPaperProperties.getSubTitle()).append("\n\n");
sb.append("<a href=\"").append(String.format(daySubjectUrl, corpId, orgId, daySubjectEntity.getId())).append("\">").append("快去转发获客吧").append("</a>\n\n");
parmMap.put("content", sb.toString());
log.info("===企业微信 推送===userID:{} agentId:{} corpId:{} wxcpUId:{} parmMap:{}",userInfoEntity.getId() , agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
if (StrUtil.isNotBlank(agentId) && StrUtil.isNotBlank(corpId) && StrUtil.isNotBlank(wxcpUId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {
feignClientForWxCp.sendMessage(agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
//查询orgCode
OrgEntity orgEntity = orgMapper.selectOne(new LambdaQueryWrapper<OrgEntity>().eq(OrgEntity::getId, orgId).last("limit 1"));
if (ObjectUtil.isNotNull(orgEntity)) {
userInfoEntities.stream().forEach(userInfoEntity -> {
List<DaySubjectEntity> daySubjectEntities = stringListMap.get(orgId);
daySubjectEntities.forEach(daySubjectEntity -> {
HashMap<String, String> parmMap = new HashMap<>();
parmMap.put("type", "text");
String wxOpenId = userInfoEntity.getUiOpenid();
String wxcpUId = userInfoEntity.getWxcpUid();
if (StringUtils.isNotBlank(wxcpUId)) {
// 1 企业微信 推送
String agentId = jsonKeyInfo.getStr("agentId");
String corpId = jsonKeyInfo.getStr("corpId");
// ww=corpId&orgCode=orgCode
StringBuilder sb = new StringBuilder();
sb.append(mainTitle).append("\n\n")
.append(morningPaperProperties.getSubTitle()).append("\n\n")
.append("<a href=\"")
.append(String.format(daySubjectUrl, corpId, orgEntity.getOrgCode(), daySubjectEntity.getId())).append("\">")
.append("快去转发获客吧")
.append("</a>\n\n");
parmMap.put("content", sb.toString());
log.info("===企业微信 推送===userID:{} agentId:{} corpId:{} wxcpUId:{} parmMap:{}",userInfoEntity.getId() , agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
if (StrUtil.isNotBlank(agentId) && StrUtil.isNotBlank(corpId) && StrUtil.isNotBlank(wxcpUId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {
feignClientForWxCp.sendMessage(agentId, corpId, wxcpUId, JSONUtil.toJsonStr(parmMap));
}
}
}
if (StringUtils.isNotBlank(wxOpenId)) {
// 2 公众号推送
String wxAppID = jsonKeyInfo.getStr("sendMessageAppId");
// ww=wxAppID&orgCode=orgId
StringBuilder sb = new StringBuilder();
sb.append(mainTitle).append("\n\n")
.append(morningPaperProperties.getSubTitle()).append("\n\n");
sb.append("<a href=\"").append(String.format(daySubjectUrl, wxAppID, orgId, daySubjectEntity.getId())).append("\">").append("快去转发获客吧").append("</a>\n\n");
parmMap.put("content", sb.toString());
log.info("===公众号 推送=== userID:{} wxAppID:{} wxOpenId:{} parmMap:{}",userInfoEntity.getId() , wxAppID, wxOpenId, JSONUtil.toJsonStr(parmMap));
if (StrUtil.isNotBlank(wxAppID) && StrUtil.isNotBlank(wxOpenId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {
feignClientForWxMp.sendMessage(wxAppID, wxOpenId, JSONUtil.toJsonStr(parmMap));
if (StringUtils.isNotBlank(wxOpenId)) {
// 2 公众号推送
String wxAppID = jsonKeyInfo.getStr("sendMessageAppId");
// ww=wxAppID&orgCode=orgCode
StringBuilder sb = new StringBuilder();
sb.append(mainTitle).append("\n\n")
.append(morningPaperProperties.getSubTitle()).append("\n\n")
.append("<a href=\"")
.append(String.format(daySubjectUrl, wxAppID, orgEntity.getOrgCode(), daySubjectEntity.getId())).append("\">")
.append("快去转发获客吧")
.append("</a>\n\n");
parmMap.put("content", sb.toString());
log.info("===公众号 推送=== userID:{} wxAppID:{} wxOpenId:{} parmMap:{}",userInfoEntity.getId() , wxAppID, wxOpenId, JSONUtil.toJsonStr(parmMap));
if (StrUtil.isNotBlank(wxAppID) && StrUtil.isNotBlank(wxOpenId) && StrUtil.isNotBlank(JSONUtil.toJsonStr(parmMap))) {
feignClientForWxMp.sendMessage(wxAppID, wxOpenId, JSONUtil.toJsonStr(parmMap));
}
} else {
log.error("======用户ID:{} 没有微信或企业微信id======", userInfoEntity.getId());
}
} else {
log.error("======用户ID:{} 没有微信或企业微信id======", userInfoEntity.getId());
}
});
});
});
}
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment