From 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d Mon Sep 17 00:00:00 2001
From: hhhyyq <hhhyyq@163.com>
Date: 星期三, 17 三月 2021 00:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |   88 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index fb9f6b1..6033dad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -8,19 +8,24 @@
 import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
 import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
 import com.panzhihua.common.model.dtos.community.PageComActDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
 import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
+import com.panzhihua.common.validated.AddGroup;
 import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
 import com.panzhihua.service_community.model.dos.ComActDynDO;
 import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
 import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
 import com.panzhihua.service_community.service.*;
+
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -61,6 +66,8 @@
     private ComMngVolunteerMngService comMngVolunteerMngService;
     @Resource
     private ComMngStructAreaDistrictService comMngStructAreaDistrictService;
+    @Resource
+    private ComActMessageService comActMessageService;
 
     /**
      * 新增社区活动
@@ -1197,5 +1204,86 @@
     public R checkAreaHouse(@RequestParam("id")Long id){
         return comMngStructAreaService.checkAreaHouse(id);
     }
+    /**
+     * 新增留言
+     * @param comActMessageVO 新增留言信息
+     * @return 发布结果
+     */
+    @PostMapping("addmessage")
+    public R addMessage(@RequestBody ComActMessageVO comActMessageVO){
+        //        微信内容审核
+        return comActMessageService.addMessage(comActMessageVO);
+    }
+    /**
+     * 我发的留言
+     * @return 结果集合
+     */
+    @PostMapping("pagemymessage")
+    public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
+        return comActMessageService.pageMyMessageApplets(comActMessageVO);
+    }
+    /**
+     * 发给我的留言
+     * @return 结果集合
+     */
+    @PostMapping("pagesendtomemessage")
+    public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
+        return comActMessageService.pageSendToMessageApplets(comActMessageVO);
+    }
+    /**
+     * 根据id查询留言集合
+     * @return 结果集合
+     */
+    @PostMapping("pagemessagebyuser")
+    public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
+        return comActMessageService.pageMessageByUserApplets(comActMessageVO);
+    }
+    /**
+     * 社区留言
+     * @return 结果集合
+     */
+    @PostMapping("pagemycommunitymessage")
+    public R pageMyCommunityMessage (@RequestBody ComActMessageVO comActMessageVO){
+        return comActMessageService.pageMyCommunityMessageApplets(comActMessageVO);
+    }
+    /**
+     * 新增留言回复
+     * @param comActMessageVO 新增留言回复信息
+     * @return 发布结果
+     */
+    @PostMapping("addmessageback")
+    public R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO){
+        //        微信内容审核
+        return comActMessageService.addMessageBack(comActMessageBackVO);
+    }
+    @PostMapping("deletemessage")
+    public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
+        return comActMessageService.deleteMessage(comActMessageVO);
+    }
+    
+    @PostMapping("resetmessagepublic")
+    public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
+        return comActMessageService.resetMessagePublic(resetComActMessageVO);
+    }
+    
+    /**
+     * 留言详情
+     *
+     * @param id 主键
+     * @return 详情内容
+     */
+    @PostMapping("detailmessage")
+    public R detailMessage(@RequestParam("id") Long id) {
+        return comActMessageService.detailMessage(id);
+    }
 
+    /**
+     * 导出房屋信息
+     * @param areaId
+     * @return
+     */
+    @PostMapping("house/export")
+    public R houseExport(@RequestParam("areaId") Long areaId) {
+        return comMngStructHouseService.houseExport(areaId);
+    }
 }

--
Gitblit v1.7.1