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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,21 +1,20 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.ComActService;
import com.panzhihua.service_community.service.ComMngStructAreaService;
import com.panzhihua.service_community.service.ComOpsHouseService;
import lombok.extern.slf4j.Slf4j;
import javax.annotation.Resource;

import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.service_community.service.ComMngStructAreaService;
import com.panzhihua.service_community.service.ComOpsHouseService;

import lombok.extern.slf4j.Slf4j;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -32,28 +31,31 @@
    @Resource
    private ComMngStructAreaService comMngStructAreaService;


    /**
     * 房屋租售-分页查询
     * @param pageComOpsHouseDTO 查询参数
     * 
     * @param pageComOpsHouseDTO
     *            查询参数
     * @return ComOpsHouseVO
     */
    @PostMapping("pageOpsHouse")
    public R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO){
    public R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO) {
        return comOpsHouseService.pageHouse(pageComOpsHouseDTO);
    }

    /**
     * 房屋租售-新增
     * @param comOpsHouseDTO 新增参数
     * 
     * @param comOpsHouseDTO
     *            新增参数
     * @return 新增结果
     */
    @PostMapping("addOpsHouse")
    public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO){
    public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO) {
        Long houseCommunityId = comOpsHouseDTO.getHouseCommunityId();
        if(houseCommunityId!=null) {
        if (houseCommunityId != null) {
            R<ComMngStructAreaVO> r = comMngStructAreaService.detailArea(houseCommunityId);
            if(R.isOk(r)&&r.getData()!=null) {
            if (R.isOk(r) && r.getData() != null) {
                ComMngStructAreaVO comMngStructAreaVO = r.getData();
                comOpsHouseDTO.setHouseCommunityName(comMngStructAreaVO.getAreaName());
            }
@@ -64,56 +66,66 @@

    /**
     * 房屋租售-详情
     * @param id 主键
     * 
     * @param id
     *            主键
     * @return ComOpsHouseVO
     */
    @PostMapping("detailOpsHouse")
    public R detailOpsHouse(@RequestParam("id") Long id){
    public R detailOpsHouse(@RequestParam("id") Long id) {
        return comOpsHouseService.detailHouse(id);
    }

    /**
     * 房屋租售-修改
     * @param comOpsHouseVO 修改参数
     * @return  修改结果
     * 
     * @param comOpsHouseVO
     *            修改参数
     * @return 修改结果
     */
    @PostMapping("putOpsHouse")
    @Transactional(rollbackFor = Exception.class)
    public R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO){
    public R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO) {
        R r = comOpsHouseService.putHouse(comOpsHouseVO);
        return r;
    }

    /**
     * 房屋租售-删除
     * @param id 主键
     * 
     * @param id
     *            主键
     * @return 删除结果
     */
    @PostMapping("deleteOpsHouse")
    public R deleteHouse(@RequestParam("id") Long id){
    public R deleteHouse(@RequestParam("id") Long id) {
        return comOpsHouseService.deleteHouse(id);
    }

    /**
     * 房屋租售-上下架
     * @param comOpsHouseVO 上下架参数
     * @return  上下架结果
     * 
     * @param comOpsHouseVO
     *            上下架参数
     * @return 上下架结果
     */
    @PostMapping("undercarriageHouse")
    @Transactional(rollbackFor = Exception.class)
    public R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO){
    public R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO) {
        R r = comOpsHouseService.undercarriageHouse(comOpsHouseVO);
        return r;
    }

    /**
     * 房屋租售-小程序修改
     * @param comOpsHouseVO 修改参数
     * @return  修改结果
     * 
     * @param comOpsHouseVO
     *            修改参数
     * @return 修改结果
     */
    @PostMapping("putOpsHouseByApplets")
    @Transactional(rollbackFor = Exception.class)
    public R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO){
    public R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO) {
        R r = comOpsHouseService.putHouseByApplets(comOpsHouseVO);
        return r;
    }