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

lidongdong

2022-11-18 97bb97c13ad63c40a8baf73b0f5e08d93c0e7559

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java

@@ -4,12 +4,16 @@

import javax.annotation.Resource;

import cn.hutool.core.util.StrUtil;
import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.dtos.common.PageComPbCheckUnitDto;
import com.panzhihua.common.model.dtos.community.PageMemberForInviteDTO;
import com.panzhihua.common.model.vos.common.ComPbCheckUnitVo;
import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign;
import com.panzhihua.common.service.partybuilding.PartyBuildingWestService;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +51,8 @@
    @Resource
    private PartyBuildingService partyBuildingService;
    @Resource
    private PartyBuildingWestService partyBuildingWestService;
    @Resource
    private UserService userService;
    @Resource
    private CheckService checkService;
@@ -73,7 +79,7 @@
            return R.fail("类型不能为空");
        }
        partyBuildingComPbDynVO.setStatus(2);
        return partyBuildingService.pageYnamic(partyBuildingComPbDynVO);
        return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO);
    }

    @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class)
@@ -110,7 +116,7 @@
    @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class)
    @GetMapping("infodynamic")
    public R infoYnamic(@RequestParam("id") Long id) {
        R r = partyBuildingService.infoYnamic(id);
        R r = partyBuildingWestService.infoYnamic(id);
        if (R.isOk(r)) {
            if (ObjectUtils.isEmpty(id) || 0 == id) {
                return R.fail("主键id不能为空");
@@ -128,7 +134,7 @@
                comPbDynUserVO.setCreateAt(new Date());
                comPbDynUserVO.setDynId(id);
                comPbDynUserVO.setUserId(userId);
                R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
                R r1 = partyBuildingWestService.addDynUser(comPbDynUserVO);
                if (R.isOk(r1)) {
                    partyBuildingComPbDynVO.setIsAdd(1);
                } else {
@@ -203,8 +209,11 @@
    public R addActivityinfo(@RequestBody @Validated(AddGroup.class) ComPbActivityDTO comPbActivityDTO) {
        // 微信内容审核
        String msg = comPbActivityDTO.getRichText();
        if (!checkService.checkMessage(msg)) {
            return R.fail("内容违规");
        if (StrUtil.isNotBlank(msg)) {
            String result = checkService.checkMessageBy(msg, this.getLoginUserInfo().getOpenid(),this.getAppId());
            if (StrUtil.isNotBlank(result)) {
                return R.fail(501, "填写内容存在 " + result + " 违规信息");
            }
        }
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long userId = loginUserInfo.getUserId();
@@ -259,17 +268,7 @@
    @ApiOperation(value = "编辑党员")
    @PutMapping("updatepartybuildingmember")
    public R updatePartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        if (partyBuildingMemberVO.getIsPb() != null) {
            Long id = partyBuildingMemberVO.getId();
            if (partyBuildingMemberVO.getIsPb() == 1) {
                if (null == id || 0 == id) {
                    return partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
                }
                return partyBuildingService.updatePartyBuildingMember(partyBuildingMemberVO);
            }
            return partyBuildingService.deleteprepartybuildingmember(id);
        }
        return R.fail();
    }

    @ApiOperation(value = "查询社区下所有党员报到单位", response = ComPbCheckUnitVo.class)
@@ -285,10 +284,8 @@
    @ApiOperation(value = "新增党员")
    @PostMapping("addpartybuildingmember")
    public R addPartyBuildingMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        Long communityId = this.getCommunityId();
        Long userId = this.getUserId();
        partyBuildingMemberVO.setUserId(userId);
        partyBuildingMemberVO.setCommunityId(communityId);
        R r = partyBuildingService.addPartyBuildingMember(partyBuildingMemberVO);
        if (R.isOk(r)) {
            R r1 = userService.updateUserPartyStatus(this.getUserId());
@@ -300,8 +297,15 @@
    @ApiOperation(value = "分页查询党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/member")
    public R pageMember(@RequestBody PartyBuildingMemberVO partyBuildingMemberVO) {
        partyBuildingMemberVO.setCommunityId(this.getCommunityId());
        //partyBuildingMemberVO.setCommunityId(this.getCommunityId());
        return partyBuildingService.getPagePbMember(partyBuildingMemberVO);
    }

    @ApiOperation(value = "分页查询注册党员列表",response = PartyBuildingMemberVO.class)
    @PostMapping("/page/registerMember")
    public R pageRegisterMember(@RequestBody PageMemberForInviteDTO pageMemberForInviteDTO) {
        pageMemberForInviteDTO.setAppid(this.getAppId());
        return partyBuildingService.pageRegisterMember(pageMemberForInviteDTO);
    }

    @ApiOperation(value = "查询所有社区列表", response = EventGridCommunityAdminVO.class)
@@ -313,6 +317,20 @@
    @ApiOperation(value = "查询当前用户党员信息")
    @GetMapping("/getPartyMember")
    public R getPartyMember(@RequestParam("type")Integer type){
        return partyBuildingService.getPartyMember(this.getUserId(),type);
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        if (StrUtil.isEmpty(loginUserInfo.getPhone())){
            return R.fail("请先实名认证");
        }
        return partyBuildingService.getPartyMember(loginUserInfo.getPhone(),type);
    }
    @ApiOperation(value = "查询报道单位详情")
    @GetMapping("/comPbCheckUnit/detailByPhone")
    public R detailById(@RequestParam("phone") String phone) {
        return partyBuildingService.detailByPhone(phone);
    }
    @ApiOperation(value = "党员详情",response =PartyBuildingMemberVO.class)
    @GetMapping("/memberDetail")
    public R memberDetail(@RequestParam("id")Long id){
        return partyBuildingService.memberDetail(id);
    }
}