From ffb18ccfe6750f4a65bce6e02e7f6edb54a5d76f Mon Sep 17 00:00:00 2001 From: manailin <261030956@qq.com> Date: 星期六, 24 九月 2022 23:45:38 +0800 Subject: [PATCH] [修改] 三说代码事件流程代码提交 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 210 insertions(+), 3 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 7f54837..43e3c43 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 @@ -4,13 +4,16 @@ import com.panzhihua.common.model.dtos.PageBaseDTO; import com.panzhihua.common.model.dtos.community.ActivityInviteDTO; +import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO; import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO; +import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO; import com.panzhihua.common.model.dtos.community.acid.*; import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO; import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO; import com.panzhihua.common.model.dtos.community.dpc.PageDpcDTO; import com.panzhihua.common.model.dtos.community.enterprise.*; import com.panzhihua.common.model.dtos.community.reserve.*; +import com.panzhihua.common.model.dtos.community.sanshuo.*; import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO; import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO; import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto; @@ -33,6 +36,7 @@ import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO; import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO; import com.panzhihua.common.model.vos.community.reserve.ComActReserveDangerAreaVO; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.DeleteMapping; @@ -1635,12 +1639,12 @@ /** * 议事投票-投票 * - * @param comActDiscussOptionUserDTO + * @param discussVoteOptionDTO * 投票信息 * @return 投票结果 */ @PostMapping("adddiscussoptionuser") - R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO); + R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO); /** * 议事投票-评论-点赞、取消点赞 @@ -5058,7 +5062,7 @@ * @return 社区列表 */ @GetMapping("/eventgrid/community/westList") - R getWestCommunityLists(@RequestParam("areaCode")String areaCode); + R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode); /** * 综治app-小区列表 @@ -10317,4 +10321,207 @@ */ @PostMapping("/neighbor/pageRelationList") R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO); + + /** + * 投票情况-分页查询 + * @param pageVoteSituationDTO + * @return + */ + @PostMapping("pageVoteSituation") + R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO); + + /** + * 投票情况详情 + * @param optionUserId + * @return + */ + @GetMapping("detailVoteSituation") + R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId); + + /** + * 批量核对防疫信息数据 + * @param batchCheckAcidRecordDTO + * @return + */ + @PostMapping("/comActAcidRecord/batchCheck") + R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO); + + /** + * 小程序获取可用的行业中心列表 + * @return + * */ + @GetMapping("/sanshuo/industryCenter/appletsList") + R industryCenterAppList(); + + /** + * 后台获取行业中心列表 + * */ + @GetMapping("/sanshuo/industryCenter/list") + R backIndustrytList(@RequestParam(value = "keyWord",required = false)String keyWord, + @RequestParam(value = "page",required = false)Integer page, + @RequestParam(value = "size",required = false)Integer size); + + /** + * 添加业务中心 + * */ + @PostMapping("/sanshuo/industryCenter") + R addIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO); + + /** + * 修改业务中心 + * */ + @PutMapping("/sanshuo/industryCenter") + R updateIndustry(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO); + + /** + * 删除业务中心 + * */ + @DeleteMapping("/sanshuo/industryCenter/remove") + R removeIndustry(@RequestParam("id") Long id); + + /** + * 重置业务中心密码 + * */ + @PostMapping("/sanshuo/industryCenter/resetPass") + R resetIndustryPassword(@RequestBody ComSanShuoIndustryCenterDTO comSanShuoIndustryCenterDTO); + + /** + * 业务中心详情 + * */ + @GetMapping("/sanshuo/industryCenter/detail") + R industryCenterDetail(@RequestParam("id") Long id); + + /** + * 后台获取专家列表 + * */ + @GetMapping("/sanshuo/expert/backstageList") + R backExpertList(@RequestParam(value = "keyWord",required = false)@ApiParam("搜索关键字") String keyWord, + @RequestParam(value = "page",required = false)Integer page, + @RequestParam(value = "size",required = false)Integer size); + + /** + * 添加专家 + * */ + @PostMapping("/sanshuo/expert") + R addExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO); + + /** + * 修改专家 + * */ + @PutMapping("/sanshuo/expert") + R updateExpert(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO); + + /** + * 删除专家 + * */ + @DeleteMapping("/sanshuo/expert/remove") + R removeExpert(@RequestParam("id")Long id); + + /** + * 重置专家登陆密码 + * */ + @PostMapping("/sanshuo/expert/resetPassword") + R resetExpertPassword(@RequestBody ComSanshuoExpertDTO comSanshuoExpertDTO); + + /** + * 小程序获取可选择专家列表 + * */ + @GetMapping("/sanshuo/expert/appletsList") + R expertAppList(); + + /** + * 获取专家详情 + * */ + @GetMapping("/sanshuo/expert/detail") + R expertDetail(@RequestParam("id") Long id); + + /** + * 后台事件列表 + * */ + @GetMapping("/sanshuo/event/list") + R backEventList(@RequestParam(value = "keyWord",required = false)String keyWord, + @RequestParam(value = "page",required = false)Integer page, + @RequestParam(value = "size",required = false)Integer size); + + /** + * 事件详情 + * */ + @GetMapping("/sanshuo/event/detail") + R eventDetail(@RequestParam(value = "id",required = false)Long id); + + /** + * 小程序获取事件列表 + * */ + @GetMapping("/sanshuo/event/appletsList") + R eventAppList(); + + /** + * 新增事件类型 + * */ + @PostMapping("/sanshuo/event") + R addEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO); + + /** + * 新增事件类型 + * */ + @PutMapping("/sanshuo/event") + R updateEvent(@RequestBody ComMediateTypeDTO comSanshuoEventDTO); + + /** + * 删除事件类型 + * */ + @DeleteMapping("/sanshuo/event/remove") + R removeEvent(@RequestParam(value = "id",required = false)Long id); + + /** + * 专家风采 + * */ + @GetMapping("/sanshuo/expert/expertShow") + R expertShow(); + + + @GetMapping("/sanshuo/expert/expertRange") + R expertRange(); + + /** + * 大屏事件统计 + * */ + @PostMapping("/sanshuo/comEvent/indexData") + R sanshuoIndexDate(IndexDateDTO indexDateDTO); + + /** + * 事件占比统计饼图 + * */ + @GetMapping("sanshuo/comEvent/indexData/event") + R eventIndexData(@RequestParam("type") Integer type); + + /** + * 专家风采列表 + * */ + @GetMapping("/sanshuo/expert/expertShowList") + R expertShowList(@RequestParam(value = "level",required = false)Integer level,@RequestParam(value = "id",required = false)Long id); + + /** + * 修改街道信息 + * */ + @PostMapping("/updateStreet") + R updateStreet(@RequestBody ComStreetVO comStreetVO); + + /** + * 删除街道 + * */ + @GetMapping("/removeStreet") + R removeStreet(@RequestParam(value = "id",required = false)Long id); + + /*** + * 删除社区 + * */ + @GetMapping("/removeCommunity") + R removeCommunity(@RequestParam(value = "id",required = false)Long id); + + @PostMapping("/repassCommunity") + R repassCommunity(@RequestBody ComActVO comActVO); + + @PostMapping("/repassStreet") + R repassStreet(@RequestBody ComStreetVO comActVO); } -- Gitblit v1.7.1