From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
index 336557f..c7aaa93 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComPropertyApi.java
@@ -2,7 +2,10 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.user.SysUserFeedbackDTO;
+import com.panzhihua.common.service.user.UserService;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +33,8 @@
public class ComPropertyApi extends BaseController {
@Resource
private CommunityService communityService;
+ @Resource
+ private UserService userService;
/**
* 分页查询所有数据
@@ -50,4 +55,23 @@
public R detailProperty(@RequestParam("id") Long id) {
return this.communityService.detailProperty(id);
}
+
+ @ApiOperation("新增投诉建议或问题留言")
+ @PostMapping("addFeedBack")
+ public R addFeedBack(@RequestBody SysUserFeedbackDTO sysUserFeedbackDTO){
+ return userService.addFeedback(sysUserFeedbackDTO);
+ }
+
+ @ApiOperation("查看自己的投诉建议或问题留言记录")
+ @GetMapping("myFeedBack")
+ public R myFeedBack(@ApiParam("类型:1问题留言2投诉建议") @RequestParam(value = "type",required = false)Integer type){
+ return userService.myFeedBack(this.getLoginUserInfo().getUserId(),type);
+ }
+
+ @ApiOperation("通知公告列表")
+ @GetMapping("notice")
+ public R noticeList(@RequestParam("page")Integer page,@RequestParam("size")Integer size,@RequestParam("propertyId")Long propertyId){
+ return communityService.noticeList(page,size,propertyId);
+ }
+
}
--
Gitblit v1.7.1