From 575e94e9db7e507ecec2441d24a13e9415fd9f03 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 19:56:05 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 130 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 128 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index d907416..2d8ee55 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -16,23 +16,27 @@
import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
+import com.panzhihua.common.model.vos.IPageVO;
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.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.EditNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.shop.ShopOperLogVO;
import com.panzhihua.common.model.vos.shop.AddShopGoodsVO;
import com.panzhihua.common.model.vos.shop.ShopStoreVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -757,7 +761,7 @@
*
* @return
*/
- @PostMapping("timedtaskactmicrowishall")
+ @PostMapping("timedtaskactmicrowish")
R timedTaskActMicroWishAll();
/**
@@ -2385,7 +2389,7 @@
* 邻里圈评论回复_基本详情
* @param id 参数
*/
- @PostMapping("/neighbor/detailNeighborCommentReply")
+ @GetMapping("/neighbor/detailNeighborCommentReply")
R detailNeighborCommentReply(@RequestParam("id") Long id);
/**
@@ -2410,4 +2414,126 @@
@PostMapping("/neighbor/neighborAddBrowseByApp")
R neighborAddBrowseByApp(@RequestBody ComActNeighborAddBrowseAppDTO addBrowseAppDTO);
+
+ /**
+ * 邻里圈_添加
+ * @param addNeighborCircleAdminVO 参数
+ */
+ @PostMapping("/neighbor/addNeighborByAdmin")
+ R addNeighborByAdmin(@RequestBody AddNeighborCircleAdminVO addNeighborCircleAdminVO);
+
+ /**
+ * 分页查询评论下所有回复
+ * @param commentReplyAppDTO 请求参数
+ * @return 回复列表
+ */
+ @PostMapping("/neighbor/neighborCommentReplyByApp")
+ R neighborCommentReplyByApp(@RequestBody ComActNeighborCommentReplyAppDTO commentReplyAppDTO);
+
+ /**
+ * 实有房屋_编辑
+ * @param villageId 实有房屋id
+ * @param comMngVillageVO 请求参数
+ * @return
+ */
+ @PostMapping("/editvillage/{villageId}")
+ R editvillage(@PathVariable("villageId") Long villageId,@RequestBody ComMngVillageVO comMngVillageVO);
+
+ /**
+ * 商城系统配置
+ * @param comShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/edit")
+ R editShopSysConf(@RequestBody ComShopSysConfDTO comShopSysConfDTO);
+
+ /**
+ * 商城系统配置查询
+ * @param pageComShopSysConfDTO
+ * @return
+ */
+ @PostMapping("/shop/conf/get")
+ R pageShopSysConf(@RequestBody PageComShopSysConfDTO pageComShopSysConfDTO);
+
+ /**
+ * 编辑实有人口_电子档案
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit/electronicArchives")
+ R editUserElectronicFile(@RequestBody UserElectronicFileVO userElectronicFileVO);
+
+
+ /**
+ * 新增高龄认证
+ * @param eldersAuthAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/add")
+ R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO);
+
+ /**
+ * 修改高龄认证
+ * @param eldersAuthEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/edit")
+ R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO);
+
+ /**
+ * 分页查找高龄认证
+ * @param pageEldersAuthDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/page")
+ R query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 删除高龄认证
+ * @param eldersAuthDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eldersauth/delete")
+ R delete(@RequestBody EldersAuthDeleteDTO eldersAuthDeleteDTO);
+
+ /**
+ * 查询高龄认证详细信息
+ * @param id 高龄认证 id
+ * @return 查找结果
+ */
+ @PostMapping("/eldersauth/{id}")
+ R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id);
+
+ /**
+ * 获取用户家庭成员
+ * @param userId 用户ID
+ * @return
+ */
+ @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
+ R getMyfamilyElders(@PathVariable("userId") Long userId);
+
+ /**
+ * 查询导出高龄老人
+ * @param pageEldersAuthDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/eldersAuthQuery")
+ R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO);
+
+ /**
+ * 通过家庭成员ID添加
+ * @param eldersAuthAddByFamilyDTO 添加信息
+ * @return
+ */
+ @PostMapping("/eldersauth/addByFamilyUser")
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO);
+
+
+ /**
+ * 添加高龄认证反馈
+ * @param eldersAuthFeedbackAddDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/addFeedback")
+ R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);
}
--
Gitblit v1.7.1