Merge remote-tracking branch 'origin/master'

Null

2021-03-17 cabbe790ba8b58507a39a007e3bcf273bab1bbe4

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

@@ -3,11 +3,11 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.partybuilding.PartyBuildingActivityVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -39,6 +39,12 @@
    private CommunityService communityService;
    @Resource
    private UserService userService;

    @ApiOperation(value = "分页查询社区",response = ComActVO.class)
    @PostMapping("pagecommunity")
    public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){
        return communityService.pageCommunity(pageComActDTO);
    }

    @ApiOperation(value = "分页获取社区动态",response = ComActDynVO.class)
    @PostMapping("pagedynamic")
@@ -174,9 +180,9 @@
    }


    @ApiOperation(value = "车辆登记",response = ComMngVolunteerMngAppletsVO.class)
    @PostMapping("car/add")
    public R addComMngCarApplet(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
    @ApiOperation(value = "车辆登记")
    @PostMapping("car/register")
    public R addComMngCar(@RequestBody ComMngCarAppletDTO comMngCarAppletDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        if (null!=communityId && 0!=communityId) {
@@ -185,9 +191,15 @@
            comMngCarAppletDTO.setUserName(loginUserInfo.getName());
            comMngCarAppletDTO.setUserId(loginUserInfo.getUserId());
            comMngCarAppletDTO.setMobile(loginUserInfo.getPhone());
            comMngCarAppletDTO.setSource(1);
        }
        return communityService.addComMngCarApplet(comMngCarAppletDTO);
    }

    @ApiOperation(value = "登记车辆列表",response = ComMngCarVO.class)
    @GetMapping("car/list")
    public R comMngCarList() {
        return communityService.userComMngCarList(this.getUserId());
    }
}