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;
@@ -18,6 +19,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;
@@ -100,7 +102,7 @@
@Slf4j
@RestController
@RequestMapping("/")
public class CommunityApi {
public class CommunityApi extends BaseController {
    @Resource
    public ComMngPopulationDAO comMngPopulationDAO;
    @Resource
@@ -151,6 +153,8 @@
    private ComActActEvaluateDAO comActActEvaluateDAO;
    @Resource
    private ComActActivityInviteService comActActivityInviteService;
    @Resource
    private RabbitTemplate rabbitTemplate;

    /**
     * 新增社区活动
@@ -634,6 +638,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;
@@ -2325,7 +2333,7 @@
     */
    @GetMapping("/eventgrid/community/list")
    public R getCommunityLists() {
        return comActService.getCommunityLists();
        return comActService.getCommunityLists(this.getAppId());
    }

    /**
@@ -2334,7 +2342,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);
    }