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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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

@@ -6,9 +6,11 @@
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -56,9 +58,9 @@
    @ApiOperation(value = "房屋租售-分页查询",response = ComOpsHouseVO.class)
    @PostMapping("pagehouse")
    public R pageHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO) {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin();
        Integer isMy = pageComOpsHouseDTO.getIsMy();
        if (null!=isMy&&isMy.intValue()==1) {
        if (null!=isMy&&isMy.equals(1)) {
            pageComOpsHouseDTO.setUserId(loginUserInfo.getUserId());
        }
        return communityService.pageOpsHouse(pageComOpsHouseDTO);
@@ -73,6 +75,24 @@
    }


    @ApiOperation(value = "房屋租售-修改")
    @PostMapping("putHouse")
    public R updateHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseVO comOpsHouseVO) {
        return communityService.putOpsHouseByApplets(comOpsHouseVO);
    }

    @ApiOperation(value = "房屋租售-删除")
    @GetMapping("delHouse")
    @ApiImplicitParam(name = "id",value = "房屋租售主键",required = true)
    public R delHouse(@RequestParam("id") Long id) {
        return communityService.deleteOpsHouse(id);
    }

    @ApiOperation(value = "房屋租售-上下架")
    @PostMapping("undercarriageHouse")
    public R undercarriageHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseUndercarriageVO comOpsHouseVO) {
        return communityService.undercarriageHouse(comOpsHouseVO);
    }