From 0b452a925b833cbc2d39b6f8ee38a414ccc09b52 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 21 Jul 2022 10:16:55 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 2 +- .../esua/epdc/feign/UserFeignClient.java | 2 +- .../fallback/UserFeignClientFallback.java | 2 +- .../esua/epdc/service/AppUserService.java | 2 +- .../epdc/service/impl/AppUserServiceImpl.java | 2 +- .../elink/esua/epdc/dto/VolunteerTagDTO.java | 10 +++++-- .../result/VolunteerTagsSumResultDTO.java | 27 +++++++++++++++++++ .../EpdcAppVolunteerInfoController.java | 7 ++--- .../elink/esua/epdc/dao/VolunteerTagDao.java | 10 +++++++ .../esua/epdc/entity/VolunteerTagEntity.java | 10 ++++--- .../epdc/service/VolunteerTagService.java | 11 ++++++++ .../service/impl/VolunteerTagServiceImpl.java | 20 ++++++++++++++ .../main/resources/mapper/VolunteerTagDao.xml | 12 ++++++++- 13 files changed, 102 insertions(+), 15 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/VolunteerTagsSumResultDTO.java 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 941b6f04..fefadbf6 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,7 +424,7 @@ public class ApiAppUserController { * @since 2021/1/25 15:03 */ @GetMapping("volunteer/tags") - public Result> getVolunteerTags() { + public Result> getVolunteerTags() { return appUserService.listOfVolunteerTags(); } 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 36b229e0..fbb83b6a 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(); /** * 志愿者部门 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 489c6c57..8fd3b680 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); } 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 8a09ccc5..551d06c2 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(); /** * 志愿者部门 * 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 72e849b3..5bf74380 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(); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerTagDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerTagDTO.java index 12408331..018f23ad 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerTagDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerTagDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -88,4 +89,9 @@ public class VolunteerTagDTO implements Serializable { */ private Date updatedTime; -} \ No newline at end of file + /** + * 类别：1服务团 2服务队 + */ + private String categoryType; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/VolunteerTagsSumResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/VolunteerTagsSumResultDTO.java new file mode 100644 index 00000000..89843e92 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/VolunteerTagsSumResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 志愿者标签 + * + * @author Liuchuang + * @since 2021/1/25 15:01 + */ +@Data +public class VolunteerTagsSumResultDTO implements Serializable { + private static final long serialVersionUID = 8355829005926490150L; + + + + /** + * 类别名称 + */ + private String typeName; + + private List lists; + +} 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 efa61f8c..f68e4281 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,9 +106,10 @@ public class EpdcAppVolunteerInfoController { * @since 2021/1/25 15:03 */ @GetMapping("tags") - public Result> getVolunteerTags() { - List data = volunteerTagService.listOfVolunteerTags(); - return new Result>().ok(data); + public Result> getVolunteerTags() { +// List data = volunteerTagService.listOfVolunteerTags(); + return volunteerTagService.getVolunteerTags(); +// return new Result>().ok(data); } /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerTagDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerTagDao.java index 8b122dd9..bfc50bf2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerTagDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerTagDao.java @@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO; import com.elink.esua.epdc.entity.VolunteerTagEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -41,4 +42,13 @@ public interface VolunteerTagDao extends BaseDao { * @since 2021/1/25 15:11 */ List selectListOfVolunteerTags(); + + /** + * @describe: 通过类别查询标签 + * @author wangtong + * @date 2022/7/21 9:54 + * @params [categoryType] + * @return java.util.List + */ + List selectListByCategory(@Param("categoryType") String categoryType); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerTagEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerTagEntity.java index d959bda0..2b84ad81 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerTagEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerTagEntity.java @@ -18,13 +18,10 @@ package com.elink.esua.epdc.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 志愿者标签表 * @@ -58,4 +55,9 @@ public class VolunteerTagEntity extends BaseEpdcEntity { */ private String enableFlag; -} \ No newline at end of file + /** + * 类别：1服务团 2服务队 + */ + private String categoryType; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerTagService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerTagService.java index 1dc29840..dc6e67bb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerTagService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerTagService.java @@ -19,8 +19,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.VolunteerTagDTO; import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO; +import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO; import com.elink.esua.epdc.entity.VolunteerTagEntity; import java.util.List; @@ -102,4 +104,13 @@ public interface VolunteerTagService extends BaseService { * @since 2021/1/25 15:09 */ List listOfVolunteerTags(); + + /** + * @describe: 志愿者标签 + * @author wangtong + * @date 2022/7/21 9:33 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + Result> getVolunteerTags(); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagServiceImpl.java index 0e4c627a..7b9bb435 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerTagServiceImpl.java @@ -23,15 +23,18 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.VolunteerTagDao; import com.elink.esua.epdc.dto.VolunteerTagDTO; import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsResultDTO; +import com.elink.esua.epdc.dto.epdc.result.VolunteerTagsSumResultDTO; import com.elink.esua.epdc.entity.VolunteerTagEntity; import com.elink.esua.epdc.service.VolunteerTagService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -103,4 +106,21 @@ public class VolunteerTagServiceImpl extends BaseServiceImpl> getVolunteerTags() { + List result = new ArrayList<>(); + + VolunteerTagsSumResultDTO firstCtegory = new VolunteerTagsSumResultDTO(); + firstCtegory.setTypeName("服务团"); + firstCtegory.setLists(baseDao.selectListByCategory("1")); + result.add(firstCtegory); + + VolunteerTagsSumResultDTO secondCtegory = new VolunteerTagsSumResultDTO(); + secondCtegory.setTypeName("服务队"); + secondCtegory.setLists(baseDao.selectListByCategory("2")); + result.add(secondCtegory); + + return new Result>().ok(result); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml index 09ddc12b..9a72c5d7 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerTagDao.xml @@ -17,8 +17,18 @@ - SELECT ID, TAG_NAME, DESCRIPTION, SORT FROM epdc_volunteer_tag WHERE DEL_FLAG = '0' AND ENABLE_FLAG = '1' ORDER BY SORT +