From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 52 insertions(+), 41 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
index 88fd25a..ea7ac77 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComOpsHouseServiceImpl.java
@@ -1,5 +1,12 @@
package com.panzhihua.service_community.service.impl;
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.enums.OpsHouseStatus;
@@ -13,12 +20,6 @@
import com.panzhihua.service_community.dao.ComOpsHouseDAO;
import com.panzhihua.service_community.model.dos.ComOpsHouseDO;
import com.panzhihua.service_community.service.ComOpsHouseService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
-
-import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -34,22 +35,24 @@
/**
* 房屋租售-新增
*
- * @param comOpsHouseDTO 新增参数
+ * @param comOpsHouseDTO
+ * 新增参数
* @return 新增结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R addHouse(ComOpsHouseDTO comOpsHouseDTO) {
- ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
- BeanUtils.copyProperties(comOpsHouseDTO,comOpsHouseDO);
+ ComOpsHouseDO comOpsHouseDO = new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseDTO, comOpsHouseDO);
int inserted = comOpsHouseDAO.insert(comOpsHouseDO);
- return inserted==1?R.ok():R.fail();
+ return inserted == 1 ? R.ok() : R.fail();
}
/**
* 房屋租售-详情
*
- * @param id 主键
+ * @param id
+ * 主键
* @return ComOpsHouseVO
*/
@Override
@@ -58,10 +61,10 @@
if (ObjectUtils.isEmpty(comOpsHouseDO)) {
return R.fail("房屋租售不存在");
}
- ComOpsHouseVO comOpsHouseVO=new ComOpsHouseVO();
- BeanUtils.copyProperties(comOpsHouseDO,comOpsHouseVO);
+ ComOpsHouseVO comOpsHouseVO = new ComOpsHouseVO();
+ BeanUtils.copyProperties(comOpsHouseDO, comOpsHouseVO);
Long userId = comOpsHouseDO.getUserId();
- LoginUserInfoVO loginUserInfoVO=comOpsHouseDAO.selectUserByUserId(userId);
+ LoginUserInfoVO loginUserInfoVO = comOpsHouseDAO.selectUserByUserId(userId);
comOpsHouseVO.setUserName(loginUserInfoVO.getName());
return R.ok(comOpsHouseVO);
@@ -69,14 +72,16 @@
/**
* 房屋租售-修改
- * @param comOpsHouseVO 修改参数
- * @return 修改结果
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R putHouse(ComOpsHouseVO comOpsHouseVO) {
- ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
- BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO);
+ ComOpsHouseDO comOpsHouseDO = new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseVO, comOpsHouseDO);
comOpsHouseDAO.updateById(comOpsHouseDO);
return R.ok();
}
@@ -84,25 +89,26 @@
/**
* 房屋租售-删除
*
- * @param id 主键
+ * @param id
+ * 主键
* @return 删除结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R deleteHouse(Long id) {
- if(id == null){
+ if (id == null) {
return R.fail("参数错误");
}
ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(id);
- if(oldComOpsHouseDO == null){
+ if (oldComOpsHouseDO == null) {
return R.fail("该房屋租售信息不存在");
}
- if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){
+ if (oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())) {
return R.fail("该房屋租售信息不可删除,请刷新");
}
int delete = comOpsHouseDAO.deleteById(id);
- if (delete>0) {
+ if (delete > 0) {
return R.ok();
}
return R.fail();
@@ -111,7 +117,8 @@
/**
* 房屋租售-分页查询
*
- * @param pageComOpsHouseDTO 查询参数
+ * @param pageComOpsHouseDTO
+ * 查询参数
* @return ComOpsHouseVO
*/
@Override
@@ -119,17 +126,17 @@
Page page = new Page<>();
Long pageNum = pageComOpsHouseDTO.getPageNum();
Long pageSize = pageComOpsHouseDTO.getPageSize();
- if (null==pageNum||0==pageNum) {
+ if (null == pageNum || 0 == pageNum) {
pageNum = 1l;
}
- if (null==pageSize||0==pageSize) {
+ if (null == pageSize || 0 == pageSize) {
pageSize = 10l;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- if(!StringUtils.isEmpty(pageComOpsHouseDTO.getUserName())){
+ if (!StringUtils.isEmpty(pageComOpsHouseDTO.getUserName())) {
Long userId = comOpsHouseDAO.selectUserIdByName(pageComOpsHouseDTO.getUserName());
- if (userId==null){
+ if (userId == null) {
userId = -1L;
}
pageComOpsHouseDTO.setUserId(userId);
@@ -141,47 +148,51 @@
/**
* 房屋租售-上下架
- * @param comOpsHouseVO 上下架参数
- * @return 上下架结果
+ *
+ * @param comOpsHouseVO
+ * 上下架参数
+ * @return 上下架结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R undercarriageHouse(ComOpsHouseUndercarriageVO comOpsHouseVO) {
- //判断当前房屋租售信息状态
+ // 判断当前房屋租售信息状态
ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId());
- if(oldComOpsHouseDO == null){
+ if (oldComOpsHouseDO == null) {
return R.fail("该房屋租售信息不存在");
}
- if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){
+ if (oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())) {
return R.fail("该房屋租售信息不可修改,请刷新");
}
- BeanUtils.copyProperties(comOpsHouseVO,oldComOpsHouseDO);
+ BeanUtils.copyProperties(comOpsHouseVO, oldComOpsHouseDO);
comOpsHouseDAO.updateById(oldComOpsHouseDO);
return R.ok();
}
/**
* 房屋租售-小程序修改
- * @param comOpsHouseVO 修改参数
- * @return 修改结果
+ *
+ * @param comOpsHouseVO
+ * 修改参数
+ * @return 修改结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public R putHouseByApplets(ComOpsHouseVO comOpsHouseVO) {
ComOpsHouseDO oldComOpsHouseDO = comOpsHouseDAO.selectById(comOpsHouseVO.getId());
- if(oldComOpsHouseDO == null){
+ if (oldComOpsHouseDO == null) {
return R.fail("该房屋租售信息不存在");
}
- if(oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())){
+ if (oldComOpsHouseDO.getStatus().equals(OpsHouseStatus.AUDIT.getCode())) {
return R.fail("该房屋租售信息不可修改,请刷新");
}
- ComOpsHouseDO comOpsHouseDO=new ComOpsHouseDO();
- BeanUtils.copyProperties(comOpsHouseVO,comOpsHouseDO);
- //设置房屋租售信息为待审核
+ ComOpsHouseDO comOpsHouseDO = new ComOpsHouseDO();
+ BeanUtils.copyProperties(comOpsHouseVO, comOpsHouseDO);
+ // 设置房屋租售信息为待审核
comOpsHouseDO.setStatus(OpsHouseStatus.AUDIT.getCode());
comOpsHouseDAO.updateById(comOpsHouseDO);
return R.ok();
--
Gitblit v1.7.1