From 6e21c6472843d67bfb5dd590e33207a58d41695e Mon Sep 17 00:00:00 2001 From: MichelleChung <1242874891@qq.com> Date: Thu, 2 Mar 2023 14:09:51 +0000 Subject: [PATCH] =?UTF-8?q?!292=20mapstruct-plus=20=E6=8E=A5=E5=85=A5?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20BeanUtil=20*=20add=20=E6=96=B0=E5=A2=9E=20?= =?UTF-8?q?mapstruct-plus=20=E7=94=A8=E4=BA=8E=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 18 ++++ .../web/controller/SysLoginController.java | 4 +- .../com/ruoyi/web/domain/vo/TenantListVo.java | 3 + .../ruoyi/web/service/SysLoginService.java | 3 +- ruoyi-common/ruoyi-common-core/pom.xml | 5 + .../common/core/utils/MapstructUtils.java | 92 +++++++++++++++++++ .../mybatis/core/mapper/BaseMapperPlus.java | 14 +-- .../demo/controller/TestDemoController.java | 8 +- .../com/ruoyi/demo/domain/bo/TestDemoBo.java | 3 + .../com/ruoyi/demo/domain/bo/TestTreeBo.java | 3 + .../com/ruoyi/demo/domain/vo/TestDemoVo.java | 3 + .../com/ruoyi/demo/domain/vo/TestTreeVo.java | 3 + .../service/impl/TestDemoServiceImpl.java | 6 +- .../service/impl/TestTreeServiceImpl.java | 6 +- .../src/main/resources/vm/java/bo.java.vm | 2 + .../resources/vm/java/serviceImpl.java.vm | 6 +- .../src/main/resources/vm/java/vo.java.vm | 2 + .../monitor/SysUserOnlineController.java | 4 +- .../system/SysProfileController.java | 4 +- .../controller/system/SysRoleController.java | 4 +- .../controller/system/SysUserController.java | 16 +--- .../ruoyi/system/domain/bo/SysConfigBo.java | 3 + .../com/ruoyi/system/domain/bo/SysDeptBo.java | 3 + .../ruoyi/system/domain/bo/SysDictDataBo.java | 3 + .../ruoyi/system/domain/bo/SysDictTypeBo.java | 3 + .../system/domain/bo/SysLogininforBo.java | 3 + .../com/ruoyi/system/domain/bo/SysMenuBo.java | 3 + .../ruoyi/system/domain/bo/SysNoticeBo.java | 3 + .../ruoyi/system/domain/bo/SysOperLogBo.java | 8 ++ .../com/ruoyi/system/domain/bo/SysOssBo.java | 4 +- .../system/domain/bo/SysOssConfigBo.java | 4 +- .../com/ruoyi/system/domain/bo/SysPostBo.java | 4 +- .../com/ruoyi/system/domain/bo/SysRoleBo.java | 3 + .../ruoyi/system/domain/bo/SysTenantBo.java | 3 + .../system/domain/bo/SysTenantPackageBo.java | 5 + .../com/ruoyi/system/domain/bo/SysUserBo.java | 3 + .../ruoyi/system/domain/vo/SysConfigVo.java | 3 + .../com/ruoyi/system/domain/vo/SysDeptVo.java | 3 + .../ruoyi/system/domain/vo/SysDictDataVo.java | 3 + .../ruoyi/system/domain/vo/SysDictTypeVo.java | 3 + .../system/domain/vo/SysLogininforVo.java | 3 + .../com/ruoyi/system/domain/vo/SysMenuVo.java | 3 + .../ruoyi/system/domain/vo/SysNoticeVo.java | 3 + .../ruoyi/system/domain/vo/SysOperLogVo.java | 3 + .../system/domain/vo/SysOssConfigVo.java | 3 + .../com/ruoyi/system/domain/vo/SysOssVo.java | 3 + .../com/ruoyi/system/domain/vo/SysPostVo.java | 3 + .../com/ruoyi/system/domain/vo/SysRoleVo.java | 8 ++ .../system/domain/vo/SysTenantPackageVo.java | 3 + .../ruoyi/system/domain/vo/SysTenantVo.java | 3 + .../system/domain/vo/SysUserExportVo.java | 5 + .../com/ruoyi/system/domain/vo/SysUserVo.java | 3 + .../listener/SysUserImportListener.java | 6 +- .../ruoyi/system/service/ISysDeptService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 6 +- .../service/impl/SysDeptServiceImpl.java | 11 +-- .../service/impl/SysDictDataServiceImpl.java | 6 +- .../service/impl/SysDictTypeServiceImpl.java | 6 +- .../impl/SysLogininforServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 9 +- .../service/impl/SysNoticeServiceImpl.java | 6 +- .../service/impl/SysOperLogServiceImpl.java | 6 +- .../service/impl/SysOssConfigServiceImpl.java | 8 +- .../service/impl/SysOssServiceImpl.java | 4 +- .../service/impl/SysPostServiceImpl.java | 6 +- .../service/impl/SysRoleServiceImpl.java | 10 +- .../impl/SysTenantPackageServiceImpl.java | 8 +- .../service/impl/SysTenantServiceImpl.java | 8 +- .../service/impl/SysUserServiceImpl.java | 14 +-- 69 files changed, 333 insertions(+), 106 deletions(-) create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MapstructUtils.java diff --git a/pom.xml b/pom.xml index 3fd70c6e6..b22fd6abf 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,8 @@ 3.6.1 2.14.2 2.3.1 + 1.1.6 + 0.2.0 1.18.24 1.72 @@ -294,6 +296,12 @@ ${bouncycastle.version} + + io.github.linpeilie + mapstruct-plus-spring-boot-starter + ${mapstruct-plus.version} + + com.ruoyi ruoyi-system @@ -355,6 +363,16 @@ spring-boot-configuration-processor ${spring-boot.version} + + io.github.linpeilie + mapstruct-plus-processor + ${mapstruct-plus.version} + + + org.projectlombok + lombok-mapstruct-binding + ${mapstruct-plus.lombok.version} + -parameters diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java index cfc993dc2..47e8aa36a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java @@ -1,12 +1,12 @@ package com.ruoyi.web.controller; import cn.dev33.satoken.annotation.SaIgnore; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.LoginBody; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.core.domain.model.SmsLoginBody; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.common.tenant.helper.TenantHelper; @@ -119,7 +119,7 @@ public class SysLoginController { @GetMapping("/tenant/list") public R> tenantList(HttpServletRequest request) throws Exception { List tenantList = tenantService.queryList(new SysTenantBo()); - List voList = BeanUtil.copyToList(tenantList, TenantListVo.class); + List voList = MapstructUtils.convert(tenantList, TenantListVo.class); // 获取域名 String host = new URL(request.getRequestURL().toString()).getHost(); // 根据域名进行筛选 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java index 9f8016bd8..e3da6c7ff 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/domain/vo/TenantListVo.java @@ -1,5 +1,7 @@ package com.ruoyi.web.domain.vo; +import com.ruoyi.system.domain.vo.SysTenantVo; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; /** @@ -8,6 +10,7 @@ import lombok.Data; * @author Lion Li */ @Data +@AutoMapper(target = SysTenantVo.class) public class TenantListVo { private String tenantId; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java index c8357cc5d..fde2634b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/service/SysLoginService.java @@ -3,7 +3,6 @@ package com.ruoyi.web.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.core.constant.Constants; @@ -267,7 +266,7 @@ public class SysLoginService { loginUser.setMenuPermission(permissionService.getMenuPermission(user.getUserId())); loginUser.setRolePermission(permissionService.getRolePermission(user.getUserId())); loginUser.setDeptName(ObjectUtil.isNull(user.getDept()) ? "" : user.getDept().getDeptName()); - List roles = BeanUtil.copyToList(user.getRoles(), RoleDTO.class); + List roles = MapstructUtils.convert(user.getRoles(), RoleDTO.class); loginUser.setRoles(roles); return loginUser; } diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index da53e1356..5bcc7d968 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -85,6 +85,11 @@ runtime + + io.github.linpeilie + mapstruct-plus-spring-boot-starter + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MapstructUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MapstructUtils.java new file mode 100644 index 000000000..559a01999 --- /dev/null +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MapstructUtils.java @@ -0,0 +1,92 @@ +package com.ruoyi.common.core.utils; + +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.ObjectUtil; +import io.github.linpeilie.Converter; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * Mapstruct 工具类 + *

参考文档：mapstruct-plus

+ * + * @author Michelle.Chung + */ +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class MapstructUtils { + + private final static Converter CONVERTER = SpringUtils.getBean(Converter.class); + + /** + * 将 T 类型对象，转换为 desc 类型的对象并返回 + * + * @param source 数据来源实体 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static V convert(T source, Class desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + return CONVERTER.convert(source, desc); + } + + /** + * 将 T 类型对象，按照配置的映射字段规则，给 desc 类型的对象赋值并返回 desc 对象 + * + * @param source 数据来源实体 + * @param desc 转换后的对象 + * @return desc + */ + public static V convert(T source, V desc) { + if (ObjectUtil.isNull(source)) { + return null; + } + if (ObjectUtil.isNull(desc)) { + return null; + } + return CONVERTER.convert(source, desc); + } + + /** + * 将 T 类型的集合，转换为 desc 类型的集合并返回 + * + * @param sourceList 数据来源实体列表 + * @param desc 描述对象 转换后的对象 + * @return desc + */ + public static List convert(List sourceList, Class desc) { + if (ObjectUtil.isNull(sourceList)) { + return null; + } + if (CollUtil.isEmpty(sourceList)) { + return CollUtil.newArrayList(); + } + return StreamUtils.toList(sourceList, source -> CONVERTER.convert(source, desc)); + } + + /** + * 将 Map 转换为 beanClass 类型的集合并返回 + * + * @param map 数据来源 + * @param beanClass bean类 + * @return bean对象 + */ + public static T convert(Map map, Class beanClass) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(beanClass)) { + return null; + } + return CONVERTER.convert(map, beanClass); + } + +} diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java index 68a3509a8..987366d04 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/mapper/BaseMapperPlus.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.ruoyi.common.core.utils.BeanCopyUtils; +import com.ruoyi.common.core.utils.MapstructUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; @@ -112,7 +112,7 @@ public interface BaseMapperPlus extends BaseMapper { if (ObjectUtil.isNull(obj)) { return null; } - return BeanCopyUtils.copy(obj, voClass); + return MapstructUtils.convert(obj, voClass); } default List selectVoBatchIds(Collection idList) { @@ -127,7 +127,7 @@ public interface BaseMapperPlus extends BaseMapper { if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } - return BeanCopyUtils.copyList(list, voClass); + return MapstructUtils.convert(list, voClass); } default List selectVoByMap(Map map) { @@ -142,7 +142,7 @@ public interface BaseMapperPlus extends BaseMapper { if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } - return BeanCopyUtils.copyList(list, voClass); + return MapstructUtils.convert(list, voClass); } default V selectVoOne(Wrapper wrapper) { @@ -157,7 +157,7 @@ public interface BaseMapperPlus extends BaseMapper { if (ObjectUtil.isNull(obj)) { return null; } - return BeanCopyUtils.copy(obj, voClass); + return MapstructUtils.convert(obj, voClass); } default List selectVoList() { @@ -176,7 +176,7 @@ public interface BaseMapperPlus extends BaseMapper { if (CollUtil.isEmpty(list)) { return CollUtil.newArrayList(); } - return BeanCopyUtils.copyList(list, voClass); + return MapstructUtils.convert(list, voClass); } default

> P selectVoPage(IPage page, Wrapper wrapper) { @@ -192,7 +192,7 @@ public interface BaseMapperPlus extends BaseMapper { if (CollUtil.isEmpty(pageData.getRecords())) { return (P) voPage; } - voPage.setRecords(BeanCopyUtils.copyList(pageData.getRecords(), voClass)); + voPage.setRecords(MapstructUtils.convert(pageData.getRecords(), voClass)); return (P) voPage; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java index 3747b61b3..64f2b96e4 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.ValidatorUtils; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; @@ -29,8 +29,8 @@ import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; -import java.util.Arrays; -import java.util.List; + +import java.util.*; import java.util.concurrent.TimeUnit; /** @@ -76,7 +76,7 @@ public class TestDemoController extends BaseController { public R importData(@RequestPart("file") MultipartFile file) throws Exception { ExcelResult excelResult = ExcelUtil.importExcel(file.getInputStream(), TestDemoImportVo.class, true); List volist = excelResult.getList(); - List list = BeanUtil.copyToList(volist, TestDemo.class); + List list = MapstructUtils.convert(volist, TestDemo.class); testDemoService.saveBatch(list); return R.ok(excelResult.getAnalysis()); } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java index efbe55c51..e7491938f 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java @@ -3,6 +3,8 @@ package com.ruoyi.demo.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.demo.domain.TestDemo; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +20,7 @@ import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestDemo.class) public class TestDemoBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java index 8251b5b64..c4741390a 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java @@ -3,6 +3,8 @@ package com.ruoyi.demo.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.demo.domain.TestTree; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -17,6 +19,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = TestTree.class) public class TestTreeBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java index 3a410dd47..32181c0d2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.translation.annotation.Translation; import com.ruoyi.common.translation.constant.TransConstant; +import com.ruoyi.demo.domain.TestDemo; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -19,6 +21,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = TestDemo.class) public class TestDemoVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java index abaecea04..dc1058049 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java @@ -2,6 +2,8 @@ package com.ruoyi.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.demo.domain.TestTree; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -17,6 +19,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = TestTree.class) public class TestTreeVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java index 32ed91c9d..f51fcad5e 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java @@ -1,9 +1,9 @@ package com.ruoyi.demo.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -70,7 +70,7 @@ public class TestDemoServiceImpl implements ITestDemoService { @Override public Boolean insertByBo(TestDemoBo bo) { - TestDemo add = BeanUtil.toBean(bo, TestDemo.class); + TestDemo add = MapstructUtils.convert(bo, TestDemo.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -81,7 +81,7 @@ public class TestDemoServiceImpl implements ITestDemoService { @Override public Boolean updateByBo(TestDemoBo bo) { - TestDemo update = BeanUtil.toBean(bo, TestDemo.class); + TestDemo update = MapstructUtils.convert(bo, TestDemo.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java index 801a0ea4a..a46e12641 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.demo.domain.TestTree; import com.ruoyi.demo.domain.bo.TestTreeBo; @@ -52,7 +52,7 @@ public class TestTreeServiceImpl implements ITestTreeService { @Override public Boolean insertByBo(TestTreeBo bo) { - TestTree add = BeanUtil.toBean(bo, TestTree.class); + TestTree add = MapstructUtils.convert(bo, TestTree.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { @@ -63,7 +63,7 @@ public class TestTreeServiceImpl implements ITestTreeService { @Override public Boolean updateByBo(TestTreeBo bo) { - TestTree update = BeanUtil.toBean(bo, TestTree.class); + TestTree update = MapstructUtils.convert(bo, TestTree.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm index e23520297..086776988 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm @@ -5,6 +5,7 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.*; #foreach ($import in $importList) import ${import}; @@ -20,6 +21,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = ${ClassName}.class, reverseConvertGenerate = false) public class ${ClassName}Bo extends BaseEntity { #foreach ($column in $columns) diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index f568ff8ae..9702aa1b8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,6 +1,6 @@ package ${packageName}.service.impl; -import cn.hutool.core.bean.BeanUtil; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; #if($table.crud || $table.sub) import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -94,7 +94,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public Boolean insertByBo(${ClassName}Bo bo) { - ${ClassName} add = BeanUtil.toBean(bo, ${ClassName}.class); + ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)}) @@ -109,7 +109,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { */ @Override public Boolean updateByBo(${ClassName}Bo bo) { - ${ClassName} update = BeanUtil.toBean(bo, ${ClassName}.class); + ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}.class); validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; } diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm index 327c46c0e..53dcf541b 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm @@ -8,6 +8,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; import lombok.Data; +import io.github.linpeilie.annotations.AutoMapper; import java.io.Serial; import java.io.Serializable; @@ -23,6 +24,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = ${ClassName}.class) public class ${ClassName}Vo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java index 9daa394d7..cfff2592c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java @@ -3,11 +3,11 @@ package com.ruoyi.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; -import cn.hutool.core.bean.BeanUtil; import com.ruoyi.common.core.constant.CacheConstants; import com.ruoyi.common.core.constant.GlobalConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.dto.UserOnlineDTO; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.log.annotation.Log; @@ -69,7 +69,7 @@ public class SysUserOnlineController extends BaseController { } Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); - List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); + List userOnlineList = MapstructUtils.convert(userOnlineDTOList, SysUserOnline.class); return TableDataInfo.build(userOnlineList); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java index 7a2d5bb69..3f34a237c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java @@ -1,10 +1,10 @@ package com.ruoyi.system.controller.system; import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.file.MimeTypeUtils; import com.ruoyi.common.log.annotation.Log; @@ -60,7 +60,7 @@ public class SysProfileController extends BaseController { @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping public R updateProfile(@RequestBody SysUserProfileBo profile) { - SysUserBo user = BeanUtil.copyProperties(profile, SysUserBo.class); + SysUserBo user = MapstructUtils.convert(profile, SysUserBo.class); if (StringUtils.isNotEmpty(user.getPhonenumber()) && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java index 91fbdeb81..1d90bb02a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java @@ -15,8 +15,8 @@ import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.common.web.core.BaseController; -import com.ruoyi.system.domain.SysDept; import com.ruoyi.system.domain.SysUserRole; +import com.ruoyi.system.domain.bo.SysDeptBo; import com.ruoyi.system.domain.bo.SysRoleBo; import com.ruoyi.system.domain.bo.SysUserBo; import com.ruoyi.system.domain.vo.DeptTreeSelectVo; @@ -247,7 +247,7 @@ public class SysRoleController extends BaseController { public R roleDeptTreeselect(@PathVariable("roleId") Long roleId) { DeptTreeSelectVo selectVo = new DeptTreeSelectVo(); selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId)); - selectVo.setDepts(deptService.selectDeptTreeList(new SysDept())); + selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo())); return R.ok(selectVo); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java index 1bec7a568..470bd7cdc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java @@ -2,13 +2,13 @@ package com.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.core.constant.TenantConstants; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.excel.core.ExcelResult; @@ -20,7 +20,7 @@ import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.tenant.helper.TenantHelper; import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.common.web.core.BaseController; -import com.ruoyi.system.domain.SysDept; +import com.ruoyi.system.domain.bo.SysDeptBo; import com.ruoyi.system.domain.bo.SysUserBo; import com.ruoyi.system.domain.vo.*; import com.ruoyi.system.listener.SysUserImportListener; @@ -69,15 +69,7 @@ public class SysUserController extends BaseController { @PostMapping("/export") public void export(SysUserBo user, HttpServletResponse response) { List list = userService.selectUserList(user); - List listVo = BeanUtil.copyToList(list, SysUserExportVo.class); - for (int i = 0; i < list.size(); i++) { - SysDeptVo dept = list.get(i).getDept(); - SysUserExportVo vo = listVo.get(i); - if (ObjectUtil.isNotEmpty(dept)) { - vo.setDeptName(dept.getDeptName()); - vo.setLeader(dept.getLeader()); - } - } + List listVo = MapstructUtils.convert(list, SysUserExportVo.class); ExcelUtil.exportExcel(listVo, "用户数据", SysUserExportVo.class, response); } @@ -248,7 +240,7 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/deptTree") - public R>> deptTree(SysDept dept) { + public R>> deptTree(SysDeptBo dept) { return R.ok(deptService.selectDeptTreeList(dept)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysConfigBo.java index b3fcc39ea..68f3b9bd2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysConfigBo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.system.domain.SysConfig; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; @@ -16,6 +18,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false) public class SysConfigBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java index 11e9b0697..3efdefd8d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysDept; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDept.class, reverseConvertGenerate = false) public class SysDeptBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictDataBo.java index 92e84d21e..5af3c51b7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictDataBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictDataBo.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysDictData; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -17,6 +19,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false) public class SysDictDataBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictTypeBo.java index cc4538eb6..2f872345c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictTypeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDictTypeBo.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysDictType; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Pattern; @@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false) public class SysDictTypeBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysLogininforBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysLogininforBo.java index 4bbd35532..7209b17bc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysLogininforBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysLogininforBo.java @@ -1,5 +1,7 @@ package com.ruoyi.system.domain.bo; +import com.ruoyi.system.domain.SysLogininfor; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.util.Date; @@ -13,6 +15,7 @@ import java.util.Map; */ @Data +@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false) public class SysLogininforBo { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java index 909088682..481794650 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysMenu; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false) public class SysMenuBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java index 0b8c88e86..f79e58eef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysNoticeBo.java @@ -4,6 +4,8 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysNotice; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -18,6 +20,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false) public class SysNoticeBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOperLogBo.java index 443ff2b8e..bda68dce1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOperLogBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOperLogBo.java @@ -1,6 +1,10 @@ package com.ruoyi.system.domain.bo; import com.baomidou.mybatisplus.annotation.TableField; +import com.ruoyi.common.log.event.OperLogEvent; +import com.ruoyi.system.domain.SysOperLog; +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; import java.util.Date; @@ -15,6 +19,10 @@ import java.util.Map; */ @Data +@AutoMappers({ + @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false), + @AutoMapper(target = OperLogEvent.class) +}) public class SysOperLogBo { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java index c6e058183..85e7c62af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java @@ -1,7 +1,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.mybatis.core.domain.BaseEntity; -import com.ruoyi.common.tenant.core.TenantEntity; +import com.ruoyi.system.domain.SysOss; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,6 +13,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysOss.class, reverseConvertGenerate = false) public class SysOssBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index c089d9bb1..6174b5fd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -3,7 +3,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; -import com.ruoyi.common.tenant.core.TenantEntity; +import com.ruoyi.system.domain.SysOssConfig; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -20,6 +21,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false) public class SysOssConfigBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java index 228153984..c1fb2ebc0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysPostBo.java @@ -3,7 +3,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; -import com.ruoyi.common.tenant.core.TenantEntity; +import com.ruoyi.system.domain.SysPost; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -18,6 +19,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysPost.class, reverseConvertGenerate = false) public class SysPostBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java index c9af4eddd..713941e4a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysRoleBo.java @@ -4,6 +4,8 @@ import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.mybatis.core.domain.BaseEntity; +import com.ruoyi.system.domain.SysRole; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -20,6 +22,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysRole.class, reverseConvertGenerate = false) public class SysRoleBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java index b9e97af1d..8ccaf4585 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantBo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.system.domain.SysTenant; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; @@ -18,6 +20,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false) public class SysTenantBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java index b6a598962..c91a7c6f5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysTenantPackageBo.java @@ -2,6 +2,9 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import com.ruoyi.system.domain.SysTenantPackage; +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import lombok.EqualsAndHashCode; import jakarta.validation.constraints.*; @@ -16,6 +19,7 @@ import com.ruoyi.common.mybatis.core.domain.BaseEntity; @Data @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysTenantPackage.class, reverseConvertGenerate = false) public class SysTenantPackageBo extends BaseEntity { /** @@ -33,6 +37,7 @@ public class SysTenantPackageBo extends BaseEntity { /** * 关联菜单id */ + @AutoMapping(target = "menuIds", expression = "java(com.ruoyi.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") private Long[] menuIds; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java index b3a92b53c..94572faeb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysUserBo.java @@ -5,6 +5,8 @@ import com.ruoyi.common.core.xss.Xss; import com.ruoyi.common.mybatis.core.domain.BaseEntity; import com.ruoyi.common.sensitive.annotation.Sensitive; import com.ruoyi.common.sensitive.core.SensitiveStrategy; +import com.ruoyi.system.domain.SysUser; +import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -23,6 +25,7 @@ import java.util.Date; @Data @NoArgsConstructor @EqualsAndHashCode(callSuper = true) +@AutoMapper(target = SysUser.class, reverseConvertGenerate = false) public class SysUserBo extends BaseEntity { /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysConfigVo.java index 9097d1212..0edaa84af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysConfigVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysConfig; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -18,6 +20,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysConfig.class) public class SysConfigVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDeptVo.java index 8444444f7..71027e95f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDeptVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDeptVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysDept; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -17,6 +19,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysDept.class) public class SysDeptVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictDataVo.java index 5d20627cb..3273076ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictDataVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictDataVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysDictData; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -18,6 +20,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysDictData.class) public class SysDictDataVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictTypeVo.java index 2ea75ead8..fce48d9eb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictTypeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysDictTypeVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysDictType; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -18,6 +20,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysDictType.class) public class SysDictTypeVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysLogininforVo.java index edd3fccf3..a0fd89f68 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysLogininforVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysLogininforVo.java @@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysLogininfor; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -20,6 +22,7 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysLogininfor.class) public class SysLogininforVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysMenuVo.java index 53eb0afef..0131c5014 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysMenuVo.java @@ -1,5 +1,7 @@ package com.ruoyi.system.domain.vo; +import com.ruoyi.system.domain.SysMenu; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -15,6 +17,7 @@ import java.util.List; * @author Michelle.Chung */ @Data +@AutoMapper(target = SysMenu.class) public class SysMenuVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java index 7ebfaed2f..57a20d07b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysNoticeVo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.translation.annotation.Translation; import com.ruoyi.common.translation.constant.TransConstant; +import com.ruoyi.system.domain.SysNotice; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -16,6 +18,7 @@ import java.util.Date; * @author Michelle.Chung */ @Data +@AutoMapper(target = SysNotice.class) public class SysNoticeVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOperLogVo.java index 816198a3a..debd9d4a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOperLogVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOperLogVo.java @@ -6,6 +6,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysOperLog; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -20,6 +22,7 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysOperLog.class) public class SysOperLogVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java index e907dc003..11ef727e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java @@ -1,6 +1,8 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.ruoyi.system.domain.SysOssConfig; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -16,6 +18,7 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysOssConfig.class) public class SysOssConfigVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index bbbbf8787..3bf95ac0f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.translation.annotation.Translation; import com.ruoyi.common.translation.constant.TransConstant; +import com.ruoyi.system.domain.SysOss; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -14,6 +16,7 @@ import java.util.Date; * @author Lion Li */ @Data +@AutoMapper(target = SysOss.class) public class SysOssVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java index eccc8f896..2c9f5e786 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysPostVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysPost; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -19,6 +21,7 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysPost.class) public class SysPostVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java index 0bc71f245..318b7727b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysRoleVo.java @@ -3,8 +3,12 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.domain.dto.RoleDTO; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysRole; +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.AutoMappers; import lombok.Data; import java.io.Serial; @@ -18,6 +22,10 @@ import java.util.Date; */ @Data @ExcelIgnoreUnannotated +@AutoMappers({ + @AutoMapper(target = SysRole.class), + @AutoMapper(target = RoleDTO.class) +}) public class SysRoleVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java index d6888ba66..3274ae5da 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantPackageVo.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysTenantPackage; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -17,6 +19,7 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysTenantPackage.class) public class SysTenantPackageVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java index 51b573a5f..656ee1968 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysTenantVo.java @@ -5,6 +5,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import com.ruoyi.system.domain.SysTenant; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -18,6 +20,7 @@ import java.io.Serializable; */ @Data @ExcelIgnoreUnannotated +@AutoMapper(target = SysTenant.class) public class SysTenantVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java index 7758f78ba..3135cf87e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java @@ -3,6 +3,8 @@ package com.ruoyi.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.excel.annotation.ExcelDictFormat; import com.ruoyi.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import io.github.linpeilie.annotations.ReverseAutoMapping; import lombok.Data; import lombok.NoArgsConstructor; @@ -18,6 +20,7 @@ import java.util.Date; @Data @NoArgsConstructor +@AutoMapper(target = SysUserVo.class, convertGenerate = false) public class SysUserExportVo implements Serializable { @Serial @@ -82,12 +85,14 @@ public class SysUserExportVo implements Serializable { /** * 部门名称 */ + @ReverseAutoMapping(target = "deptName", source = "dept.deptName") @ExcelProperty(value = "部门名称") private String deptName; /** * 负责人 */ + @ReverseAutoMapping(target = "leader", source = "dept.leader") @ExcelProperty(value = "部门负责人") private String leader; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java index 0de88f913..932eb94da 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserVo.java @@ -2,6 +2,8 @@ package com.ruoyi.system.domain.vo; import com.ruoyi.common.translation.annotation.Translation; import com.ruoyi.common.translation.constant.TransConstant; +import com.ruoyi.system.domain.SysUser; +import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import java.io.Serial; @@ -16,6 +18,7 @@ import java.util.List; * @author Michelle.Chung */ @Data +@AutoMapper(target = SysUser.class) public class SysUserVo implements Serializable { @Serial diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java index b201e3d16..ba56880d7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java @@ -1,11 +1,11 @@ package com.ruoyi.system.listener; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.digest.BCrypt; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.ValidatorUtils; import com.ruoyi.common.excel.core.ExcelListener; @@ -55,7 +55,7 @@ public class SysUserImportListener extends AnalysisEventListener").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功"); } else if (isUpdateSupport) { Long userId = sysUser.getUserId(); - SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class); + SysUserBo user = MapstructUtils.convert(userVo, SysUserBo.class); user.setUserId(userId); ValidatorUtils.validate(user); userService.checkUserAllowed(user); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java index fc6641bc1..7c05af229 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java @@ -27,7 +27,7 @@ public interface ISysDeptService { * @param dept 部门信息 * @return 部门树信息集合 */ - List> selectDeptTreeList(SysDept dept); + List> selectDeptTreeList(SysDeptBo dept); /** * 构建前端所需要下拉树结构 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java index c70aa2291..e935ba250 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; @@ -11,6 +10,7 @@ import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.service.ConfigService; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; @@ -123,7 +123,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") @Override public String insertConfig(SysConfigBo bo) { - SysConfig config = BeanUtil.toBean(bo, SysConfig.class); + SysConfig config = MapstructUtils.convert(bo, SysConfig.class); int row = baseMapper.insert(config); if (row > 0) { return config.getConfigValue(); @@ -141,7 +141,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { @Override public String updateConfig(SysConfigBo bo) { int row = 0; - SysConfig config = BeanUtil.toBean(bo, SysConfig.class); + SysConfig config = MapstructUtils.convert(bo, SysConfig.class); if (config.getConfigId() != null) { SysConfig temp = baseMapper.selectById(config.getConfigId()); if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 7b71a6fdd..4feff892e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; @@ -12,6 +11,7 @@ import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.service.DeptService; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.TreeBuildUtils; @@ -64,12 +64,11 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { /** * 查询部门树结构信息 * - * @param dept 部门信息 + * @param bo 部门信息 * @return 部门树信息集合 */ @Override - public List> selectDeptTreeList(SysDept dept) { - SysDeptBo bo = BeanUtil.toBean(dept, SysDeptBo.class); + public List> selectDeptTreeList(SysDeptBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); List depts = baseMapper.selectList(lqw); return buildDeptTreeSelect(depts); @@ -239,7 +238,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) { throw new ServiceException("部门停用，不允许新增"); } - SysDept dept = BeanUtil.toBean(bo, SysDept.class); + SysDept dept = MapstructUtils.convert(bo, SysDept.class); dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId()); return baseMapper.insert(dept); } @@ -253,7 +252,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId") @Override public int updateDept(SysDeptBo bo) { - SysDept dept = BeanUtil.toBean(bo, SysDept.class); + SysDept dept = MapstructUtils.convert(bo, SysDept.class); SysDept newParentDept = baseMapper.selectById(dept.getParentId()); SysDept oldDept = baseMapper.selectById(dept.getDeptId()); if (ObjectUtil.isNotNull(newParentDept) && ObjectUtil.isNotNull(oldDept)) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java index eb125f26c..4197126f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.system.domain.SysDictData; import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -111,7 +111,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override public List insertDictData(SysDictDataBo bo) { - SysDictData data = BeanUtil.toBean(bo, SysDictData.class); + SysDictData data = MapstructUtils.convert(bo, SysDictData.class); int row = baseMapper.insert(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); @@ -128,7 +128,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override public List updateDictData(SysDictDataBo bo) { - SysDictData data = BeanUtil.toBean(bo, SysDictData.class); + SysDictData data = MapstructUtils.convert(bo, SysDictData.class); int row = baseMapper.updateById(data); if (row > 0) { return baseMapper.selectDictDataByType(data.getDictType()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index 8fb48f96d..fa960e1b7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.system.service.impl; import cn.dev33.satoken.context.SaHolder; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -13,6 +12,7 @@ import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.service.DictService; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -165,7 +165,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType") @Override public List insertDictType(SysDictTypeBo bo) { - SysDictType dict = BeanUtil.toBean(bo, SysDictType.class); + SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); int row = baseMapper.insert(dict); if (row > 0) { return new ArrayList<>(); @@ -183,7 +183,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService @Override @Transactional(rollbackFor = Exception.class) public List updateDictType(SysDictTypeBo bo) { - SysDictType dict = BeanUtil.toBean(bo, SysDictType.class); + SysDictType dict = MapstructUtils.convert(bo, SysDictType.class); SysDictType oldDict = baseMapper.selectById(dict.getDictId()); dictDataMapper.update(null, new LambdaUpdateWrapper() .set(SysDictData::getDictType, dict.getDictType()) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index c8306624c..470d383e6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,11 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.Constants; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.log.event.LogininforEvent; import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -116,7 +116,7 @@ public class SysLogininforServiceImpl implements ISysLogininforService { */ @Override public void insertLogininfor(SysLogininforBo bo) { - SysLogininfor logininfor = BeanUtil.toBean(bo, SysLogininfor.class); + SysLogininfor logininfor = MapstructUtils.convert(bo, SysLogininfor.class); logininfor.setLoginTime(new Date()); baseMapper.insert(logininfor); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java index 29cdcb5b6..5a438a122 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; @@ -9,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.core.constant.UserConstants; -import com.ruoyi.common.core.utils.BeanCopyUtils; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.TreeBuildUtils; @@ -83,7 +82,7 @@ public class SysMenuServiceImpl implements ISysMenuService { .orderByAsc("m.parent_id") .orderByAsc("m.order_num"); List list = baseMapper.selectMenuListByUserId(wrapper); - menuList = BeanCopyUtils.copyList(list, SysMenuVo.class); + menuList = MapstructUtils.convert(list, SysMenuVo.class); } return menuList; } @@ -287,7 +286,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public int insertMenu(SysMenuBo bo) { - SysMenu menu = BeanUtil.toBean(bo, SysMenu.class); + SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); return baseMapper.insert(menu); } @@ -299,7 +298,7 @@ public class SysMenuServiceImpl implements ISysMenuService { */ @Override public int updateMenu(SysMenuBo bo) { - SysMenu menu = BeanUtil.toBean(bo, SysMenu.class); + SysMenu menu = MapstructUtils.convert(bo, SysMenu.class); return baseMapper.updateById(menu); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java index e6cd02a23..2cb4e74b1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java @@ -1,10 +1,10 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; @@ -82,7 +82,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { */ @Override public int insertNotice(SysNoticeBo bo) { - SysNotice notice = BeanUtil.toBean(bo, SysNotice.class); + SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); return baseMapper.insert(notice); } @@ -94,7 +94,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { */ @Override public int updateNotice(SysNoticeBo bo) { - SysNotice notice = BeanUtil.toBean(bo, SysNotice.class); + SysNotice notice = MapstructUtils.convert(bo, SysNotice.class); return baseMapper.updateById(notice); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 671a35083..abbedaefe 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,9 +1,9 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.core.utils.StringUtils; @@ -43,7 +43,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { @Async @EventListener public void recordOper(OperLogEvent operLogEvent) { - SysOperLogBo operLog = BeanUtil.toBean(operLogEvent, SysOperLogBo.class); + SysOperLogBo operLog = MapstructUtils.convert(operLogEvent, SysOperLogBo.class); // 远程查询操作地点 operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp())); insertOperlog(operLog); @@ -81,7 +81,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { */ @Override public void insertOperlog(SysOperLogBo bo) { - SysOperLog operLog = BeanUtil.toBean(bo, SysOperLog.class); + SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class); operLog.setOperTime(new Date()); baseMapper.insert(operLog); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java index 61e5c8d0f..f5b50ae6e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -10,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.json.utils.JsonUtils; @@ -95,7 +95,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { @Override public Boolean insertByBo(SysOssConfigBo bo) { - SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class); + SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); validEntityBeforeSave(config); boolean flag = baseMapper.insert(config) > 0; if (flag) { @@ -106,7 +106,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { @Override public Boolean updateByBo(SysOssConfigBo bo) { - SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class); + SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class); validEntityBeforeSave(config); LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, ""); @@ -171,7 +171,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { @Override @Transactional(rollbackFor = Exception.class) public int updateOssConfigStatus(SysOssConfigBo bo) { - SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class); + SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class); int row = baseMapper.update(null, new LambdaUpdateWrapper() .set(SysOssConfig::getStatus, "1")); row += baseMapper.updateById(sysOssConfig); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index 21d7dd139..583262903 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.service.OssService; -import com.ruoyi.common.core.utils.BeanCopyUtils; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; @@ -138,7 +138,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { oss.setService(storage.getConfigKey()); baseMapper.insert(oss); SysOssVo sysOssVo = new SysOssVo(); - BeanCopyUtils.copy(oss, sysOssVo); + MapstructUtils.convert(oss, sysOssVo); return this.matchingUrl(sysOssVo); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java index 543946ce2..043aa623e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java @@ -1,12 +1,12 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.core.exception.ServiceException; @@ -177,7 +177,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public int insertPost(SysPostBo bo) { - SysPost post = BeanUtil.toBean(bo, SysPost.class); + SysPost post = MapstructUtils.convert(bo, SysPost.class); return baseMapper.insert(post); } @@ -189,7 +189,7 @@ public class SysPostServiceImpl implements ISysPostService { */ @Override public int updatePost(SysPostBo bo) { - SysPost post = BeanUtil.toBean(bo, SysPost.class); + SysPost post = MapstructUtils.convert(bo, SysPost.class); return baseMapper.updateById(post); } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 1e1a8d769..94d3cf677 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -9,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.constant.UserConstants; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; @@ -231,7 +231,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override @Transactional(rollbackFor = Exception.class) public int insertRole(SysRoleBo bo) { - SysRole role = BeanUtil.toBean(bo, SysRole.class); + SysRole role = MapstructUtils.convert(bo, SysRole.class); // 新增角色信息 baseMapper.insert(role); bo.setRoleId(role.getRoleId()); @@ -247,7 +247,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override @Transactional(rollbackFor = Exception.class) public int updateRole(SysRoleBo bo) { - SysRole role = BeanUtil.toBean(bo, SysRole.class); + SysRole role = MapstructUtils.convert(bo, SysRole.class); // 修改角色信息 baseMapper.updateById(role); // 删除角色与菜单关联 @@ -263,7 +263,7 @@ public class SysRoleServiceImpl implements ISysRoleService { */ @Override public int updateRoleStatus(SysRoleBo bo) { - SysRole role = BeanUtil.toBean(bo, SysRole.class); + SysRole role = MapstructUtils.convert(bo, SysRole.class); return baseMapper.updateById(role); } @@ -276,7 +276,7 @@ public class SysRoleServiceImpl implements ISysRoleService { @Override @Transactional(rollbackFor = Exception.class) public int authDataScope(SysRoleBo bo) { - SysRole role = BeanUtil.toBean(bo, SysRole.class); + SysRole role = MapstructUtils.convert(bo, SysRole.class); // 修改角色信息 baseMapper.updateById(role); // 删除角色与部门关联 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java index 211c22851..5ee03eaa3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantPackageServiceImpl.java @@ -1,8 +1,8 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.TableDataInfo; import com.ruoyi.common.mybatis.core.page.PageQuery; @@ -78,7 +78,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { @Override @Transactional(rollbackFor = Exception.class) public Boolean insertByBo(SysTenantPackageBo bo) { - SysTenantPackage add = BeanUtil.toBean(bo, SysTenantPackage.class); + SysTenantPackage add = MapstructUtils.convert(bo, SysTenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -99,7 +99,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { @Override @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(SysTenantPackageBo bo) { - SysTenantPackage update = BeanUtil.toBean(bo, SysTenantPackage.class); + SysTenantPackage update = MapstructUtils.convert(bo, SysTenantPackage.class); // 保存菜单id List menuIds = Arrays.asList(bo.getMenuIds()); if (CollUtil.isNotEmpty(menuIds)) { @@ -118,7 +118,7 @@ public class SysTenantPackageServiceImpl implements ISysTenantPackageService { */ @Override public int updatePackageStatus(SysTenantPackageBo bo) { - SysTenantPackage tenantPackage = BeanUtil.toBean(bo, SysTenantPackage.class); + SysTenantPackage tenantPackage = MapstructUtils.convert(bo, SysTenantPackage.class); return baseMapper.updateById(tenantPackage); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java index 254119ec5..ea2bc54fb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTenantServiceImpl.java @@ -1,7 +1,6 @@ package com.ruoyi.system.service.impl; import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; @@ -12,6 +11,7 @@ import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.TenantConstants; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; @@ -115,7 +115,7 @@ public class SysTenantServiceImpl implements ISysTenantService { public Boolean insertByBo(SysTenantBo bo) { TenantHelper.enableIgnore(); - SysTenant add = BeanUtil.toBean(bo, SysTenant.class); + SysTenant add = MapstructUtils.convert(bo, SysTenant.class); // 获取所有租户编号 List tenantIds = baseMapper.selectObjs( @@ -252,7 +252,7 @@ public class SysTenantServiceImpl implements ISysTenantService { @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override public Boolean updateByBo(SysTenantBo bo) { - SysTenant tenant = BeanUtil.toBean(bo, SysTenant.class); + SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); tenant.setTenantId(null); tenant.setPackageId(null); return baseMapper.updateById(tenant) > 0; @@ -267,7 +267,7 @@ public class SysTenantServiceImpl implements ISysTenantService { @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") @Override public int updateTenantStatus(SysTenantBo bo) { - SysTenant tenant = BeanUtil.toBean(bo, SysTenant.class); + SysTenant tenant = MapstructUtils.convert(bo, SysTenant.class); return baseMapper.updateById(tenant); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index a503a9809..a8e6418c5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.system.service.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; @@ -14,6 +13,7 @@ import com.ruoyi.common.core.constant.CacheNames; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.service.UserService; +import com.ruoyi.common.core.utils.MapstructUtils; import com.ruoyi.common.core.utils.StreamUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.mybatis.core.page.PageQuery; @@ -281,7 +281,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override @Transactional(rollbackFor = Exception.class) public int insertUser(SysUserBo user) { - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); // 新增用户信息 int rows = baseMapper.insert(sysUser); user.setUserId(sysUser.getUserId()); @@ -302,7 +302,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public boolean registerUser(SysUserBo user, String tenantId) { user.setCreateBy(user.getUserId()); user.setUpdateBy(user.getUserId()); - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); sysUser.setTenantId(tenantId); return baseMapper.insert(sysUser) > 0; } @@ -325,7 +325,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { userPostMapper.delete(new LambdaQueryWrapper().eq(SysUserPost::getUserId, userId)); // 新增用户与岗位管理 insertUserPost(user); - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); return baseMapper.updateById(sysUser); } @@ -351,7 +351,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public int updateUserStatus(SysUserBo user) { - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); return baseMapper.updateById(sysUser); } @@ -363,7 +363,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public int updateUserProfile(SysUserBo user) { - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); return baseMapper.updateById(sysUser); } @@ -390,7 +390,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { */ @Override public int resetPwd(SysUserBo user) { - SysUser sysUser = BeanUtil.copyProperties(user, SysUser.class); + SysUser sysUser = MapstructUtils.convert(user, SysUser.class); return baseMapper.updateById(sysUser); }