From 7f9a8ad4f23bf07bdec92a8c415da39f0b5634d2 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 3 Sep 2021 10:18:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E6=B4=BB=E5=8A=A8api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiVolunteerRankController.java | 41 ++++++++++++-- .../feign/AppVolunteerRankFeignClient.java | 41 ++++++++++++-- .../AppVolunteerRankFeignClientFallback.java | 19 +++++-- .../epdc/service/AppVolunteerRankService.java | 31 +++++++++-- .../impl/AppVolunteerRankServiceImpl.java | 54 ++++++++++++++++--- 5 files changed, 167 insertions(+), 19 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java index 9440f57..1238ed5 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiVolunteerRankController.java @@ -6,9 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.result.EpdcAppVolunteerRankDTO; import com.elink.esua.epdc.service.AppVolunteerRankService; -import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; +import com.elink.esua.epdc.volunteer.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -77,4 +75,41 @@ public class ApiVolunteerRankController { return appVolunteerRankService.getVolunteerDetail(userDetail); } + + /** + * @describe: 志愿活动-申请（新增修改） + * @author wangtong + * @date 2021/9/3 9:48 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("applyActivity") + public Result applyActivity(@LoginUser TokenDto userDetail, @RequestBody AppVactApplyDTO formDto) { + return appVolunteerRankService.applyActivity(userDetail, formDto); + } + + /** + * @describe: 志愿活动-活动列表 + * @author wangtong + * @date 2021/9/3 9:56 + * @params [userDetail, dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getActivityList") + public Result getActivityList(@LoginUser TokenDto userDetail, AppPageParamsDTO dto) { + return appVolunteerRankService.getActivityList(userDetail , dto); + } + + /** + * @describe: 志愿活动-详情 + * @author wangtong + * @date 2021/9/3 9:57 + * @params [userDetail, vactId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getActivityDetail") + public Result getActivityDetail( String vactId) { + return appVolunteerRankService.getActivityDetail( vactId); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java index 5091350..2e49b55 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AppVolunteerRankFeignClient.java @@ -3,9 +3,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.feign.fallback.AppVolunteerRankFeignClientFallback; -import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; +import com.elink.esua.epdc.volunteer.*; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -20,7 +18,9 @@ import java.util.List; * @Author：wanggongfeng * @Date：2019/12/16 17:36 */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppVolunteerRankFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppVolunteerRankFeignClientFallback.class +//,url = "http://127.0.0.1:9072" +) public interface AppVolunteerRankFeignClient { /** @@ -59,4 +59,37 @@ public interface AppVolunteerRankFeignClient { */ @GetMapping(value = "heart/volunteer/getVolunteerDetail", consumes = MediaType.APPLICATION_JSON_VALUE) Result getVolunteerDetail(AppVolunteerApplyDTO formDto); + + + /** + * @describe: 志愿活动-申请（新增修改） + * @author wangtong + * @date 2021/9/3 9:48 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping(value = "heart/vactinfo/applyActivity", consumes = MediaType.APPLICATION_JSON_VALUE) + Result applyActivity(AppVactApplyDTO formDto); + + + /** + * @describe: 志愿活动-活动列表 + * @author wangtong + * @date 2021/9/3 9:56 + * @params [userDetail, dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value = "heart/vactinfo/getActivityList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getActivityList(AppPageParamsDTO dto); + + + /** + * @describe: 志愿活动-详情 + * @author wangtong + * @date 2021/9/3 9:57 + * @params [userDetail, vactId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value = "heart/vactinfo/getActivityDetail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getActivityDetail(String vactId); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java index 7250871..740059c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AppVolunteerRankFeignClientFallback.java @@ -4,9 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient; -import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; +import com.elink.esua.epdc.volunteer.*; import org.springframework.stereotype.Component; import java.util.List; @@ -38,5 +36,20 @@ public class AppVolunteerRankFeignClientFallback implements AppVolunteerRankFeig return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getVolunteerDetail",formDto); } + @Override + public Result applyActivity(AppVactApplyDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "applyActivity",formDto); + } + + @Override + public Result getActivityList(AppPageParamsDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getActivityList",dto); + } + + @Override + public Result getActivityDetail(String vactId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getActivityDetail",vactId); + } + } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java index f6d6e59..09617b7 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppVolunteerRankService.java @@ -2,9 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; +import com.elink.esua.epdc.volunteer.*; import java.util.List; @@ -47,4 +45,31 @@ public interface AppVolunteerRankService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getVolunteerDetail(TokenDto userDetail); + + /** + * @describe: 志愿活动-申请（新增修改） + * @author wangtong + * @date 2021/9/3 9:48 + * @params [userDetail, formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result applyActivity(TokenDto userDetail, AppVactApplyDTO formDto); + + /** + * @describe: 志愿活动-活动列表 + * @author wangtong + * @date 2021/9/3 9:56 + * @params [userDetail, dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getActivityList(TokenDto userDetail, AppPageParamsDTO dto); + + /** + * @describe: 志愿活动-详情 + * @author wangtong + * @date 2021/9/3 9:57 + * @params [userDetail, vactId] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getActivityDetail(String vactId); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java index 8bc915c..ae89084 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java @@ -8,9 +8,7 @@ import com.elink.esua.epdc.dto.UserTagInfo; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.feign.AppVolunteerRankFeignClient; import com.elink.esua.epdc.service.AppVolunteerRankService; -import com.elink.esua.epdc.volunteer.AppVolunteerApplyDTO; -import com.elink.esua.epdc.volunteer.EpdcVolunteerRankDTO; -import com.elink.esua.epdc.volunteer.VolunteerOrgDTO; +import com.elink.esua.epdc.volunteer.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -57,9 +55,6 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { //获取所有上级机构名称和ID拼接 Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); ParentAndAllDeptDTO deptDTO = dtoResult.getData(); - log.info("userDetail:"+userDetail); - log.info("formDto:"+formDto); - log.info("deptDTO:"+deptDTO); // 父所有部门 formDto.setParentDeptIds(deptDTO.getParentDeptIds()); formDto.setParentDeptNames(deptDTO.getParentDeptNames()); @@ -98,4 +93,51 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService { return appVolunteerRankFeignClient.getVolunteerDetail(formDto); } + @Override + public Result applyActivity(TokenDto userDetail, AppVactApplyDTO formDto) { + if (null == userDetail) { + return new Result().error("获取用户信息失败"); + } + //获取所有上级机构名称和ID拼接 + Result dtoResult = adminFeignClient.getParentAndAllDept(userDetail.getGridId()); + ParentAndAllDeptDTO deptDTO = dtoResult.getData(); + // 父所有部门 + formDto.setParentDeptIds(deptDTO.getParentDeptIds()); + formDto.setParentDeptNames(deptDTO.getParentDeptNames()); + // 所有部门 + formDto.setAllDeptIds(deptDTO.getAllDeptIds()); + formDto.setAllDeptNames(deptDTO.getAllDeptNames()); + // 网格 + formDto.setDeptName(deptDTO.getGrid()); + formDto.setDeptId(deptDTO.getGridId().toString()); + + formDto.setUserId(userDetail.getUserId()); + formDto.setFaceImg(userDetail.getFaceImg()); + //判断党员标识 + if (!CollectionUtils.isEmpty(userDetail.getUserTagInfos())) { + Boolean flag = false; + for (UserTagInfo ut : userDetail.getUserTagInfos()) { + if ("partymember".equals(ut.getTagCode())) { + flag = true; + break; + } + } + formDto.setPartyFlag(flag == true ? "1" : "0"); + } else { + formDto.setPartyFlag("0"); + } + return appVolunteerRankFeignClient.applyActivity(formDto); + } + + @Override + public Result getActivityList(TokenDto userDetail, AppPageParamsDTO dto) { + dto.setUserId(userDetail.getUserId()); + return appVolunteerRankFeignClient.getActivityList(dto); + } + + @Override + public Result getActivityDetail(String vactId) { + return appVolunteerRankFeignClient.getActivityDetail(vactId); + } + }