From 47096da13e5ec6a32b77fe30bb47e9533007136a Mon Sep 17 00:00:00 2001
From: findyguo <12205921@qq.com>
Date: 星期四, 04 三月 2021 23:33:56 +0800
Subject: [PATCH] 留言做完

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java |   61 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index 10a2949..e71120a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -12,8 +12,10 @@
 import com.panzhihua.common.model.vos.advertisement.ComOpsAdvVO;
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoCommentVO;
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
+import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
 import com.panzhihua.common.model.vos.community.ComActMessageVO;
 import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
+import com.panzhihua.common.model.vos.community.PageComActMessageVO;
 import com.panzhihua.common.model.vos.user.NoticeUnReadVO;
 import com.panzhihua.common.model.vos.user.SysUserAgreementVO;
 import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
@@ -252,10 +254,36 @@
         return communityService.addMessage(comActMessageVO);
     }
     
+    @ApiOperation("发布留言回复")
+    @PostMapping("addmessageback")
+    public R addMessageBack(@RequestBody @Validated(AddGroup.class) ComActMessageBackVO comActMessageBackVO){
+        //        微信内容审核
+        String msg = comActMessageBackVO.getMsgContent();
+        if (!checkService.checkMessage(msg)) {
+            return R.fail("内容违规");
+        }
+        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+        Long communityId = loginUserInfo.getCommunityId();
+        if (null==communityId||0==communityId) {
+            return R.fail("用户未绑定社区");
+        }
+        Integer type = loginUserInfo.getType();
+        if(null==type||(type!=1&&type!=2)) {
+        	return R.fail("留言对象类型错误!");
+        }
+        Long userId = loginUserInfo.getUserId();
+        comActMessageBackVO.setCommunityId(communityId);
+        comActMessageBackVO.setUserId(userId);
+        comActMessageBackVO.setUserName(loginUserInfo.getName());
+        comActMessageBackVO.setUserAccount(loginUserInfo.getAccount());
+        comActMessageBackVO.setIspublic(1);
+        comActMessageBackVO.setStatus(1);
+        return communityService.addMessageBack(comActMessageBackVO);
+    }
+    
     @ApiOperation(value = "分页显示我的留言",response = ComActMessageVO.class)
-    @GetMapping("pagemymessage")
-    public R pageMyMessage (){
-    	ComActMessageVO comActMessageVO=new ComActMessageVO();
+    @PostMapping("pagemymessage")
+    public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         if (null==communityId||0==communityId) {
@@ -266,10 +294,9 @@
         return communityService.pageMyMessageApplets(comActMessageVO);
     }
     
-    @ApiOperation(value = "分页显示给我的留言",response = ComActMessageVO.class)
-    @GetMapping("pagesendtomemessage")
-    public R pageSendToMessage (){
-    	ComActMessageVO comActMessageVO=new ComActMessageVO();
+    @ApiOperation(value = "分页显示居民给我的留言",response = ComActMessageVO.class)
+    @PostMapping("pagesendtomemessage")
+    public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         if (null==communityId||0==communityId) {
@@ -277,22 +304,12 @@
         }
         comActMessageVO.setCommunityId(communityId);
         comActMessageVO.setUserId(loginUserInfo.getUserId());
+        comActMessageVO.setPhone(loginUserInfo.getPhone());
         return communityService.pageSendToMessageApplets(comActMessageVO);
     }
-    
-    @ApiOperation(value = "分页显示社区的留言",response = ComActMessageVO.class)
-    @GetMapping("pagemycommunitymessage")
-    public R pageMyCommunityMessage (){
-    	ComActMessageVO comActMessageVO=new ComActMessageVO();
-        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
-        Long communityId = loginUserInfo.getCommunityId();
-        if (null==communityId||0==communityId) {
-            return R.fail("用户未绑定社区");
-        }
-        comActMessageVO.setCommunityId(communityId);
-        comActMessageVO.setUserId(loginUserInfo.getUserId());
-        return communityService.pageMyCommunityMessageApplets(comActMessageVO);
+    @ApiOperation(value = "分页显示指定用户的留言",response =ComActMessageVO.class )
+    @PostMapping("pagemessagebyuser")
+    public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
+        return communityService.pageMessageByUser(comActMessageVO);
     }
-
-
 }

--
Gitblit v1.7.1