From 5fb93eaa61d42d7ebb7048057d45e285efd7f0dc Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 29 九月 2022 11:05:04 +0800
Subject: [PATCH] Merge branch '20220927' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
index 32c7928..f6209a4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/AcidMessage.java
@@ -8,7 +8,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.service_community.dao.ComActDAO;
+import com.panzhihua.service_community.dao.SysUserDao;
import com.panzhihua.service_community.model.dos.ComActDO;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.stereotype.Component;
@@ -33,12 +35,15 @@
public static final String DELAYED_QUEUE="huacheng.acid.queue";
public static final String ACID_DANGER_QUEUE = "huacheng.acid.danger.queue";
public static final String DIRECT_QUEUE="huacheng.acid.direct.queue";
+ public static final String ACID_MESSAGE_QUEUE="huacheng.acid.message.queue";
@Resource
private UserService userService;
@Resource
private ComActAcidMemberService comActAcidMemberService;
@Resource
private ComActDAO comActDAO;
+ @Resource
+ private SysUserDao sysUserDao;
@RabbitListener(queues=DELAYED_QUEUE)
public void doTemplate(ComActAcidRecordVO comActAcidRecordVO) {
@@ -48,7 +53,7 @@
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = null;
try {
- accessToken = util.getXQAppAccessToken();
+ accessToken = util.getAccessToken();
} catch (Exception e) {
e.printStackTrace();
}
@@ -66,7 +71,7 @@
WxXCXTempSend util = new WxXCXTempSend();
String accessToken = null;
try {
- accessToken = util.getXQAppAccessToken();
+ accessToken = util.getAccessToken();
} catch (Exception e) {
e.printStackTrace();
}
@@ -89,13 +94,13 @@
String town=comActAcidRecordVO.getLocalCity().split(",")[2];
String area=comActAcidRecordVO.getLocalCity().split(",")[1];
String country=comActAcidRecordVO.getLocalCity().split(",")[0];
- List<ComActDO> comActDOS=comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town));
+ List<ComActDO> comActDOS=comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town).eq(ComActDO::getAppId,"wx118de8a734d269f0"));
if(CollectionUtils.isNotEmpty(comActDOS)){
if(comActDOS.size()==1){
loginUserInfoVO.setCommunityId(comActDOS.get(0).getCommunityId());
}
else {
- ComActDO comActDO=comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getName,town).and(comActDOLambdaQueryWrapper -> comActDOLambdaQueryWrapper.like(ComActDO::getAddress,town).or().like(ComActDO::getAddress,area).or().like(ComActDO::getAddress,country)));
+ ComActDO comActDO=comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAppId,"wx118de8a734d269f0").eq(ComActDO::getName,town).and(comActDOLambdaQueryWrapper -> comActDOLambdaQueryWrapper.like(ComActDO::getAddress,town).or().like(ComActDO::getAddress,area).or().like(ComActDO::getAddress,country)));
if(comActDO!=null){
loginUserInfoVO.setCommunityId(comActDO.getCommunityId());
}
@@ -107,4 +112,16 @@
}
}
}
+ @RabbitListener(queues = ACID_MESSAGE_QUEUE)
+ public void sendMessage(ComActDynVO comActDynVO){
+ List<String> openIds=sysUserDao.selectOpenId();
+ WxXCXTempSend wxXCXTempSend=new WxXCXTempSend();
+ for(String openId:openIds){
+ try {
+ WxUtil.sendLongTimeTemplate(openId,wxXCXTempSend.getAccessToken("wx118de8a734d269f0"),"疫情快讯",comActDynVO.getTitle().length()>10?comActDynVO.getTitle().substring(0,10)+"..":comActDynVO.getTitle(),"/pages/community_child/community/detail?id="+comActDynVO.getId()+"&title=疫情快讯详情");
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
}
--
Gitblit v1.7.1