From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 1563 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 1,536 insertions(+), 27 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 9f63334..ed5a867 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
@@ -1,16 +1,57 @@
package com.panzhihua.common.service.community;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
+import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
+import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
+import com.panzhihua.common.model.dtos.neighbor.AddComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
+import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.*;
+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.dtos.vaccines.*;
+import com.panzhihua.common.model.vos.*;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
+import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
+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;
/**
@@ -131,6 +172,15 @@
R pageDynamic(@RequestBody ComActDynVO comActDynVO);
/**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
+
+ /**
* 社区动态详情
*
* @param id 动态id
@@ -157,6 +207,16 @@
*/
@PostMapping("detaileasyphoto")
R detailEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
+
+ /**
+ * 随手拍删除
+ *
+ * @param id 随手拍主键
+ * @param userId 登录用户id
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
/**
* 分页查询微心愿
@@ -341,6 +401,16 @@
R listSubordinatebuilding(@RequestParam("houseCode") String houseCode);
/**
+ * 实有单位归属地
+ *
+ * @param comMngRealCompanyBelongsDTO
+ * @return
+ */
+ @PostMapping("/common/data/company/belongs")
+ R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO);
+
+
+ /**
* 添加同级地址
*
* @param comMngStructHouseVO 同级参数
@@ -392,6 +462,15 @@
*/
@PostMapping("pageotherbuild")
R pageOtherBuild(@RequestBody ComMngStructOtherBuildVO comMngStructOtherBuildVO);
+
+ /**
+ * 获取志愿者详情
+ *
+ * @param id 志愿者信息
+ * @return 增加结果
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id);
/**
* 增加志愿者
@@ -700,6 +779,15 @@
*/
@PostMapping("timedtaskactactivityall")
R timedTaskActActivityAll();
+
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll();
/**
* 其他建筑详情
@@ -1115,7 +1203,7 @@
R deleteOpsHouse(@RequestParam("id") Long id);
/**
- * 一起议-分页查询
+ * 房屋租售-分页查询
*
* @param pageComOpsHouseDTO 查询参数
* @return ComOpsHouseVO
@@ -1285,7 +1373,7 @@
* @param list 便民服务集合
*/
@PostMapping("/convenient/serve/import")
- R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam("communityId") Long communityId);
+ R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, @RequestParam(value = "communityId",required = false) Long communityId);
/**
* 导出房屋信息
@@ -1336,7 +1424,6 @@
*/
@PostMapping("/common/data/car/import")
R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId);
-
/**
* 社区后台实有单位管理列表
@@ -1473,8 +1560,8 @@
/**
* 查询省下所有区域 tree结构
*
- * @param provinceAdcode
- * @return
+ * @param provinceAdcode 省份code
+ * @return 查询结果
*/
@GetMapping("/common/data/area/all")
R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode);
@@ -1482,8 +1569,8 @@
/**
* 分页查询街道
*
- * @param pageComStreetDTO
- * @return
+ * @param pageComStreetDTO 查询条件
+ * @return 查询结果
*/
@PostMapping("/pagestreet")
R pageStreet(@RequestBody PageComStreetDTO pageComStreetDTO);
@@ -1491,17 +1578,17 @@
/**
* 新增街道
*
- * @param comStreetVOO
- * @return
+ * @param comStreetVOO 需要新增的街道数据
+ * @return 新增结果
*/
@PostMapping("/addstreet")
- R pageStreet(@RequestBody ComStreetVO comStreetVOO);
+ R addStreet(@RequestBody ComStreetVO comStreetVOO);
/**
* 删除街道
*
- * @param Ids
- * @return
+ * @param Ids 需要删除街道id集合
+ * @return 删除结果
*/
@PostMapping("/deletestreet")
R delectStreat(@RequestBody List<Long> Ids);
@@ -1509,8 +1596,8 @@
/**
* 查询街道
*
- * @param comStreetVO
- * @return
+ * @param comStreetVO 查询条件
+ * @return 返回结果
*/
@PostMapping("/liststreet")
R listStreet(ComStreetVO comStreetVO);
@@ -1518,8 +1605,8 @@
/**
* 分页查询实有房屋
*
- * @param pageComMngVillageDTO
- * @return
+ * @param pageComMngVillageDTO 查询条件
+ * @return 返回结果
*/
@PostMapping("/pagevillage")
R pageVillage(@RequestBody PageComMngVillageDTO pageComMngVillageDTO);
@@ -1527,8 +1614,8 @@
/**
* 新增实有房屋
*
- * @param comMngVillageVO
- * @return
+ * @param comMngVillageVO 新增的实有房屋数据
+ * @return 新增结果
*/
@PostMapping("/addvillage")
R addVillage(@RequestBody ComMngVillageVO comMngVillageVO);
@@ -1536,8 +1623,8 @@
/**
* 删除实有房屋
*
- * @param Ids
- * @return
+ * @param Ids 需要删除的id集合
+ * @return 删除结果
*/
@PostMapping("/deletevillage")
R delectVillage(@RequestBody List<Long> Ids);
@@ -1545,8 +1632,8 @@
/**
* 查询实有房屋
*
- * @param comMngVillageVO
- * @return
+ * @param comMngVillageVO 查询条件
+ * @return 查询结果
*/
@PostMapping("/listvillage")
R listVillage(ComMngVillageVO comMngVillageVO);
@@ -1554,10 +1641,1432 @@
/**
* 批量导入实有房屋
*
- * @param list
- * @param communityId
- * @return
+ * @param list 实有房屋数据
+ * @param communityId 社区id
+ * @return 导入结果
*/
@PostMapping("/village/import")
R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+
+ /**
+ * 批量导入实有人口
+ *
+ * @param list 实有人口数据
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import")
+ R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ @PostMapping("/common/data/population/import/confirm")
+ R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 分页查询实有人口
+ *
+ * @param comMngPopulationVO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/common/data/population/page")
+ R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
+ * 根据id实有人口详细信息
+ *
+ * @param populationId 实有人口id
+ * @return 实有人口详细信息
+ */
+ @PostMapping("/common/data/population/detail")
+ R detailPopulation(@RequestParam(value = "populationId") Long populationId);
+
+ /**
+ * 根据id查询实有人口电子档案信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/common/data/population/electronicArchives")
+ R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId);
+
+
+ /**
+ * 根据id修改实有人口标签列表
+ *
+ * @param populationTagDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/common/data/population/editTag")
+ R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
+ /**
+ * 批量删除实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/delete")
+ R deletePopulations(@RequestBody List<Long> Ids);
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getAll")
+ R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId);
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ @PostMapping("/common/data/population/getList")
+ R getPopulationLists(@RequestBody List<Long> Ids);
+
+ /**
+ * 创建调查问卷
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/addquestnaire")
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+ /**
+ * 社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * @return
+ */
+ @PostMapping("/questnaire/pagequestnaire")
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
+
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ *
+ * @param questnaireVO
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnaire")
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ;
+
+
+ /**
+ * 修改问卷状态
+ *
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("/questnaire/editquestnairedo")
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId);
+
+ /**
+ * 删除问卷 ——隐藏
+ *
+ * @param questId 调查问卷Id
+ * @return
+ */
+ @PostMapping("/questnaire/deletequestnaire")
+ R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
+
+ /**
+ * 问卷答题结果
+ *
+ * @param questId 问卷ID
+ */
+ @PostMapping("/questnaire/answerslist")
+ R answerResultList(@RequestParam("questId") Long questId);
+
+
+ /**
+ * 问卷调查详细
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/view")
+ R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 用户问卷调查详细
+ * @param userId 用户ID
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/usersanswer")
+ R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 查看用户问卷调查统计信息
+ * @param questId 问卷ID
+ * @return 用户问卷调查统计信息
+ */
+ @GetMapping("/questnaire/stat")
+ R statistics(@RequestParam("questId") Long questId);
+
+
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO 问卷ID
+ */
+ @PostMapping("/questnaire/qaqeustanswerdetails")
+ R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+
+ /**
+ * 社区问卷分页
+ * @param pageQuestnaireAnswerDTO 社区问卷分页参数
+ * @return 分页数据
+ */
+ @PostMapping("/questnaire/pagequestnaireanswer")
+ R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO 填写情况
+ */
+ @PostMapping("/questnaire/usersanswequestnaire")
+ R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 店铺列表-分页查询
+ * @param pageComShopStoreDTO 分页条件
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);
+
+ /**
+ * 保存店铺
+ * @param storeVO 数据
+ */
+ @PostMapping("/shop/saveStore")
+ R saveStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
+
+ /**
+ * 编辑店铺、启用、禁用
+ * @param storeVO 数据
+ * @param id 商铺id
+ */
+ @PostMapping("/shop/editStore/{id}")
+ R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);
+
+ /**
+ * 删除店铺
+ * @param id 商铺id
+ */
+ @PostMapping("/shop/deleteStore")
+ R deleteStore(@RequestBody Long[] id);
+
+ /**
+ * 获取详情
+ * @param id 商铺id
+ */
+ @GetMapping("/shop/getStoreInfo")
+ R getStoreInfo(@RequestParam("id")Long id);
+
+
+ /**
+ * 商品列表-分页查询
+ * @param pageComShopGoodsDTO 添加数据
+ */
+ @PostMapping("/shop/pageGoods")
+ R pageGoodsList(@RequestBody PageComShopGoodsDTO pageComShopGoodsDTO);
+
+ /**
+ * 新增商品
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/saveShopGoods")
+ R saveShopGoods(@RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 编辑商品
+ * @param id
+ * @param addShopGoodsVO
+ * @return
+ */
+ @PostMapping("/shop/editShopGoods/{id}")
+ R editShopGoods(@PathVariable("id") Long id,@RequestBody AddShopGoodsVO addShopGoodsVO);
+
+ /**
+ * 删除商品
+ * @param id
+ * @return
+ */
+ @PostMapping("/shop/deleteShopGoods")
+ R deleteShopGoods(@RequestBody Long[] id);
+ /**
+ * 修改商品状态
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/changeShopGoodsStatus")
+ R changeStatus(@RequestParam("id") Long id,@RequestParam("status")Integer status);
+ /**
+ * 结果
+ * @param shopOperlog 商城后台操作日志
+ */
+ @PostMapping("/shop/addShopOperLog")
+ R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog);
+
+ /**
+ * 分页查询 商家后台操作日志
+ * @param pageDTO 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/shop/pageShopOperLog")
+ R pageShopOperLog(@RequestBody PageDTO pageDTO);
+
+ /**
+ * 订单分页查询
+ * @param pageComShopOrderSearchDTO 分页数据
+ * @return 订单分页查询
+ */
+ @PostMapping("/shop/order/page")
+ R pageShopOrder(@RequestBody PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+ /**
+ * 分页查询店铺列表
+ * @param comShopStoreDTO 请求参数
+ * @return 店铺列表
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageShopStore(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 根据id查询店铺详情
+ * @param comShopStoreDTO 请求参数
+ * @return 店铺详情
+ */
+ @PostMapping("/shop/shopStoreDetail")
+ R shopStoreDetail(@RequestBody PageComShopStoreDTO comShopStoreDTO);
+
+ /**
+ * 分页查询商品列表
+ * @param comShopGoodsDTO 请求参数
+ * @return 商品列表
+ */
+ @PostMapping("/shop/pageShopGoods")
+ R pageShopGoods(@RequestBody ComShopGoodsDTO comShopGoodsDTO);
+
+ /**
+ * 根据商品id查询商品信息
+ * @param goodsId 商品id
+ * @return 商品信息
+ */
+ @PostMapping("/shop/shopGoodsDetail")
+ R shopGoodsDetail(@RequestParam("goodsId") Long goodsId);
+
+ /**
+ * 查询用户购物车列表
+ * @param userId 用户id
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopCartList")
+ R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
+
+ /**
+ * 购物车添加
+ * @param comShopCartDTO 请求参数
+ * @return 购物车列表
+ */
+ @PostMapping("/shop/shopAddCart")
+ R shopAddCart(@RequestBody ComShopCartDTO comShopCartDTO);
+
+ /**
+ * 购物车内商品数量修改
+ * @param shopEditNubCartDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditNubCart")
+ R shopEditNubCart(@RequestBody ComShopEditNubCartDTO shopEditNubCartDTO);
+
+ /**
+ * 删除购物车记录
+ * @param Ids 购物车id集合
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelCart")
+ R shopDelCart(@RequestBody List<Long> Ids);
+
+ /**
+ * 分页查询用户收货地址列表
+ * @param comShopAddressDTO 请求参数
+ * @return 用户收货地址列表
+ */
+ @PostMapping("/shop/shopUserAddressList")
+ R shopUserAddressList(@RequestBody PageComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户添加收货地址
+ * @param comShopAddressDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/shop/shopAddUserAddress")
+ R shopAddUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户修改收货地址
+ * @param comShopAddressDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/shop/shopEditUserAddress")
+ R shopEditUserAddress(@RequestBody ComShopAddressDTO comShopAddressDTO);
+
+ /**
+ * 用户删除收货地址
+ * @param addressId 收货地址id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/shopDelUserAddress")
+ R shopDelUserAddress(@RequestParam("addressId") Long addressId);
+
+ /**
+ * 订单预览
+ * @param orderPreviewDTO 请求参数
+ * @return 订单预览数据
+ */
+ @PostMapping("/shop/orderPreview")
+ R orderPreview(@RequestBody ComShopOrderPreviewDTO orderPreviewDTO);
+
+ /**
+ * 创建订单
+ * @param orderCreateDTO 创建订单请求参数
+ * @return 创建结果
+ */
+ @PostMapping("/shop/orderCreate")
+ R orderCreate(@RequestBody ComShopOrderCreateDTO orderCreateDTO);
+
+ /**
+ * 分页查询用户订单列表
+ * @param comOrderListDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/shop/pageOrderList")
+ R pageOrderList(@RequestBody PageComOrderListDTO comOrderListDTO);
+
+ /**
+ * 根据订单id查询订单详情
+ * @param orderId 订单id
+ * @return 订单详情
+ */
+ @PostMapping("/shop/orderDetail")
+ R orderDetail(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id取消订单
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 取消结果
+ */
+ @PostMapping("/shop/orderCancel")
+ R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 根据订单id删除订单
+ * @param orderId 订单id
+ * @return 删除结果
+ */
+ @PostMapping("/shop/orderDelete")
+ R orderDelete(@RequestParam("orderId") Long orderId);
+
+ /**
+ * 根据订单id确认收货
+ * @param comShopOrderQueryDTO 请求参数
+ * @return 确认结果
+ */
+ @PostMapping("/shop/orderConfirm")
+ R orderConfirm(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO);
+
+ /**
+ * 统计用户订单数量
+ * @param userId 用户id
+ * @return 统计结果
+ */
+ @PostMapping("/shop/orderStatistics")
+ R orderStatistics(@RequestParam("userId") Long userId);
+
+ /**
+ * 商家资金的订单详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/shop/capitalDetailByStore")
+ R capitalDetailByStore(@RequestParam("id") Long id);
+
+
+ /**
+ * 订单发货
+ * @param orderShipDTO 商城订单发货信息
+ * @return 发货结果
+ */
+ @PostMapping("/shop/shipOrder")
+ R shipOrder(@RequestBody ComShopOrderShipDTO orderShipDTO);
+
+ /**
+ * 订单配送
+ * @param deliverDTO 订单信息
+ * @return 配送结果
+ */
+ @PostMapping("/shop/deliverOrder")
+ R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 订单完成配送
+ * @param deliverDTO 订单信息
+ * @return 配送完成结果
+ */
+ @PostMapping("/shop/finishDeliverOrder")
+ R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO);
+
+ /**
+ * 获取用户商户详情
+ * @param userId 用户ID
+ */
+ @GetMapping("/shop/getUserStoreInfo")
+ R getUserStoreInfo(@RequestParam("userId") Long userId);
+
+ /**
+ * 获取用户商户详情
+ * @param account 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
+ * 订单导出信息
+ * @param comShopOrderExportDTO 订单导出信息
+ * @return 订单导出信息
+ */
+ @PostMapping("/shop/shopOrderExportData")
+ R shopOrderExportData(@RequestBody ComShopOrderExportDTO comShopOrderExportDTO);
+
+ /**
+ * 资金管理导出信息
+ * @param comShopFundsExportDTO 资金管理导出信息
+ * @return 资金管理导出信息
+ */
+ @PostMapping("/shop/shopOrderFundsExportData")
+ R shopOrderFundsExportData(@RequestBody ComShopFundsExportDTO comShopFundsExportDTO );
+
+ /**
+ * 店铺资金统计信息
+ * @param userId 用户ID
+ * @return 店铺资金统计信息
+ */
+ @GetMapping("/shop/getFundsStat")
+ R getFundsStat(@RequestParam("userId") Long userId);
+
+ /**
+ * 店铺资金统计信息
+ * @param pageComShopFundsSearchDTO 店铺资金
+ * @return 店铺资金统计信息
+ */
+ @PostMapping("/shop/pageShopFunds")
+ R pageShopFunds(@RequestBody PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ /**
+ * 微信支付订单回调
+ * @param wxPayNotifyOrderDTO 订单支付回调参数
+ */
+ @PostMapping("/shop/wxOrderPayNotify")
+ void wxOrderPayNotify(@RequestBody WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
+
+ /**
+ * 点击去支付订单
+ * @param orderPayDTO 请求参数
+ * @return 支付对象
+ */
+ @PostMapping("/shop/wxPay")
+ R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 编辑实有人口
+ * @param populationEditDTO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit")
+ R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, @RequestParam("communityId") Long communityId);
+
+ /**
+ * 微心愿删除
+ * @param id 微心愿id
+ */
+ @PostMapping("deletemicrowish")
+ R deletemicrowish(@RequestParam("id")Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询
+ * @param pageInputUserDTO
+ * @return
+ */
+ @PostMapping("common/data/special/page")
+ R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体人员
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("common/data/special/delete")
+ R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
+
+
+ /**
+ * 办事指南_新增
+ * @param workGuideVO 新增信息
+ * @return 新增结果
+ */
+ @PostMapping("/addworkguide")
+ R addWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
+
+ /**
+ * 办事指南_编辑
+ * @param workGuideVO
+ * @return 编辑结果
+ */
+ @PostMapping("/editworkguide")
+ R editWorkGuide(@RequestBody ComActWorkGuideVO workGuideVO, @RequestParam("userId")Long userId);
+
+ /**
+ * 办事指南_详情
+ * @param workGuideId
+ * @return 详情
+ */
+ @GetMapping("/detailworkguide")
+ R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId);
+ /**
+ * 办事指南_分页
+ * @param pageActWorkGuideDTO 查询参数
+ * @return 分页集合
+ */
+ @PostMapping("/pageworkguide")
+ R pageWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);
+
+ /**
+ * 办事指南_删除
+ * @param workGuideId 办事指南id
+ * @return 删除结果
+ */
+ @PostMapping("/delectworkguide")
+ R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+
+ /**
+ * 分页查询邻里圈
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByApp")
+ R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 用户发布邻里圈审核
+ * @param addNeighborCircleAppDTO 邻里圈请求参数
+ * @return 发布结果
+ */
+ @PostMapping("/neighbor/addNeighborByApp")
+ R addNeighborByApp(@RequestBody AddComActNeighborCircleAppDTO addNeighborCircleAppDTO);
+
+ /**
+ * 用户查看邻里圈详情
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈详情
+ */
+ @PostMapping("/neighbor/neighborDetailByApp")
+ R neighborDetailByApp(@RequestBody ComActNeighborCircleDetailAppDTO neighborCircleAppDTO);
+
+ /**
+ * 管理后台查询邻里圈列表
+ * @param comActNeighborCircleAdminDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/pageNeighborByAdmin")
+ R pageNeighborByAdmin(@RequestBody ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);
+
+
+ /**
+ * 后台修改邻里圈
+ * @param editNeighborCircleAdminVO 请求参数
+ */
+ @PostMapping("/neighbor/changeStatusByAdmin")
+ R changeStatusByAdmin(@RequestBody EditNeighborCircleAdminVO editNeighborCircleAdminVO);
+
+
+ /**
+ * 邻里圈_后台删除
+ * @param id 邻里圈id
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/deleteByAdmin")
+ R deleteByAdmin(@RequestParam("id")Long id);
+
+ /**
+ * 查看邻里圈基础_详情
+ * @param id 邻里圈id
+ * @return 邻里圈列表
+ */
+ @GetMapping("/neighbor/detailNeighborByAdmin")
+ R detailNeighborByAdmin(@RequestParam("id")Long id);
+
+ /**
+ * 邻里圈的所有评论_分页
+ * @param dto 请求参数
+ * @return 评论列表
+ */
+ @PostMapping("/neighbor/detailNeighborAllCommentByAdmin")
+ R detailNeighborAllCommentByAdmin(@RequestBody DetailNeighborAllCommentByAdminDTO dto);
+
+ /**
+ * 评论的状态_修改
+ * @param vo 请求参数
+ */
+ @PostMapping("/neighbor/changeCommentStatusByAdmin")
+ R changeCommentStatusByAdmin(@RequestBody ChangeCommentStatusByAdminVO vo);
+
+ /**
+ * 邻里圈评论_详情
+ * @param id 评论id
+ */
+ @GetMapping("/neighbor/detailNeighborCommentByAdmin")
+ R detailNeighborCommentByAdmin(@RequestParam("id") Long id);
+
+
+ /**
+ * 用户查询邻里圈列表
+ * @param neighborCircleAppDTO 请求参数
+ * @return 邻里圈列表
+ */
+ @PostMapping("/neighbor/neighborExamineByApp")
+ R neighborExamineByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+ /**
+ * 邻里圈点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousByApp")
+ R neighborFabulousByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 邻里圈转发
+ * @param forwardAppDTO 请求参数
+ * @return 转发结果
+ */
+ @PostMapping("/neighbor/neighborForwardByApp")
+ R neighborForwardByApp(@RequestBody ComActNeighborForwardAppDTO forwardAppDTO);
+
+ /**
+ * 邻里圈评论
+ * @param commentAppDTO 请求参数
+ * @return 评论结果
+ */
+ @PostMapping("/neighbor/neighborCommentByApp")
+ R neighborCommentByApp(@RequestBody ComActNeighborCommentAppDTO commentAppDTO);
+
+ /**
+ * 邻里圈回复
+ * @param replyAppDTO 请求参数
+ * @return 回复结果
+ */
+ @PostMapping("/neighbor/neighborReplyByApp")
+ R neighborReplyByApp(@RequestBody ComActNeighborReplyAppDTO replyAppDTO);
+
+ /**
+ * 定时任务更新邻里圈近3天评论数/点赞数/浏览量
+ * @return 执行结果
+ */
+ @PostMapping("/neighbor/timeTaskCircleFlow")
+ R timedTaskNeighborCircleRecord();
+
+ /**
+ * 邻里圈评论回复_分页
+ * @param dto 参数
+ */
+ @PostMapping("/neighbor/detailNeighborCommentAllReply")
+ R detailNeighborCommentAllReply(@RequestBody DetailNeighborCommentReplyByAdminDTO dto);
+
+ /**
+ * 邻里圈评论回复_基本详情
+ * @param id 参数
+ */
+ @GetMapping("/neighbor/detailNeighborCommentReply")
+ R detailNeighborCommentReply(@RequestParam("id") Long id);
+
+ /**
+ * 评论回复状态_修改
+ * @param changeStatusReplyVO 参数
+ */
+ @PostMapping("/neighbor/changeCommentReplyStatusByAdmin")
+ R changeCommentReplyStatusByAdmin(@RequestBody ChangeCommentReplyStatusByAdminVO changeStatusReplyVO);
+ /**
+ * 邻里圈取消点赞
+ * @param fabulousAppDTO 请求参数
+ * @return 取消点赞结果
+ */
+ @PostMapping("/neighbor/neighborFabulousCancelByApp")
+ R neighborFabulousCancelByApp(@RequestBody ComActNeighborFabulousAppDTO fabulousAppDTO);
+
+ /**
+ * 添加邻里圈浏览记录
+ * @param addBrowseAppDTO 请求参数
+ * @return 返回参数
+ */
+ @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 communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/statistics")
+ R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 查询房屋级联菜单
+ * @param cascadeHouseDTO 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/common/data/population/cascade/list")
+ R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+
+ /**
+ * 分页查询房屋列表
+ * @param populationHouseAdminDTO 请求参数
+ * @return 房屋列表
+ */
+ @PostMapping("/common/data/population/page/house")
+ R pageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO);
+
+ /**
+ * 根据id查询实有房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @PostMapping("/common/data/population/house/detail")
+ R getHouseDetail(@RequestParam(value = "houseId") Long houseId);
+
+ /**
+ * 编辑实有房屋信息
+ * @param houseEditAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @PostMapping("/common/data/population/house/edit")
+ R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO);
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ * @param Ids 请求参数
+ * @return 删除结果
+ */
+ @PostMapping("/common/data/population/house/delete")
+ R deleteHouses(@RequestBody List<Long> Ids);
+
+ /**
+ * 实有房屋统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @PostMapping("/common/data/population/house/statistics")
+ R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据社区id查询社区所有省市区
+ * @param communityId 社区id
+ * @return 社区所在省市区
+ */
+ @PostMapping("/common/data/village/getRegion")
+ R getRegion(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 统计社区内小区数量
+ * @param communityId 社区id
+ * @return 统计小区数量
+ */
+ @PostMapping("/common/data/village/statistics")
+ R villageStatistics(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 小区详情
+ * @param villageId 小区id
+ * @return 小区详情
+ */
+ @PostMapping("/village/getVillage")
+ R getVillage(@RequestParam("villageId") Long villageId);
+
+ /**
+ * 新增高龄认证
+ * @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);
+
+ /**
+ * 小程序-查询疫苗分类列表
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/app/list")
+ R getVaccinesListByApp();
+
+ /**
+ * 小程序-疫苗类型对应家庭成员接种列表
+ * @return 疫苗类型对应家庭成员接种列表
+ */
+ @PostMapping("/vaccines/app/user/list")
+ R getVaccinesUserListByApp(@RequestBody VaccinesEnrollUserByAppDTO enrollUserByAppDTO);
+
+ /**
+ * 小程序-报名疫苗
+ * @param enrollByAppDTO 请求参数
+ * @return 报名结果
+ */
+ @PostMapping("/vaccines/app/enroll")
+ R VaccinesEnrollByApp(@RequestBody VaccinesEnrollByAppDTO enrollByAppDTO);
+
+ /**
+ * 小程序-查询用户家庭成员接种记录
+ * @param userId 用户id
+ * @return 用户家庭成员接种记录
+ */
+ @PostMapping("/vaccines/app/user/inoculation/list")
+ R getVaccinesUserInoculationListByApp(@RequestParam("userId") Long userId);
+
+ /**
+ * 后台管理-查询疫苗分类列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/list")
+ R getVaccinesListByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 修改疫苗分类信息
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/vaccines/admin/edit")
+ R editVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 新增疫苗分类信息
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/vaccines/admin/add")
+ R addVaccinesByAdmin(@RequestBody VaccinesByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询疫苗登记列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/list")
+ R getVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 删除疫苗分类信息
+ * @param id 疫苗分类id
+ * @return 删除结果
+ */
+ @PostMapping("/vaccines/admin/enroll/delete")
+ R deleteVaccinesByAdmin(@RequestParam("id") Long id);
+
+ /**
+ * 根据条件导出登记列表
+ * @param vaccinesByAdminDTO 请求参数
+ * @return 登记列表
+ */
+ @PostMapping("/vaccines/admin/enroll/export")
+ R exportVaccinesEnrollListByAdmin(@RequestBody VaccinesEnrollByAdminDTO vaccinesByAdminDTO);
+
+ /**
+ * 查询接种记录列表
+ * @param inoculationByAdminDTO 请求参数
+ * @return 接种记录列表
+ */
+ @PostMapping("/vaccines/admin/inoculation/list")
+ R getVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 接种记录信息导出
+ * @param inoculationByAdminDTO 请求参数
+ * @return 导出结果
+ */
+ @PostMapping("/vaccines/admin/inoculation/export")
+ R exportVaccinesInoculationListByAdmin(@RequestBody VaccinesInoculationByAdminDTO inoculationByAdminDTO);
+
+ /**
+ * 查询疫苗分类列表
+ * @return 疫苗分类列表
+ */
+ @PostMapping("/vaccines/admin/enroll/type/list")
+ R getEnrollTypeListByAdmin();
+
+ /**
+ * 查询老龄认证记录
+ * @param pageComEldersRecordsDTO
+ * @return
+ */
+ @PostMapping("/elders/records")
+ R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO);
+
+ /**
+ * 查询老龄认证记录详细
+ * @param id
+ * @return
+ */
+ @PostMapping("/elders/records/deatils")
+ R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id);
+
+ /**
+ * 查询老龄认证社区认证方式
+ * @param eldersAuthTypeQueryDTO
+ * @return
+ */
+ @PostMapping("/elders/authtype")
+ R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);
+
+ /**
+ * 分页查询高领老人列表
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/page")
+ R pageQueryEldersAuthElderly(@RequestBody PageEldersAuthElderlyDTO pageEldersAuthElderlyDTO);
+
+ /**
+ * 批量保存高龄老人
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/batchSave")
+ R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy);
+
+ /**
+ * 批量保存楼栋
+ * @param newVoList
+ * @param communityId
+ * @return
+ */
+ @PostMapping("/building/batchSave")
+ R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,@RequestParam("communityId") Long communityId);
+
+ /**
+ * 根据字典key查询字典项
+ * @param key
+ * @return
+ */
+ @GetMapping("/dictionary/listDictionaryByKey")
+ R<List<BcDictionaryVO>> listDictionaryByKey(@RequestParam("key") String key);
+ /**
+ * 查看高龄老人详情
+ * @param id
+ * @return
+ */
+ @GetMapping("/eldersauthelderly/{id}")
+ R getEldersAuthElderlyById(@PathVariable("id") Long id);
+
+ /**
+ * 修改高龄老人信息
+ * @param eldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/update")
+ R updateEldersAuthElderly(@RequestBody EldersAuthElderlyDTO eldersAuthElderlyDTO);
+
+ /**
+ * 删除高领老人
+ * @param id
+ * @return
+ */
+ @PostMapping("/eldersauthelderly/delete")
+ R deleteEldersAuthElderly(@RequestParam("id") Long id);
+
+ /**
+ * 通过老人用户id获取老人信息
+ * @param authUserId 老人用户id
+ * @return 老人信息
+ */
+ @PostMapping("/elders/getAuth")
+ R getEldersAuthUserByApp(@RequestParam("authUserId") Long authUserId);
+
+ /**
+ * 人脸核验新增高龄认证记录
+ * @param authGetResultDTO 请求参数
+ * @return 新增结果
+ */
+ @PostMapping("/elders/add/auth")
+ R addEldersAuthByApp(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO);
+
+ /**
+ * 高龄认证分页接口
+ * @param authPageDTO 请求参数
+ * @return 查询结果
+ */
+ @PostMapping("/elders/page/auth")
+ R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO);
+
+ /**
+ * 添加高龄老人接口
+ * @param authUserAddAppDTO 请求参数
+ * @return 添加结果
+ */
+ @PostMapping("/elders/add")
+ R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+ /**
+ * 修改高龄老人接口
+ * @param authUserAddAppDTO 请求参数
+ * @return 修改结果
+ */
+ @PostMapping("/elders/edit")
+ R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO);
+
+
+ /**
+ * 分页查询生存认证记录
+ * @param pageEldersAuthElderlyDTO
+ * @return
+ */
+ @PostMapping("/elders/records/page")
+ R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO);
+ /**
+ * description 批量保存重点人群人员信息
+ *
+ * @param list 重点人群信息
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/key_person/batch/save")
+ R saveBatchKeyPerson(@RequestBody List<KeyPersonInfoDTO> list);
+
+ @GetMapping("/screen/population/statistic")
+ R statistic(@RequestParam("communityId")Long communityId);
+
+ /**
+ *
+ * @param communityId
+ * @param type
+ * @return
+ */
+ @PostMapping("/elders/setCommunityAuthType")
+ R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type);
+
+ @PostMapping("/elders/getAuthHistoryList")
+ R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @PostMapping("/elders/getAuthHistoryExport")
+ R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO);
+
+ @GetMapping("/screen/work/neighborCircle")
+ R statisticNeighborCircle(@RequestParam("communityId") Long communityId);
+
+
+ /**
+ * 党员党支部统计信息
+ * @return
+ */
+ @PostMapping("/bigscreen/party/orgmembers")
+ R bigscreenPartyOrgmembers(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg);
+
+ /**
+ * 党员年龄占比、男女占比
+ * @return
+ */
+ @PostMapping("/bigscreen/party/ageGender")
+ R<BigScreenStatisticAgeGender> ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+
+ /**
+ * 党建数据概览
+ * @return
+ */
+ @PostMapping("/bigscreen/party/partybuild/{communityId}")
+ R<BigScreenStatisticPartyBuild> bigscreenPartybuild(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动参加用户排行榜-TOP3
+ * @return
+ */
+ @PostMapping("/bigscreen/party/activitytopuser/{communityId}")
+ R<List<PartyBuildingMemberVO>> bigscreenPartyactivitytopuser(@PathVariable("communityId") Long communityId);
+
+ /**
+ * 党员活动
+ * @return
+ */
+ @PostMapping("/bigscreen/party/bigscreenPartyactivity")
+ R<List<BigScreenStatisticPartyActivity>> bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+
+ /**
+ * 首页大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenIndex")
+ R getScreenIndex(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 事件大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenEvent")
+ R getScreenEvent(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 民生大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @GetMapping("/screen/getScreenCivil")
+ R getScreenCivil(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 大屏统计邻里圈
+ */
+ @GetMapping("/screen/work/wish")
+ R wish(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计社区-活动
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/activity")
+ R activity(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计一起议
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/discuss")
+ R discuss(@RequestParam("communityId") Long communityId);
+
+ /**
+ * 大屏统计党建工作
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/pbWork")
+ R pbWork(@RequestParam("communityId")Long communityId);
+
+
+ /**
+ * 大屏统计随手拍
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/easyPhoto")
+ R easyPhoto(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 大屏统计工作情况
+ * @param communityId
+ * @return
+ */
+ @GetMapping("/screen/work/workCount")
+ R workCount(@RequestParam("communityId")Long communityId);
+
+ /**
+ * description 批量保存残疾人人员信息
+ *
+ * @param list 疾人信息列表
+ * @return R 保存结果
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ @PostMapping("/disable_person/batch/save")
+ R saveBatchDisabledPersons(@RequestBody List<DisabledPersonsDTO> list);
+
+ /**
+ * 获取社区网格
+ * @param communityId 社区id
+ * @return 网格数据
+ */
+ @GetMapping("/screen/getScreenGirds")
+ R getScreenGirds(@RequestParam("communityId")Long communityId);
+
+ /**
+ * 事件大屏查询事件详情
+ * @param eventDetailDTO 请求参数
+ * @return 事件详情
+ */
+ @PostMapping("/screen/getScreenEventDetail")
+ R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
+
+ /**
+ * 工作大屏-一起议列表
+ * @param discussListDTO 请求参数
+ * @return 一起议列表
+ */
+ @PostMapping("/screen/work/getScreenDiscussList")
+ R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
+
+ /**
+ * 工作大屏-社区活动列表
+ * @param actActivityListDTO 请求参数
+ * @return 活动列表
+ */
+ @PostMapping("/screen/work/getScreenActActivityList")
+ R getScreenActActivityList(@RequestBody ScreenActActivityListDTO actActivityListDTO);
+
+ /**
+ * 工作大屏-社区活动报名人员列表
+ * @param activityPeopleListDTO 请求参数
+ * @return 社区活动报名人员列表
+ */
+ @PostMapping("/screen/work/getActActivityPeopleList")
+ R getActActivityPeopleList(@RequestBody ScreenActActivityPeopleListDTO activityPeopleListDTO);
+
+ /**
+ * 工作大屏-微心愿列表
+ * @param microListDTO 请求参数
+ * @return 微心愿列表
+ */
+ @PostMapping("/screen/work/getScreenMicroList")
+ R getScreenMicroList(@RequestBody ScreenMicroListDTO microListDTO);
+
}
--
Gitblit v1.7.1