From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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..88a395c 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
@@ -1,22 +1,26 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.applets.weixin.CheckService;
import com.panzhihua.common.controller.BaseController;
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.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;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -34,11 +38,10 @@
@Resource
private CheckService checkService;
-
@ApiOperation(value = "房屋租售-新增")
@PostMapping("house")
public R addHouse(@RequestBody @Validated(AddGroup.class) ComOpsHouseDTO comOpsHouseDTO) {
-// 微信内容审核
+ // 微信内容审核
String introduction = comOpsHouseDTO.getIntroduction();
if (!checkService.checkMessage(introduction)) {
return R.fail("内容违规");
@@ -48,31 +51,45 @@
Long communityId = loginUserInfo.getCommunityId();
comOpsHouseDTO.setUserId(userId);
comOpsHouseDTO.setCommunityId(communityId);
+ comOpsHouseDTO.setUserType(1);
return communityService.addOpsHouse(comOpsHouseDTO);
}
-
- @ApiOperation(value = "房屋租售-分页查询",response = ComOpsHouseVO.class)
+ @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);
}
-
- @ApiOperation(value = "房屋租售-详情",response = ComOpsHouseVO.class)
+ @ApiOperation(value = "房屋租售-详情", response = ComOpsHouseVO.class)
@GetMapping("house")
- @ApiImplicitParam(name = "id",value = "房屋租售主键",required = true)
+ @ApiImplicitParam(name = "id", value = "房屋租售主键", required = true)
public R detailHouse(@RequestParam("id") Long id) {
return communityService.detailOpsHouse(id);
}
+ @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