志愿者标签添加类别-调整

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<List<VolunteerTagsSumResultDTO>> getVolunteerTags() {
+    public Result<List<VolunteerTagsResultDTO>> getVolunteerTags() {
         return appUserService.listOfVolunteerTags();
     }
 
+    /**
+    * @describe: 志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:52
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("volunteer/tagsList")
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return appUserService.getVolunteerTagList();
+    }
+
     /**
      * 志愿者部门
      *

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<List<VolunteerTagsSumResultDTO>> getVolunteerTags();
+    Result<List<VolunteerTagsResultDTO>> 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<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("app-user/epdc-app/volunteerinfo/tagList")
+    Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList();
 }

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<List<VolunteerTagsSumResultDTO>> getVolunteerTags() {
+    public Result<List<VolunteerTagsResultDTO>> 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<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getVolunteerTagList", null);
+    }
 }

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<List<VolunteerTagsSumResultDTO>> listOfVolunteerTags();
+    Result<List<VolunteerTagsResultDTO>> listOfVolunteerTags();
     /**
      * 志愿者部门
      *
@@ -435,4 +435,13 @@ public interface AppUserService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.PopulationInfoOverviewDTO>
      **/
     Result<PopulationInfoOverviewDTO> getPopulationInfoOverviewForScreen(String communityId);
+
+    /**
+    * @describe:  志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:53
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList();
 }

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<List<VolunteerTagsSumResultDTO>> listOfVolunteerTags() {
+    public Result<List<VolunteerTagsResultDTO>> listOfVolunteerTags() {
         return userFeignClient.getVolunteerTags();
     }
 
@@ -1777,4 +1777,9 @@ public class AppUserServiceImpl implements AppUserService {
         return userFeignClient.getPopulationInfoOverviewForScreen(communityId);
     }
 
+    @Override
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
+        return userFeignClient.getVolunteerTagList();
+    }
+
 }

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<List<VolunteerTagsSumResultDTO>> getVolunteerTags() {
-//        List<VolunteerTagsResultDTO> data = volunteerTagService.listOfVolunteerTags();
+    public Result<List<VolunteerTagsResultDTO>> getVolunteerTags() {
+        List<VolunteerTagsResultDTO> data = volunteerTagService.listOfVolunteerTags();
+        return new Result<List<VolunteerTagsResultDTO>>().ok(data);
+    }
+
+    /**
+    * @describe: 志愿者标签-分类
+    * @author wangtong
+    * @date 2022/7/22 17:56
+    * @params []
+    * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO>>
+    */
+    @GetMapping("tagList")
+    public Result<List<VolunteerTagsSumResultDTO>> getVolunteerTagList() {
         return volunteerTagService.getVolunteerTags();
-//        return new Result<List<VolunteerTagsResultDTO>>().ok(data);
     }
 
     /**