From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/HouseApi.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 07cd7e1..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,5 +1,10 @@
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;
@@ -11,14 +16,11 @@
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
@@ -36,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("内容违规");
@@ -54,26 +55,23 @@
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.getLoginUserInfoSureNoLogin();
Integer isMy = pageComOpsHouseDTO.getIsMy();
- if (null!=isMy&&isMy.equals(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")
@@ -83,7 +81,7 @@
@ApiOperation(value = "房屋租售-删除")
@GetMapping("delHouse")
- @ApiImplicitParam(name = "id",value = "房屋租售主键",required = true)
+ @ApiImplicitParam(name = "id", value = "房屋租售主键", required = true)
public R delHouse(@RequestParam("id") Long id) {
return communityService.deleteOpsHouse(id);
}
@@ -93,7 +91,5 @@
public R undercarriageHouse(@RequestBody @Validated(PutGroup.class) ComOpsHouseUndercarriageVO comOpsHouseVO) {
return communityService.undercarriageHouse(comOpsHouseVO);
}
-
-
}
--
Gitblit v1.7.1