From 239df6b32472882b4bd74fe97d9cc589c4f39baf Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 15 八月 2021 12:25:47 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
index f1810fa..07cd7e1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java
+++ b/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;
@@ -48,6 +50,7 @@
Long communityId = loginUserInfo.getCommunityId();
comOpsHouseDTO.setUserId(userId);
comOpsHouseDTO.setCommunityId(communityId);
+ comOpsHouseDTO.setUserType(1);
return communityService.addOpsHouse(comOpsHouseDTO);
}
@@ -55,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);
@@ -72,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);
+ }
--
Gitblit v1.7.1