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 | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 208 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 b6336fe..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 @@ -16,6 +16,11 @@ 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.*; @@ -29,11 +34,13 @@ 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; /** @@ -758,7 +765,7 @@ * * @return */ - @PostMapping("timedtaskactmicrowishall") + @PostMapping("timedtaskactmicrowish") R timedTaskActMicroWishAll(); /** @@ -2395,6 +2402,22 @@ */ @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); + /** * 邻里圈_添加 @@ -2403,4 +2426,188 @@ @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