From c8876578ac0d064a2732a8a7139d75fa479ff094 Mon Sep 17 00:00:00 2001 From: ray <1490493387@qq.com> Date: Tue, 13 Aug 2024 19:53:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20mapstruct=20=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youlai/system/converter/DeptConverter.java | 2 +- .../youlai/system/converter/DictConverter.java | 2 +- .../system/converter/DictItemConverter.java | 15 +++++++-------- .../youlai/system/converter/MenuConverter.java | 2 +- .../youlai/system/converter/RoleConverter.java | 2 +- .../system/converter/SysConfigConverter.java | 2 +- .../system/service/impl/SysConfigServiceImpl.java | 2 +- .../system/service/impl/SysDeptServiceImpl.java | 2 +- .../system/service/impl/SysDictServiceImpl.java | 4 ++-- .../system/service/impl/SysMenuServiceImpl.java | 2 +- .../system/service/impl/SysRoleServiceImpl.java | 2 +- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/youlai/system/converter/DeptConverter.java b/src/main/java/com/youlai/system/converter/DeptConverter.java index bf165616..83feca8c 100644 --- a/src/main/java/com/youlai/system/converter/DeptConverter.java +++ b/src/main/java/com/youlai/system/converter/DeptConverter.java @@ -16,7 +16,7 @@ public interface DeptConverter { DeptForm toForm(SysDept entity); - DeptVO convertToVo(SysDept entity); + DeptVO toVo(SysDept entity); SysDept toEntity(DeptForm deptForm); diff --git a/src/main/java/com/youlai/system/converter/DictConverter.java b/src/main/java/com/youlai/system/converter/DictConverter.java index 94bbc246..870b3d10 100644 --- a/src/main/java/com/youlai/system/converter/DictConverter.java +++ b/src/main/java/com/youlai/system/converter/DictConverter.java @@ -15,7 +15,7 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface DictConverter { - Page convertToPageVo(Page page); + Page toPageVo(Page page); DictForm toForm(SysDict entity); diff --git a/src/main/java/com/youlai/system/converter/DictItemConverter.java b/src/main/java/com/youlai/system/converter/DictItemConverter.java index 7c00e9c5..1f026fdb 100644 --- a/src/main/java/com/youlai/system/converter/DictItemConverter.java +++ b/src/main/java/com/youlai/system/converter/DictItemConverter.java @@ -5,7 +5,6 @@ import com.youlai.system.common.model.Option; import com.youlai.system.model.entity.SysDictItem; import com.youlai.system.model.form.DictForm; import com.youlai.system.model.vo.DictPageVO; -import org.mapstruct.InheritInverseConfiguration; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -21,20 +20,20 @@ import java.util.List; @Mapper(componentModel = "spring") public interface DictItemConverter { - Page convertToPageVo(Page page); + Page toPageVo(Page page); DictForm toForm(SysDictItem entity); - SysDictItem toEntity(DictForm.DictItem dictFormDictItems); - List toEntity(List dictFormDictItems); + SysDictItem toEntity(DictForm.DictItem dictItems); + List toEntity(List dictItems); - DictForm.DictItem convertToDictFormDictItem(SysDictItem entity); - List convertToDictFormDictItem(List entities); + DictForm.DictItem toDictItem(SysDictItem entity); + List toDictItem(List entities); @Mappings({ @Mapping(target = "value", source = "id"), @Mapping(target = "label", source = "name") }) - Option convertToOption(SysDictItem dictItem); - List> convertToOption(List dictItems); + Option toOption(SysDictItem dictItem); + List> toOption(List dictItems); } diff --git a/src/main/java/com/youlai/system/converter/MenuConverter.java b/src/main/java/com/youlai/system/converter/MenuConverter.java index 1a775579..c5c987a0 100644 --- a/src/main/java/com/youlai/system/converter/MenuConverter.java +++ b/src/main/java/com/youlai/system/converter/MenuConverter.java @@ -15,7 +15,7 @@ import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface MenuConverter { - MenuVO convertToVo(SysMenu entity); + MenuVO toVo(SysMenu entity); @Mapping(target = "params", ignore = true) MenuForm toForm(SysMenu entity); diff --git a/src/main/java/com/youlai/system/converter/RoleConverter.java b/src/main/java/com/youlai/system/converter/RoleConverter.java index ac546d63..0a86a3a4 100644 --- a/src/main/java/com/youlai/system/converter/RoleConverter.java +++ b/src/main/java/com/youlai/system/converter/RoleConverter.java @@ -20,7 +20,7 @@ import java.util.List; @Mapper(componentModel = "spring") public interface RoleConverter { - Page convertToPageVo(Page page); + Page toPageVo(Page page); @Mappings({ @Mapping(target = "value", source = "id"), diff --git a/src/main/java/com/youlai/system/converter/SysConfigConverter.java b/src/main/java/com/youlai/system/converter/SysConfigConverter.java index 8fd2e5c5..ad7d9781 100644 --- a/src/main/java/com/youlai/system/converter/SysConfigConverter.java +++ b/src/main/java/com/youlai/system/converter/SysConfigConverter.java @@ -15,7 +15,7 @@ import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface SysConfigConverter { - Page convertToPageVo(Page page); + Page toPageVo(Page page); SysConfig toEntity(ConfigForm configForm); diff --git a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java index ca6be5b5..391b9409 100644 --- a/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysConfigServiceImpl.java @@ -66,7 +66,7 @@ public class SysConfigServiceImpl extends ServiceImpl pageList = this.page(page, query); - return sysConfigConverter.convertToPageVo(pageList); + return sysConfigConverter.toPageVo(pageList); } /** diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java index ceb153db..c2788aa3 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java @@ -86,7 +86,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptList.stream() .filter(dept -> dept.getParentId().equals(parentId)) .map(dept -> { - DeptVO deptVO = deptConverter.convertToVo(dept); + DeptVO deptVO = deptConverter.toVo(dept); List children = recurDeptList(dept.getId(), deptList); deptVO.setChildren(children); return deptVO; diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java index 880e714c..839dc9e6 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java @@ -98,7 +98,7 @@ public class SysDictServiceImpl extends ServiceImpl impl .eq(SysDictItem::getDictId, id) ); // 转换数据项 - List dictItemList = dictItemConverter.convertToDictFormDictItem(dictItems); + List dictItemList = dictItemConverter.toDictItem(dictItems); dictForm.setDictItems(dictItemList); return dictForm; } @@ -219,7 +219,7 @@ public class SysDictServiceImpl extends ServiceImpl impl ); // 转换为 Option - return dictItemConverter.convertToOption(dictItems); + return dictItemConverter.toOption(dictItems); } /** diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index 940f2018..bccde913 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -94,7 +94,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl .stream() .filter(menu -> menu.getParentId().equals(parentId)) .map(entity -> { - MenuVO menuVO = menuConverter.convertToVo(entity); + MenuVO menuVO = menuConverter.toVo(entity); List children = buildMenuTree(entity.getId(), menuList); menuVO.setChildren(children); return menuVO; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java index cffa9478..3a1bda82 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java @@ -70,7 +70,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl ); // 实体转换 - return roleConverter.convertToPageVo(rolePage); + return roleConverter.toPageVo(rolePage); } /**