From daa5a0722e34868b6770ec7b49109005e872325a Mon Sep 17 00:00:00 2001 From: taozi <9108791@qq.com> Date: Sat, 16 Apr 2022 13:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=A7=BB=E5=8A=A8=E5=88=B0ma?= =?UTF-8?q?ll,=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E5=85=B8=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/rest/DictController.java | 8 ++-- .../system/rest/DictDetailController.java | 6 +-- .../system/service/dto/DictSmallDto.java | 22 ----------- .../co/yixiang/modules/dict}/domain/Dict.java | 2 +- .../modules/dict}/domain/DictDetail.java | 2 +- .../dict}/service/DictDetailService.java | 26 +++++++++++-- .../modules/dict}/service/DictService.java | 8 ++-- .../dict}/service/dto/DictDetailDto.java | 2 +- .../service/dto/DictDetailQueryCriteria.java | 2 +- .../modules/dict}/service/dto/DictDto.java | 2 +- .../dict}/service/dto/DictQueryCriteria.java | 2 +- .../service/impl/DictDetailServiceImpl.java | 39 ++++++++++++++++--- .../dict}/service/impl/DictServiceImpl.java | 14 +++---- .../service/mapper/DictDetailMapper.java | 6 +-- .../dict}/service/mapper/DictMapper.java | 4 +- 15 files changed, 84 insertions(+), 61 deletions(-) delete mode 100644 yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/domain/Dict.java (96%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/domain/DictDetail.java (96%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/DictDetailService.java (65%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/DictService.java (85%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/dto/DictDetailDto.java (94%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/dto/DictDetailQueryCriteria.java (92%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/dto/DictDto.java (94%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/dto/DictQueryCriteria.java (92%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/impl/DictDetailServiceImpl.java (67%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/impl/DictServiceImpl.java (90%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/mapper/DictDetailMapper.java (88%) rename {yshop-admin/src/main/java/co/yixiang/modules/system => yshop-mall/src/main/java/co/yixiang/modules/dict}/service/mapper/DictMapper.java (85%) diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java index 5d7966c1..8f192840 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java @@ -9,10 +9,10 @@ import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.modules.system.domain.Dict; -import co.yixiang.modules.system.service.DictService; -import co.yixiang.modules.system.service.dto.DictDto; -import co.yixiang.modules.system.service.dto.DictQueryCriteria; +import co.yixiang.modules.dict.domain.Dict; +import co.yixiang.modules.dict.service.DictService; +import co.yixiang.modules.dict.service.dto.DictDto; +import co.yixiang.modules.dict.service.dto.DictQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index 0b5ddf31..a9dc7627 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -8,9 +8,9 @@ package co.yixiang.modules.system.rest; import co.yixiang.exception.BadRequestException; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; -import co.yixiang.modules.system.domain.DictDetail; -import co.yixiang.modules.system.service.DictDetailService; -import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; +import co.yixiang.modules.dict.domain.DictDetail; +import co.yixiang.modules.dict.service.DictDetailService; +import co.yixiang.modules.dict.service.dto.DictDetailQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java deleted file mode 100644 index d3f87ca3..00000000 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (C) 2018-2022 - * All rights reserved, Designed By www.yixiang.co - - */ -package co.yixiang.modules.system.service.dto; - -import lombok.Getter; -import lombok.Setter; - -import java.io.Serializable; - -/** -* @author hupeng -* @date 2019-04-10 -*/ -@Getter -@Setter -public class DictSmallDto implements Serializable { - - private Long id; -} diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/domain/Dict.java similarity index 96% rename from yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/domain/Dict.java index 3b37650e..eae238c7 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/domain/Dict.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.domain; +package co.yixiang.modules.dict.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/domain/DictDetail.java similarity index 96% rename from yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/domain/DictDetail.java index 0e53a9ad..22ff2121 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/domain/DictDetail.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.domain; +package co.yixiang.modules.dict.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictDetailService.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictDetailService.java similarity index 65% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/DictDetailService.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictDetailService.java index e1d75686..ea235035 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictDetailService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictDetailService.java @@ -6,12 +6,12 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service; +package co.yixiang.modules.dict.service; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.system.domain.DictDetail; -import co.yixiang.modules.system.service.dto.DictDetailDto; -import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; +import co.yixiang.modules.dict.domain.DictDetail; +import co.yixiang.modules.dict.service.dto.DictDetailDto; +import co.yixiang.modules.dict.service.dto.DictDetailQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; @@ -47,4 +47,22 @@ public interface DictDetailService extends BaseService{ * @throws IOException / */ void download(List all, HttpServletResponse response) throws IOException; + + + /** + * 按名称查询字典值返回label + * + * @param dictName dict类型名称 + * @return {@link Map}<{@link String}, {@link String}> + */ + Map queryDetailsByName(String dictName); + + /** + * 按名称查询字典值返回key + * + * @param dictName dict类型名称 + * @return {@link Map}<{@link String}, {@link String}> + */ + Map queryDetailsByKey(String dictName); + } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictService.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictService.java similarity index 85% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/DictService.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictService.java index 72809286..ed3e1c8f 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/DictService.java @@ -6,12 +6,12 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service; +package co.yixiang.modules.dict.service; import co.yixiang.common.service.BaseService; -import co.yixiang.modules.system.domain.Dict; -import co.yixiang.modules.system.service.dto.DictDto; -import co.yixiang.modules.system.service.dto.DictQueryCriteria; +import co.yixiang.modules.dict.domain.Dict; +import co.yixiang.modules.dict.service.dto.DictDto; +import co.yixiang.modules.dict.service.dto.DictQueryCriteria; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailDto.java similarity index 94% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailDto.java index 1d100d89..f571d0cc 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailDto.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.dto; +package co.yixiang.modules.dict.service.dto; import lombok.Data; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailQueryCriteria.java similarity index 92% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailQueryCriteria.java index f2c5f291..4b7f8035 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDetailQueryCriteria.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.dto; +package co.yixiang.modules.dict.service.dto; import co.yixiang.annotation.Query; import lombok.Data; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDto.java similarity index 94% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDto.java index 3e12757e..4813ed62 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictDto.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.dto; +package co.yixiang.modules.dict.service.dto; import lombok.Data; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictQueryCriteria.java similarity index 92% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictQueryCriteria.java index 354f527e..e231d8bb 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/dto/DictQueryCriteria.java @@ -6,7 +6,7 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.dto; +package co.yixiang.modules.dict.service.dto; import co.yixiang.annotation.Query; import lombok.Data; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictDetailServiceImpl.java similarity index 67% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictDetailServiceImpl.java index 69dc91fa..fede0d1b 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictDetailServiceImpl.java @@ -6,15 +6,15 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.impl; +package co.yixiang.modules.dict.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.modules.system.domain.DictDetail; -import co.yixiang.modules.system.service.DictDetailService; -import co.yixiang.modules.system.service.dto.DictDetailDto; -import co.yixiang.modules.system.service.dto.DictDetailQueryCriteria; -import co.yixiang.modules.system.service.mapper.DictDetailMapper; +import co.yixiang.modules.dict.domain.DictDetail; +import co.yixiang.modules.dict.service.DictDetailService; +import co.yixiang.modules.dict.service.dto.DictDetailDto; +import co.yixiang.modules.dict.service.dto.DictDetailQueryCriteria; +import co.yixiang.modules.dict.service.mapper.DictDetailMapper; import co.yixiang.utils.FileUtil; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; @@ -81,4 +82,30 @@ public class DictDetailServiceImpl extends BaseServiceImpl queryDetailsByName(String dictName) { + List dtoList = getDictDetailDtos(dictName); + return dtoList.stream().collect(Collectors.toMap(DictDetailDto::getValue, DictDetailDto::getLabel)); + } + + @Override + public Map queryDetailsByKey(String dictName) { + List dtoList = getDictDetailDtos(dictName); + return dtoList.stream().collect(Collectors.toMap(DictDetailDto::getLabel, DictDetailDto::getValue)); + } + + /** + * 获取dictDetailDto列表 + * + * @param dictName dict类型名称 + * @return {@link List}<{@link DictDetailDto}> + */ + private List getDictDetailDtos(String dictName) { + DictDetailQueryCriteria criteria =new DictDetailQueryCriteria(); + criteria.setDictName(dictName); + List list = baseMapper.selectDictDetailList(criteria.getLabel(),criteria.getDictName()); + return generator.convert(list, DictDetailDto.class); + } + } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictServiceImpl.java similarity index 90% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictServiceImpl.java index 516f6fa7..9f8857a9 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/impl/DictServiceImpl.java @@ -6,18 +6,18 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.impl; +package co.yixiang.modules.dict.service.impl; import cn.hutool.core.collection.CollectionUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.modules.system.domain.Dict; -import co.yixiang.modules.system.service.DictService; -import co.yixiang.modules.system.service.dto.DictDetailDto; -import co.yixiang.modules.system.service.dto.DictDto; -import co.yixiang.modules.system.service.dto.DictQueryCriteria; -import co.yixiang.modules.system.service.mapper.DictMapper; +import co.yixiang.modules.dict.domain.Dict; +import co.yixiang.modules.dict.service.DictService; +import co.yixiang.modules.dict.service.dto.DictDetailDto; +import co.yixiang.modules.dict.service.dto.DictDto; +import co.yixiang.modules.dict.service.dto.DictQueryCriteria; +import co.yixiang.modules.dict.service.mapper.DictMapper; import co.yixiang.utils.FileUtil; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictDetailMapper.java similarity index 88% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictDetailMapper.java index 2842cc43..850be8d4 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictDetailMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictDetailMapper.java @@ -6,10 +6,10 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.mapper; +package co.yixiang.modules.dict.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.modules.system.domain.DictDetail; +import co.yixiang.modules.dict.domain.DictDetail; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -23,6 +23,6 @@ import java.util.List; @Repository public interface DictDetailMapper extends CoreMapper { - @Select("") + @Select("") List selectDictDetailList(@Param("label") String label,@Param("dictName") String dictName); } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictMapper.java similarity index 85% rename from yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictMapper.java rename to yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictMapper.java index 368cfa2f..9d195cfe 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/mapper/DictMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/dict/service/mapper/DictMapper.java @@ -6,10 +6,10 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.modules.system.service.mapper; +package co.yixiang.modules.dict.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.modules.system.domain.Dict; +import co.yixiang.modules.dict.domain.Dict; import org.springframework.stereotype.Repository; /**