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; @@ -73,6 +75,24 @@ } @ApiOperation(value = "房屋租售-修改") @PostMapping("putHouse") public R updateHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseVO comOpsHouseVO) { return communityService.putOpsHouse(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); }
New file @@ -0,0 +1,24 @@ package com.panzhihua.common.enums; import lombok.Getter; /** * 房屋租售状态 * * @author huanghongfa */ @Getter public enum OpsHouseStatus { AUDIT(0, "待审核"), GROUNDING(1, "已上架"), REJECTED(2, "已驳回"), UNDERCARRIAGE(2, "已下架"); private final int code; private final String info; OpsHouseStatus(int code, String info) { this.code = code; this.info = info; } } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/ComOpsHouseDTO.java
@@ -54,7 +54,7 @@ * 价格 */ @ApiModelProperty(value="价格") private Integer amount; private Double amount; /** * 面积 */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseUndercarriageVO.java
New file @@ -0,0 +1,36 @@ package com.panzhihua.common.model.vos.community; import com.panzhihua.common.validated.PutGroup; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.time.LocalDateTime; import java.util.Date; /** * @program: springcloud_k8s_panzhihuazhihuishequ * @description: 房屋租售上下架请求对象 * @author: huang.hongfa weixin hhf9596 qq 959656820 * @create: 2021-01-22 14:48 **/ @Data public class ComOpsHouseUndercarriageVO implements Serializable { private static final long serialVersionUID = 1L; /** * 房屋租售记录id */ @ApiModelProperty(value="房屋租售记录id") @NotNull(groups = {PutGroup.class},message = "租售记录id不能为空") private Long id; /** * 状态 0待审核 1已上架 2已驳回 3已下架 */ @ApiModelProperty(value="状态 0待审核 1已上架 2已驳回 3已下架") @NotNull(groups = {PutGroup.class},message = "状态不可为空") private Integer status; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComOpsHouseVO.java
@@ -56,7 +56,7 @@ * 价格 */ @ApiModelProperty(value="价格") private Integer amount; private Double amount; /** * 面积 */ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/InputUserInfoVO.java
@@ -102,11 +102,11 @@ private String address; @ApiModelProperty("创建时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createAt; @ApiModelProperty("修改时间") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateAt; @ApiModelProperty("是否残疾人 0 否 1是") springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -954,10 +954,23 @@ @PostMapping("detailOpsHouse") R detailOpsHouse(@RequestParam("id") Long id); /** * 房屋租售-修改 * @param comOpsHouseVO 修改参数 * @return 修改结果 */ @PostMapping("/putOpsHouse") R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO); /** * 房屋租售-上下架 * @param comOpsHouseVO 上下架参数 * @return 上下架结果 */ @PostMapping("/undercarriageHouse") R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO); /** * 一起议-删除 * @param id 主键 * @return 删除结果 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
@@ -3,6 +3,7 @@ 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.ComOpsHouseUndercarriageVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; import com.panzhihua.service_community.service.ComOpsHouseService; import lombok.extern.slf4j.Slf4j; @@ -24,6 +25,17 @@ @Resource private ComOpsHouseService comOpsHouseService; /** * 房屋租售-分页查询 * @param pageComOpsHouseDTO 查询参数 * @return ComOpsHouseVO */ @PostMapping("pageOpsHouse") public R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO){ return comOpsHouseService.pageHouse(pageComOpsHouseDTO); } /** * 房屋租售-新增 * @param comOpsHouseDTO 新增参数 @@ -44,6 +56,11 @@ return comOpsHouseService.detailHouse(id); } /** * 房屋租售-修改 * @param comOpsHouseVO 修改参数 * @return 修改结果 */ @PostMapping("putOpsHouse") @Transactional(rollbackFor = Exception.class) public R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO){ @@ -62,13 +79,15 @@ } /** * 房屋租售-分页查询 * @param pageComOpsHouseDTO 查询参数 * @return ComOpsHouseVO * 房屋租售-上下架 * @param comOpsHouseVO 上下架参数 * @return 上下架结果 */ @PostMapping("pageOpsHouse") public R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO){ return comOpsHouseService.pageHouse(pageComOpsHouseDTO); @PostMapping("undercarriageHouse") @Transactional(rollbackFor = Exception.class) public R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO){ R r = comOpsHouseService.undercarriageHouse(comOpsHouseVO); return r; } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComOpsHouseDO.java
@@ -59,7 +59,7 @@ * 价格 */ @ApiModelProperty(value="价格") private Integer amount; private Double amount; /** * 面积 */ springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComOpsHouseService.java
@@ -3,6 +3,7 @@ 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.ComOpsHouseUndercarriageVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; /** @@ -25,6 +26,11 @@ */ R detailHouse(Long id); /** * 房屋租售-修改 * @param comOpsHouseVO 修改参数 * @return 修改结果 */ R putHouse(ComOpsHouseVO comOpsHouseVO); /** * 房屋租售-删除 @@ -38,4 +44,11 @@ * @return ComOpsHouseVO */ R pageHouse(PageComOpsHouseDTO pageComOpsHouseDTO); /** * 房屋租售-上下架 * @param comOpsHouseVO 上下架参数 * @return 上下架结果 */ R undercarriageHouse(ComOpsHouseUndercarriageVO comOpsHouseVO); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
@@ -2,10 +2,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.enums.OpsHouseStatus; import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; 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.utlis.StringUtils; import com.panzhihua.service_community.dao.ComOpsHouseDAO; @@ -65,10 +67,31 @@ return R.ok(comOpsHouseVO); } /** * 房屋租售-修改 * @param comOpsHouseVO 修改参数 * @return 修改结果 */ @Override @Transactional(rollbackFor = Exception.class) public R putHouse(ComOpsHouseVO comOpsHouseVO) { //判断当前房屋租售信息状态 if(comOpsHouseVO.getId() == null){ return R.fail("参数错误"); } ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId()); if(oldComOpsHouseDO == null){ return R.fail("该房屋租售信息不存在"); } if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){ return R.fail("该房屋租售信息不可修改,请刷新"); } ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO(); BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO); //设置房屋租售信息为待审核 comOpsHouseDO.setStatus(OpsHouseStatus.AUDIT.getCode()); comOpsHouseDAO.updateById(comOpsHouseDO); return R.ok(); } @@ -80,7 +103,19 @@ * @return 删除结果 */ @Override @Transactional(rollbackFor = Exception.class) public R deleteHouse(Long id) { if(id == null){ return R.fail("参数错误"); } ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(id); if(oldComOpsHouseDO == null){ return R.fail("该房屋租售信息不存在"); } if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){ return R.fail("该房屋租售信息不可删除,请刷新"); } int delete = comOpsHouseDAO.deleteById(id); if (delete>0) { return R.ok(); @@ -119,4 +154,27 @@ } /** * 房屋租售-上下架 * @param comOpsHouseVO 上下架参数 * @return 上下架结果 */ @Override @Transactional(rollbackFor = Exception.class) public R undercarriageHouse(ComOpsHouseUndercarriageVO comOpsHouseVO) { //判断当前房屋租售信息状态 ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId()); if(oldComOpsHouseDO == null){ return R.fail("该房屋租售信息不存在"); } if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){ return R.fail("该房屋租售信息不可修改,请刷新"); } BeanUtils.copyProperties(comOpsHouseVO,oldComOpsHouseDO); comOpsHouseDAO.updateById(oldComOpsHouseDO); return R.ok(); } }
