Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 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
@@ -637,7 +638,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 +2333,7 @@
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**