huanghongfa
2020-12-25 079499c3f90e813e59ebeba62a22ca930e0df370
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/LoginApi.java
@@ -17,9 +17,12 @@
import com.panzhihua.common.exceptions.WeiXinException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -142,23 +145,22 @@
    }
    @ApiOperation(value = "查询社区")
    @GetMapping("listcommunity")
    @PostMapping("listcommunity")
    public R listCommunity(@RequestBody ComActVO comActVO){
        return communityService.listCommunity(comActVO);
    }
    @ApiOperation(value = "查询小区")
    @GetMapping("listarea")
    @ApiImplicitParam(name ="communityId",value = "社区id",required = true)
    public R listArea(@RequestParam("communityId") Long communityId){
        return communityService.listArea(communityId);
    }
    @ApiOperation(value = "用户绑定社区、小区")
    @PutMapping("putusercommunityarea")
    public R putUserCommunityArea(@RequestBody LoginUserInfoVO loginUserInfoVO){
    public R putUserCommunityArea(@RequestBody @Validated(PutGroup.class) LoginUserInfoVO loginUserInfoVO){
        Long userId = this.getUserId();
        Long communityId = loginUserInfoVO.getCommunityId();
        Long areaId = loginUserInfoVO.getAreaId();
        if (null==communityId||0==communityId) {
            return R.fail("社区未选择");
        }
        if (null==areaId||0==areaId) {
            return R.fail("小区未选择");
        }
        loginUserInfoVO.setUserId(userId);
        return userService.putUserCommunityArea(loginUserInfoVO);
    }