新增接口一起议

huanghongfa

2021-01-22 04c96f26282f021fcc59b40d6f11f172fc070af8

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/api/PartyBuildIngApi.java

@@ -1,10 +1,15 @@
package com.panzhihua.service_dangjian.api;

import com.panzhihua.common.exceptions.PartyBuildingMemberException;
import com.panzhihua.common.model.dtos.partybuilding.ActivitySignUpDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbActivityDTO;
import com.panzhihua.common.model.dtos.partybuilding.ComPbServiceTeamDTO;
import com.panzhihua.common.model.dtos.partybuilding.PageComPbServiceTeamDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.partybuilding.*;
import com.panzhihua.service_dangjian.service.ComBpActivityService;
import com.panzhihua.service_dangjian.service.ComPbMemberService;
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
import com.panzhihua.service_dangjian.service.PartyOrganizationService;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +32,8 @@
    private PartyOrganizationService partyOrganizationService;
    @Resource
    private ComBpActivityService comBpActivityService;
    @Resource
    private ComPbServiceTeamService comPbServiceTeamService;

    /**
     * 平台所有的党组织
@@ -54,7 +61,20 @@
     */
    @PostMapping("listsavepartybuildingmemberexcelvo")
    public R listSavePartyBuildingMemberExcelVO(@RequestBody List<PartyBuildingMemberExcelVO> list){
        return  comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        R r = null;
        try {
            r = comPbMemberService.listSavePartyBuildingMemberExcelVO(list);
        } catch (PartyBuildingMemberException e) {
            return R.fail(e.getMsg());
        }catch (Exception e) {
            e.printStackTrace();
            if (e.getMessage().contains("unique_id_card_community_id")) {
                return R.fail("身份证重复");
            }else  {
                return R.fail("导入失败");
            }
        }
        return r;
        
    }

@@ -318,11 +338,12 @@
    /**
     * 用户的所有党建活动
     * @param userId 用户id
     * @param communityId 社区id
     * @return  党建活动列表
     */
    @PostMapping("listactivity")
    public R listActivity(@RequestParam("userId") Long userId){
        return  comBpActivityService.listActivity(userId);
    public R listActivity(@RequestParam("userId") Long userId,@RequestParam("communityId")Long communityId){
        return  comBpActivityService.listActivity(userId,communityId);
        
    }

@@ -351,9 +372,86 @@
     * @param id 党建活动id
     * @return 人员id集合
     */
    @PostMapping("/partybuildIng/selectallpartybuildingactivitymembers")
    @PostMapping("selectallpartybuildingactivitymembers")
    public R selectAllPartyBuildingActivityMembers(@RequestParam("id")Long id){
        return  comBpActivityService.selectAllPartyBuildingActivityMembers(id);
    }

    /**
     * 定时任务刷新党建动态发布状态
     * @return 刷新数据数量
     */
    @PostMapping("timedtaskpartybuildingstatus")
    R timedTaskPartyBuildingStatus(){
        return  comPbMemberService.timedTaskPartyBuildingStatus();
    }

    /**
     * 定时任务取消党建活动
     * @return 党建活动集合
     */
    @PostMapping("timedtaskpartybuildingactivity")
    public R timedTaskPartyBuildingActivity(){
        return comBpActivityService.timedTaskPartyBuildingActivity();
}

    /**
     * 定时任务刷新党建活动的各个状态 除取消外
     * @return  修改结果
     */
    @PostMapping("timedtaskpartybuildingactivityall")
    public R timedTaskPartyBuildingActivityAll(){
        return comBpActivityService.timedTaskPartyBuildingActivityAll();
    }

    /**
     * 新增服务团队人员
     * @param comPbServiceTeamDTO 新增内容
     * @return 新增结果
     */
    @PostMapping("addserviceteam")
    public R addServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.addServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 编辑团队人员
     * @param comPbServiceTeamDTO 编辑内容
     * @return 编辑结果
     */
    @PostMapping("putserviceteam")
    public R putServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.putServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 分页查询服务团队成员
     * @param pageComPbServiceTeamDTO 查询参数
     * @return 查询结果
     */
    @PostMapping("pageserviceteam")
    public R pageServiceTeam(@RequestBody PageComPbServiceTeamDTO pageComPbServiceTeamDTO){
        return comPbServiceTeamService.PageComPbServiceTeamDTO(pageComPbServiceTeamDTO);
    }

    /**
     * 删除服务团队人员
     * @param comPbServiceTeamDTO 删除主键
     * @return 删除结果
     */
    @PostMapping("deleteserviceteam")
    public R deleteServiceTeam(@RequestBody ComPbServiceTeamDTO comPbServiceTeamDTO){
        return comPbServiceTeamService.deleteServiceTeam(comPbServiceTeamDTO);
    }

    /**
     * 创建党员活动 小程序创建党员活动
     * @param comPbActivityDTO 创建内容
     * @return 创建结果
     */
    @PostMapping("addactivityinfo")
    R addActivityApplets(@RequestBody ComPbActivityDTO comPbActivityDTO){
        return comBpActivityService.addActivityApplets(comPbActivityDTO);
    }

}