From 48a703dec596b5d2c1b04b0b4f7ed0f28c1ca898 Mon Sep 17 00:00:00 2001 From: lidongdong <1459917685@qq.com> Date: 星期一, 13 十一月 2023 18:00:50 +0800 Subject: [PATCH] 新增社区共建评论模块2 --- springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java index 10fd9f5..4b4c083 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/WorkGuideApi.java @@ -1,15 +1,21 @@ package com.panzhihua.applets.api; +import javax.annotation.Resource; + +import com.panzhihua.common.model.vos.community.ComActWorkGuideAppletsVO; +import com.panzhihua.common.model.vos.community.ComActWorkGuideDetailAppletsVO; +import org.springframework.web.bind.annotation.*; + import com.panzhihua.common.controller.BaseController; import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO; +import com.panzhihua.common.model.vos.LoginUserInfoVO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.ComActWorkGuideVO; import com.panzhihua.common.service.community.CommunityService; + import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; /** * @auther llming @@ -23,17 +29,38 @@ @Resource private CommunityService communityService; - @ApiOperation(value = "办事指南_分页",response = ComActWorkGuideVO.class) + @ApiOperation(value = "办事指南_分页", response = ComActWorkGuideVO.class) @PostMapping("pageworkguide") public R detailWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) { + pageActWorkGuideDTO.setAreaCode(this.getAreaCode()); return communityService.pageWorkGuide(pageActWorkGuideDTO); } - @ApiOperation(value = "办事指南_详情",response = ComActWorkGuideVO.class) + @ApiOperation(value = "办事指南_详情", response = ComActWorkGuideVO.class) @GetMapping("detailworkguide") - public R detailWorkGuide(@RequestParam("workGuideId")Long workGuideId) { - Long conmunityId = this.getLoginUserInfo().getCommunityId(); - return communityService.detailWorkGuide(workGuideId, conmunityId); + public R detailWorkGuide(@RequestParam("workGuideId") String workGuideId, + @RequestParam(value = "communityId", required = false) Long communityId) { + LoginUserInfoVO loginUserInfo = this.getLoginUserInfoSureNoLogin(); + if (loginUserInfo != null) { + communityId = loginUserInfo.getCommunityId(); + } + if(communityId==null || communityId<0) + { + return communityService.detailWorkGuide(workGuideId, ""); + } + return communityService.detailWorkGuide(workGuideId, communityId+""); + } + + @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideAppletsVO.class) + @PostMapping("list") + public R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO) { + pageActWorkGuideDTO.setAreaCode(this.getAreaCode()); + return communityService.listWorkGuide(pageActWorkGuideDTO); + } + + @ApiOperation(value = "办事指南列表-按分类查询", response = ComActWorkGuideDetailAppletsVO.class) + @GetMapping("list/classify") + public R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId) { + return communityService.listWorkGuideByClassifyId(classifyId); } } - -- Gitblit v1.7.1