From 00e380c13ec7a7dd2f1fff38f1c359158fb0a469 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 22 Jul 2022 18:00:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B1=BB=E5=88=AB-=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 14 +++++++++++++- .../elink/esua/epdc/feign/UserFeignClient.java | 12 +++++++++++- .../feign/fallback/UserFeignClientFallback.java | 7 ++++++- .../elink/esua/epdc/service/AppUserService.java | 11 ++++++++++- .../epdc/service/impl/AppUserServiceImpl.java | 7 ++++++- .../EpdcAppVolunteerInfoController.java | 17 ++++++++++++++--- 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index fefadbf6..9bf57ce3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -424,10 +424,22 @@ public class ApiAppUserController { * @since 2021/1/25 15:03 */ @GetMapping("volunteer/tags") - public Result> getVolunteerTags() { + public Result> getVolunteerTags() { return appUserService.listOfVolunteerTags(); } + /** + * @describe: 志愿者标签-分类 + * @author wangtong + * @date 2022/7/22 17:52 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("volunteer/tagsList") + public Result> getVolunteerTagList() { + return appUserService.getVolunteerTagList(); + } + /** * 志愿者部门 * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index fbb83b6a..2f4dd2ea 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -622,7 +622,7 @@ public interface UserFeignClient { * @since 2021/1/25 15:03 */ @GetMapping("app-user/epdc-app/volunteerinfo/tags") - Result> getVolunteerTags(); + Result> getVolunteerTags(); /** * 志愿者部门 @@ -692,4 +692,14 @@ public interface UserFeignClient { */ @PostMapping(value = "app-user/vlounteerteamrealation/joinTeam", consumes = MediaType.APPLICATION_JSON_VALUE) Result joinTeam(VolunteerTeamFormDTO formDto); + + /** + * @describe: 志愿者标签-分类 + * @author wangtong + * @date 2022/7/22 17:55 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("app-user/epdc-app/volunteerinfo/tagList") + Result> getVolunteerTagList(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 8fd3b680..7681f930 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -299,7 +299,7 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result> getVolunteerTags() { + public Result> getVolunteerTags() { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerTags", null); } @@ -337,4 +337,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result joinTeam(VolunteerTeamFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "joinTeam", formDto); } + + @Override + public Result> getVolunteerTagList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerTagList", null); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 551d06c2..848d297e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -410,7 +410,7 @@ public interface AppUserService { * @author Liuchuang * @since 2021/1/25 15:03 */ - Result> listOfVolunteerTags(); + Result> listOfVolunteerTags(); /** * 志愿者部门 * @@ -435,4 +435,13 @@ public interface AppUserService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getPopulationInfoOverviewForScreen(String communityId); + + /** + * @describe: 志愿者标签-分类 + * @author wangtong + * @date 2022/7/22 17:53 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getVolunteerTagList(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 5bf74380..5c4bf38c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1758,7 +1758,7 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result> listOfVolunteerTags() { + public Result> listOfVolunteerTags() { return userFeignClient.getVolunteerTags(); } @@ -1777,4 +1777,9 @@ public class AppUserServiceImpl implements AppUserService { return userFeignClient.getPopulationInfoOverviewForScreen(communityId); } + @Override + public Result> getVolunteerTagList() { + return userFeignClient.getVolunteerTagList(); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java index f68e4281..0984e3b5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java @@ -106,10 +106,21 @@ public class EpdcAppVolunteerInfoController { * @since 2021/1/25 15:03 */ @GetMapping("tags") - public Result> getVolunteerTags() { -// List data = volunteerTagService.listOfVolunteerTags(); + public Result> getVolunteerTags() { + List data = volunteerTagService.listOfVolunteerTags(); + return new Result>().ok(data); + } + + /** + * @describe: 志愿者标签-分类 + * @author wangtong + * @date 2022/7/22 17:56 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("tagList") + public Result> getVolunteerTagList() { return volunteerTagService.getVolunteerTags(); -// return new Result>().ok(data); } /**