Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-27 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f

 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;

    /**
     * 新增社区活动
@@ -2332,7 +2335,7 @@
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**
@@ -2685,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);
    }
}