From d698714e61e1b322ef12d65a52089ceff8a63703 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 16:58:00 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index ac9462a..066bcf7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -18,6 +18,7 @@
import com.panzhihua.service_community.dao.ComActActEvaluateDAO;
import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -151,6 +152,8 @@
private ComActActEvaluateDAO comActActEvaluateDAO;
@Resource
private ComActActivityInviteService comActActivityInviteService;
+ @Resource
+ private RabbitTemplate rabbitTemplate;
/**
* 新增社区活动
@@ -634,6 +637,10 @@
BeanUtils.copyProperties(comActDynVO, comActDynDO);
boolean save = comActDynService.save(comActDynDO);
if (save) {
+ if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
+ comActDynVO.setId(comActDynDO.getId());
+ rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
+ }
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
Integer isTopping = comActDynVO.getIsTopping();
boolean b = isTopping.intValue() == 1;
@@ -2334,7 +2341,7 @@
* @return 社区列表
*/
@GetMapping("/eventgrid/community/westList")
- public R getWestCommunityLists(@RequestParam("areaCode")String areaCode) {
+ public R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode) {
return comActService.getWestCommunityLists(areaCode);
}
--
Gitblit v1.7.1