From 5ade6f6e4532b65b96d80eabe5d92302f6f817f4 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 13:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 496 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 495 insertions(+), 1 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 a7bf930..6c2080f 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
@@ -5,24 +5,42 @@
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.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.vos.IPageVO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
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 java.util.Date;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -740,6 +758,15 @@
*/
@PostMapping("timedtaskactactivityall")
R timedTaskActActivityAll();
+
+
+ /**
+ * 定时任务刷新社区活动的各个状态 除取消外
+ *
+ * @return
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll();
/**
* 其他建筑详情
@@ -1612,6 +1639,15 @@
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 查询参数
@@ -1628,6 +1664,15 @@
*/
@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修改实有人口标签列表
@@ -1786,6 +1831,13 @@
@PostMapping("/shop/saveStore")
R saveStore(@RequestBody ShopStoreVO storeVO);
+ /**
+ * 新增店铺
+ * @param storeVO 店铺信息
+ * @return 新增结果
+ */
+ @PostMapping("/shop/addStore")
+ R addStore(@RequestBody ShopStoreVO storeVO);
/**
* 编辑店铺、启用、禁用
@@ -1909,6 +1961,14 @@
*/
@PostMapping("/shop/shopCartList")
R shopCartList(@RequestParam("userId") Long userId);
+
+ /**
+ * 查询用户购物车数量
+ * @param userId 用户id
+ * @return 用户购物车商品数量
+ */
+ @PostMapping("/shop/shopCartUserTotal")
+ R shopCartUserTotal(@RequestParam("userId") Long userId);
/**
* 购物车添加
@@ -2071,6 +2131,13 @@
R getUserStoreInfo(@RequestParam("userId") Long userId);
/**
+ * 获取用户商户详情
+ * @param account 用户账号
+ */
+ @GetMapping("/shop/getUserStoreInfoByAccount")
+ R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account);
+
+ /**
* 订单导出信息
* @param comShopOrderExportDTO 订单导出信息
* @return 订单导出信息
@@ -2116,4 +2183,431 @@
*/
@PostMapping("/shop/wxPay")
R wxPay(@RequestBody OrderPayDTO orderPayDTO);
+
+ /**
+ * 编辑实有人口
+ * @param editComMngPopulationVO
+ * @return
+ */
+ @PostMapping("/common/data/population/edit")
+ R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO, @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 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);
}
--
Gitblit v1.7.1