From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
index 2a4b4db..4076b80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java
@@ -3,7 +3,13 @@
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 org.springframework.transaction.annotation.Transactional;
@@ -23,6 +29,19 @@
public class HouseApi {
@Resource
private ComOpsHouseService comOpsHouseService;
+ @Resource
+ private ComMngStructAreaService comMngStructAreaService;
+
+
+ /**
+ * 房屋租售-分页查询
+ * @param pageComOpsHouseDTO 查询参数
+ * @return ComOpsHouseVO
+ */
+ @PostMapping("pageOpsHouse")
+ public R pageOpsHouse(@RequestBody PageComOpsHouseDTO pageComOpsHouseDTO){
+ return comOpsHouseService.pageHouse(pageComOpsHouseDTO);
+ }
/**
* 房屋租售-新增
@@ -31,6 +50,15 @@
*/
@PostMapping("addOpsHouse")
public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO){
+ Long houseCommunityId = comOpsHouseDTO.getHouseCommunityId();
+ if(houseCommunityId!=null) {
+ R<ComMngStructAreaVO> r = comMngStructAreaService.detailArea(houseCommunityId);
+ if(R.isOk(r)&&r.getData()!=null) {
+ ComMngStructAreaVO comMngStructAreaVO = r.getData();
+ comOpsHouseDTO.setHouseCommunityName(comMngStructAreaVO.getAreaName());
+ }
+
+ }
return comOpsHouseService.addHouse(comOpsHouseDTO);
}
@@ -44,6 +72,11 @@
return comOpsHouseService.detailHouse(id);
}
+ /**
+ * 房屋租售-修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
@PostMapping("putOpsHouse")
@Transactional(rollbackFor = Exception.class)
public R putOpsHouse(@RequestBody ComOpsHouseVO comOpsHouseVO){
@@ -62,13 +95,27 @@
}
/**
- * 房屋租售-分页查询
- * @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;
+ }
+
+ /**
+ * 房屋租售-小程序修改
+ * @param comOpsHouseVO 修改参数
+ * @return 修改结果
+ */
+ @PostMapping("putOpsHouseByApplets")
+ @Transactional(rollbackFor = Exception.class)
+ public R putOpsHouseByApplets(@RequestBody ComOpsHouseVO comOpsHouseVO){
+ R r = comOpsHouseService.putHouseByApplets(comOpsHouseVO);
+ return r;
}
}
--
Gitblit v1.7.1