Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 f4c8664c2d1c6d6e62f75433a27c5645942d5e85

Merge branch 'acid_push' into huacheng_test

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActDynTypeVO.java

@@ -43,4 +43,6 @@

    @ApiModelProperty("社区id，当此值为0时，该社区动态分类为系统预设，不可操作")
    private Long communityId;

    private String category;
}

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1277,6 +1277,6 @@


    @GetMapping("/accept")
     R accept(@RequestParam("userId") Long userId);
     R accept(@RequestParam("userId")Long userId);

}

 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,9 @@
        BeanUtils.copyProperties(comActDynVO, comActDynDO);
        boolean save = comActDynService.save(comActDynDO);
        if (save) {
            if(comActDynVO.getCategory()==4){
                rabbitTemplate.convertAndSend("huacheng.acid.message.exchange", "huacheng.acid.message.key", comActDynVO);
            }
            // 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
            Integer isTopping = comActDynVO.getIsTopping();
            boolean b = isTopping.intValue() == 1;

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActDynServiceImpl.java

@@ -104,7 +104,12 @@
            }
        }
        if(comActDynDO.getCategory()==4){
            comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
            if(comActDynDO.getReadNum()!=null){
                comActDynDO.setReadNum(comActDynDO.getReadNum()+1);
            }
            else {
                comActDynDO.setReadNum(1);
            }
            comActDynDAO.updateById(comActDynDO);
        }
        return R.ok(comActDynVO);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActDynTypeDOMapper.xml

@@ -31,7 +31,8 @@
            cadt.create_at,
            cadt.update_at,
            su.`name` AS createBy,
            su1.`name` AS updateBy
            su1.`name` AS updateBy,
               cadt.category
        FROM
            com_act_dyn_type AS cadt
            LEFT JOIN sys_user AS su ON su.user_id = cadt.create_by