From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 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 ed89add..f876274 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
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
@@ -101,7 +102,7 @@
@Slf4j
@RestController
@RequestMapping("/")
-public class CommunityApi {
+public class CommunityApi extends BaseController {
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
@Resource
@@ -154,6 +155,8 @@
private ComActActivityInviteService comActActivityInviteService;
@Resource
private RabbitTemplate rabbitTemplate;
+ @Resource
+ private AutomessageSysUserService automessageSysUserService;
/**
* 新增社区活动
@@ -637,7 +640,8 @@
BeanUtils.copyProperties(comActDynVO, comActDynDO);
boolean save = comActDynService.save(comActDynDO);
if (save) {
- if(comActDynVO.getCategory()==4){
+ if(comActDynVO.getCategory()!=null&&comActDynVO.getCategory()==4){
+ comActDynVO.setId(comActDynDO.getId());
rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
}
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
@@ -2331,7 +2335,7 @@
*/
@GetMapping("/eventgrid/community/list")
public R getCommunityLists() {
- return comActService.getCommunityLists();
+ return comActService.getCommunityLists(this.getAppId());
}
/**
@@ -2684,4 +2688,25 @@
public R activityInviteDelete(@RequestParam("id") Long id) {
return comActActivityInviteService.activityInviteDelete(id);
}
+
+ /**
+ * 根据id查询重复的社区id集合
+ * @param id
+ * @return
+ */
+ @GetMapping("selectCommunityIds")
+ public R selectCommunityIds(@RequestParam("id") Long id){
+ return comActService.selectIds(id);
+ }
+
+
+ /**
+ * 通过id查询用户
+ * @param id
+ * @return
+ */
+ @GetMapping("selectAutomessageSysUserById")
+ public R selectAutomessageSysUserById(@RequestParam("id") Long id){
+ return automessageSysUserService.selectAutomessageSysUserById(id);
+ }
}
--
Gitblit v1.7.1