From ce64955d9c15702a8d7c7deecf1f5dfc3c599f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Wed, 30 Aug 2023 21:57:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sherly/manager/email/EmailManager.java | 8 ++--- .../manager/log/OperationLogManagerImpl.java | 9 ++---- .../quartz/ScheduleTaskLogManager.java | 7 ++--- .../manager/quartz/ScheduleTaskManager.java | 9 ++---- .../service/department/DepartmentService.java | 14 +++------ .../service/generic/GenericService.java | 19 +++++------- .../sherly/service/login/LoginService.java | 14 ++------- .../oswh/sherly/service/menu/MenuService.java | 16 ++++------ .../sherly/service/oss/OssConfigService.java | 30 +++++++++++-------- .../oswh/sherly/service/role/RoleService.java | 11 +++---- .../service/tenant/TenantPackageService.java | 18 ++++------- .../sherly/service/tenant/TenantService.java | 14 +++------ .../sherly/service/user/UserSelfService.java | 7 ++--- .../oswh/sherly/service/user/UserService.java | 13 ++++---- 14 files changed, 70 insertions(+), 119 deletions(-) diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/email/EmailManager.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/email/EmailManager.java index 82b26c3..57792e5 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/email/EmailManager.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/email/EmailManager.java @@ -6,9 +6,9 @@ import org.oswh.sherly.common.modules.exception.BizException; import org.oswh.sherly.controller.email.dto.EmailConfigReqDTO; import org.oswh.sherly.controller.email.dto.EmailConfigRespDTO; import org.oswh.sherly.controller.email.dto.EmailSendReqDTO; +import org.oswh.sherly.convertor.emailConfig.EmailConfigConvertor; import org.oswh.sherly.mapper.email.EmailConfigMapper; import org.oswh.sherly.model.EmailConfigDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -36,8 +36,7 @@ public class EmailManager { if (emailConfigDO == null) { return emailConfigRespDTO; } - BeanUtils.copyProperties(emailConfigDO, emailConfigRespDTO); - return emailConfigRespDTO; + return EmailConfigConvertor.INSTANCE.convertToRespDTO(emailConfigDO); } /** @@ -45,8 +44,7 @@ public class EmailManager { * @param dto */ public void saveOrUpdate(EmailConfigReqDTO dto) { - EmailConfigDO emailConfigDO = new EmailConfigDO(); - BeanUtils.copyProperties(dto, emailConfigDO); + EmailConfigDO emailConfigDO = EmailConfigConvertor.INSTANCE.convertToDO(dto); if (emailConfigDO.getId() == null) { emailConfigMapper.insert(emailConfigDO); } else { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java index af0dc5f..81b8990 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java @@ -9,12 +9,12 @@ import org.oswh.sherly.controller.log.dto.OperationLogPageRespDTO; import org.oswh.sherly.controller.log.dto.OperationLogRespDTO; import org.oswh.sherly.controller.user.dto.UserSelectReqDTO; import org.oswh.sherly.controller.user.dto.UserSelectRespDTO; +import org.oswh.sherly.convertor.log.OperationLogConvertor; import org.oswh.sherly.mapper.log.OperationLogMapper; import org.oswh.sherly.mapper.user.UserMapper; import org.oswh.sherly.model.OperationLogDO; import org.oswh.sherly.model.UserDO; import org.oswh.sherly.other.log.service.OperationLogManager; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -54,8 +54,7 @@ public class OperationLogManagerImpl implements OperationLogManager { List userIds = page.getRecords().stream().map(OperationLogDO::getCreateUserId).collect(Collectors.toList()); Map userMap = userMapper.selectBatchIds(userIds).stream().collect(Collectors.toMap(UserDO::getUserId, UserDO::getRealName)); List result = page.getRecords().stream().map(e -> { - OperationLogPageRespDTO vo = new OperationLogPageRespDTO(); - BeanUtils.copyProperties(e, vo); + OperationLogPageRespDTO vo = OperationLogConvertor.INSTANCE.convertToPageRespDTO(e); vo.setOperateUser(userMap.get(e.getCreateUserId())); return vo; }).collect(Collectors.toList()); @@ -66,9 +65,7 @@ public class OperationLogManagerImpl implements OperationLogManager { @Override public OperationLogRespDTO getOne(Long logId) { OperationLogDO log = operationLogMapper.selectById(logId); - OperationLogRespDTO vo = new OperationLogRespDTO(); - BeanUtils.copyProperties(log, vo); - return vo; + return OperationLogConvertor.INSTANCE.convertToRespDTO(log); } @Override diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskLogManager.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskLogManager.java index 66e5f3f..6514ef5 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskLogManager.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskLogManager.java @@ -4,9 +4,9 @@ import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskLogPageReqDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskLogPageRespDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskLogRespDTO; +import org.oswh.sherly.convertor.quartz.ScheduleTaskLogConvertor; import org.oswh.sherly.mapper.quartz.ScheduleTaskLogMapper; import org.oswh.sherly.model.ScheduleTaskLogDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -25,11 +25,8 @@ public class ScheduleTaskLogManager { return scheduleTaskLogMapper.listPage(dto); } - public ScheduleTaskLogRespDTO getOne(Long scheduleTaskLogId) { ScheduleTaskLogDO scheduleTaskLogDO = scheduleTaskLogMapper.selectById(scheduleTaskLogId); - ScheduleTaskLogRespDTO vo = new ScheduleTaskLogRespDTO(); - BeanUtils.copyProperties(scheduleTaskLogDO, vo); - return vo; + return ScheduleTaskLogConvertor.INSTANCE.convertToRespDTO(scheduleTaskLogDO); } } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java index a951612..ac41ac8 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java @@ -7,11 +7,11 @@ import org.oswh.sherly.controller.quartz.dto.ScheduleTaskInsertReqDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskPageReqDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskPageRespDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskUpdateReqDTO; +import org.oswh.sherly.convertor.quartz.ScheduleTaskConvertor; import org.oswh.sherly.mapper.quartz.ScheduleTaskMapper; import org.oswh.sherly.model.ScheduleTaskDO; import org.oswh.sherly.other.quartz.util.ScheduleTaskUtil; import org.quartz.Scheduler; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -47,7 +47,6 @@ public class ScheduleTaskManager { } } - /** * 定时任务分页 * @param dto @@ -62,8 +61,7 @@ public class ScheduleTaskManager { * @param dto */ public void saveOne(ScheduleTaskInsertReqDTO dto) { - ScheduleTaskDO scheduleTaskDO = new ScheduleTaskDO(); - BeanUtils.copyProperties(dto, scheduleTaskDO); + ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.INSTANCE.convertToDO(dto); scheduleTaskMapper.insert(scheduleTaskDO); ScheduleTaskUtil.createScheduleTaskJob(scheduler, scheduleTaskDO); } @@ -93,8 +91,7 @@ public class ScheduleTaskManager { */ @SneakyThrows public void updateOne(ScheduleTaskUpdateReqDTO dto) { - ScheduleTaskDO scheduleTaskDO = new ScheduleTaskDO(); - BeanUtils.copyProperties(dto, scheduleTaskDO); + ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.INSTANCE.convertToDO(dto); scheduleTaskMapper.updateById(scheduleTaskDO); scheduler.deleteJob(getJobKey(dto.getScheduleTaskId())); ScheduleTaskUtil.createScheduleTaskJob(scheduler, scheduleTaskDO); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java index 7b2c3bc..fe18e57 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java @@ -5,10 +5,10 @@ import org.oswh.sherly.common.modules.exception.BizException; import org.oswh.sherly.controller.department.dto.DepartmentInsertReqDTO; import org.oswh.sherly.controller.department.dto.DepartmentRespDTO; import org.oswh.sherly.controller.department.dto.DepartmentUpdateReqDTO; +import org.oswh.sherly.convertor.department.DepartmentConvertor; import org.oswh.sherly.mapper.department.DepartmentMapper; import org.oswh.sherly.mapper.user.UserMapper; import org.oswh.sherly.model.DepartmentDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,11 +44,7 @@ public class DepartmentService { // 对象转换成vo类型 List all = list.stream() .sorted(Comparator.comparing(DepartmentDO::getSort)) - .map(e -> { - DepartmentRespDTO vo = new DepartmentRespDTO(); - BeanUtils.copyProperties(e, vo); - return vo; - }).collect(Collectors.toList()); + .map(DepartmentConvertor.INSTANCE::convertToRespDTO).collect(Collectors.toList()); // 拼装子结点并返回 return all.stream() @@ -81,8 +77,7 @@ public class DepartmentService { throw new BizException(DEPARTMENT_REPEAT); } - DepartmentDO departmentDO = new DepartmentDO(); - BeanUtils.copyProperties(dto, departmentDO); + DepartmentDO departmentDO = DepartmentConvertor.INSTANCE.convertToDO(dto); departmentMapper.insert(departmentDO); } @@ -103,8 +98,7 @@ public class DepartmentService { throw new BizException(DEPARTMENT_REPEAT); } - DepartmentDO departmentDO = new DepartmentDO(); - BeanUtils.copyProperties(dto, departmentDO); + DepartmentDO departmentDO = DepartmentConvertor.INSTANCE.convertToDO(dto); departmentMapper.updateById(departmentDO); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/generic/GenericService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/generic/GenericService.java index 99eafba..f63d5e1 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/generic/GenericService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/generic/GenericService.java @@ -5,6 +5,9 @@ import org.oswh.sherly.controller.generic.dto.BasicInfoRespDTO; import org.oswh.sherly.controller.generic.dto.BasicMenuInfoRespDTO; import org.oswh.sherly.controller.generic.dto.BasicRoleInfoRespDTO; import org.oswh.sherly.controller.generic.dto.BasicUserInfoRespDTO; +import org.oswh.sherly.convertor.menu.MenuConvertor; +import org.oswh.sherly.convertor.role.RoleConvertor; +import org.oswh.sherly.convertor.user.UserConvertor; import org.oswh.sherly.manager.oss.OssManager; import org.oswh.sherly.mapper.menu.MenuMapper; import org.oswh.sherly.mapper.role.RoleMapper; @@ -13,7 +16,6 @@ import org.oswh.sherly.mapper.tenant.TenantMapper; import org.oswh.sherly.mapper.user.UserMapper; import org.oswh.sherly.mapper.user.UserRoleMapper; import org.oswh.sherly.model.*; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -66,8 +68,7 @@ public class GenericService { // 用户信息收集 UserDO userDO = userMapper.selectById(userId); - BasicUserInfoRespDTO userRespDTO = new BasicUserInfoRespDTO(); - BeanUtils.copyProperties(userDO, userRespDTO); + BasicUserInfoRespDTO userRespDTO = UserConvertor.INSTANCE.convertToInfoRespDTO(userDO); userRespDTO.setAvatar(ossManager.accessUrl(userRespDTO.getAvatar())); userRespDTO.setTenantCode(tenantDO.getTenantCode()); userRespDTO.setTenantName(tenantDO.getTenantName()); @@ -76,11 +77,7 @@ public class GenericService { List userRoleDOs = UserRoleMapper.listByUserId(userId); List roleIds = userRoleDOs.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList()); List roleDOs = roleMapper.selectBatchIds(roleIds); - List roleRespDTOList = roleDOs.stream().map(e -> { - BasicRoleInfoRespDTO basicRoleInfoRespDTO = new BasicRoleInfoRespDTO(); - BeanUtils.copyProperties(e, basicRoleInfoRespDTO); - return basicRoleInfoRespDTO; - }).collect(Collectors.toList()); + List roleRespDTOList = roleDOs.stream().map(RoleConvertor.INSTANCE::convertToInfoRespDTO).collect(Collectors.toList()); // 菜单信息收集 List roleMenuDOs = roleMenuMapper.listByRoleIds(roleIds); @@ -103,8 +100,7 @@ public class GenericService { // 跳转相关数据转换成树 List menuRespDTOList = jumps.stream().filter(e -> Objects.equals(e.getParentId(), ROOT_PARENT_ID)).map(e -> { - BasicMenuInfoRespDTO basicMenuInfoRespDTO = new BasicMenuInfoRespDTO(); - BeanUtils.copyProperties(e, basicMenuInfoRespDTO); + BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.INSTANCE.convertToInfoRespDTO(e); basicMenuInfoRespDTO.setChildren(getChildren(e, jumps)); return basicMenuInfoRespDTO; }).collect(Collectors.toList()); @@ -131,8 +127,7 @@ public class GenericService { return all.stream() .filter(e -> Objects.equals(e.getParentId(), parent.getMenuId())) .map(e -> { - BasicMenuInfoRespDTO basicMenuInfoRespDTO = new BasicMenuInfoRespDTO(); - BeanUtils.copyProperties(e, basicMenuInfoRespDTO); + BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.INSTANCE.convertToInfoRespDTO(e); basicMenuInfoRespDTO.setChildren(getChildren(e, all)); return basicMenuInfoRespDTO; }).collect(Collectors.toList()); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java index 2523c85..6accfbf 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java @@ -16,6 +16,7 @@ import org.oswh.sherly.common.util.JwtUtil; import org.oswh.sherly.controller.login.dto.LoginReqDTO; import org.oswh.sherly.controller.login.dto.LoginRespDTO; import org.oswh.sherly.controller.login.dto.LoginTenantRespDTO; +import org.oswh.sherly.convertor.tenant.TenantConvertor; import org.oswh.sherly.manager.log.LoginLogManager; import org.oswh.sherly.mapper.menu.MenuMapper; import org.oswh.sherly.mapper.role.RoleMenuMapper; @@ -24,7 +25,6 @@ import org.oswh.sherly.mapper.user.AccountUserMapper; import org.oswh.sherly.mapper.user.UserMapper; import org.oswh.sherly.mapper.user.UserRoleMapper; import org.oswh.sherly.model.*; -import org.springframework.beans.BeanUtils; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -188,11 +188,7 @@ public class LoginService { throw new BizException(NO_TENANT); } - return tenantDOs.stream().map(e -> { - LoginTenantRespDTO vo = new LoginTenantRespDTO(); - BeanUtils.copyProperties(e, vo); - return vo; - }).collect(Collectors.toList()); + return tenantDOs.stream().map(TenantConvertor.INSTANCE::tenantToLoginTenantRespDTO).collect(Collectors.toList()); } @@ -262,11 +258,7 @@ public class LoginService { throw new BizException(NO_TENANT); } - return tenantDOs.stream().map(e -> { - LoginTenantRespDTO vo = new LoginTenantRespDTO(); - BeanUtils.copyProperties(e, vo); - return vo; - }).collect(Collectors.toList()); + return tenantDOs.stream().map(TenantConvertor.INSTANCE::tenantToLoginTenantRespDTO).collect(Collectors.toList()); } public SecurityModel authenticate(String phone, String password) { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java index 6eb0edc..b467b76 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java @@ -4,10 +4,10 @@ import org.oswh.sherly.common.modules.exception.BizException; import org.oswh.sherly.controller.menu.dto.MenuInsertReqDTO; import org.oswh.sherly.controller.menu.dto.MenuRespDTO; import org.oswh.sherly.controller.menu.dto.MenuUpdateReqDTO; +import org.oswh.sherly.convertor.menu.MenuConvertor; import org.oswh.sherly.mapper.menu.MenuMapper; import org.oswh.sherly.mapper.role.RoleMenuMapper; import org.oswh.sherly.model.MenuDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -40,17 +40,15 @@ public class MenuService { List list = menuMapper.selectList(); // 对象转换成vo类型 - List all = list.stream().map(e -> { - MenuRespDTO menuRespDTO = new MenuRespDTO(); - BeanUtils.copyProperties(e, menuRespDTO); - return menuRespDTO; - }).sorted(Comparator.comparing(MenuRespDTO::getSort)).collect(Collectors.toList()); + List all = list.stream().map(MenuConvertor.INSTANCE::convertToRespDTO) + .sorted(Comparator.comparing(MenuRespDTO::getSort)).collect(Collectors.toList()); return all.stream().filter(e -> Objects.equals(e.getParentId(), ROOT_PARENT_ID)) .peek(e -> e.setChildren(getChildren(e, all))) .collect(Collectors.toList()); } + /** * 递归拼装子结点 * @param parent @@ -69,8 +67,7 @@ public class MenuService { * @param dto */ public void saveOne(MenuInsertReqDTO dto) { - MenuDO menuDO = new MenuDO(); - BeanUtils.copyProperties(dto, menuDO); + MenuDO menuDO = MenuConvertor.INSTANCE.convertToDO(dto); menuMapper.insert(menuDO); } @@ -96,8 +93,7 @@ public class MenuService { if (Objects.equals(dto.getParentId(), dto.getMenuId())) { throw new BizException(MENU_PARENT_SELF); } - MenuDO menuDO = new MenuDO(); - BeanUtils.copyProperties(dto, menuDO); + MenuDO menuDO = MenuConvertor.INSTANCE.convertToDO(dto); menuMapper.updateById(menuDO); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java index 333c0f8..72dbc8a 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java @@ -1,14 +1,15 @@ package org.oswh.sherly.service.oss; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONUtil; import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.common.modules.oss.client.OssClientConfig; import org.oswh.sherly.common.modules.oss.client.OssClientFactory; import org.oswh.sherly.common.modules.security.util.SecurityUtil; import org.oswh.sherly.controller.oss.dto.*; +import org.oswh.sherly.convertor.oss.OssConfigConvertor; import org.oswh.sherly.mapper.oss.OssConfigMapper; import org.oswh.sherly.model.OssConfigDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,6 +36,7 @@ public class OssConfigService { /** * 对象存储配置分页 + * * @param dto * @return */ @@ -44,6 +46,7 @@ public class OssConfigService { /** * 对象存储配置详情 + * * @param configId * @return */ @@ -53,8 +56,7 @@ public class OssConfigService { String configStr = JSONUtil.toJsonStr(config); Map map = JSONUtil.toBean(configStr, Map.class); - OssConfigRespDTO vo = new OssConfigRespDTO(); - BeanUtils.copyProperties(ossConfigDO, vo); + OssConfigRespDTO vo = OssConfigConvertor.INSTANCE.convertToRespDTO(ossConfigDO); vo.setConfig(map); return vo; @@ -62,27 +64,28 @@ public class OssConfigService { /** * 对象存储配置新增 + * * @param dto */ public void saveOne(OssConfigInsertReqDTO dto) { - OssConfigDO ossConfigDO = new OssConfigDO(); - BeanUtils.copyProperties(dto, ossConfigDO); - ossConfigDO.setUsable(DISABLE); - ossConfigDO.setConfig(parseConfig(dto.getConfig())); + OssConfigDO ossConfigDO = OssConfigConvertor.INSTANCE.convertToDO(dto); + Map map = dto.getConfig(); + OssClientConfig ossClientConfig = BeanUtil.fillBeanWithMap(map, new OssClientConfig(), false); + ossConfigDO.setConfig(ossClientConfig); ossConfigMapper.insert(ossConfigDO); } /** * 对象存储配置更新 + * * @param dto */ public void updateOne(OssConfigUpdateReqDTO dto) { - OssConfigDO ossConfigDO = new OssConfigDO(); - BeanUtils.copyProperties(dto, ossConfigDO); - ossConfigDO.setConfig(parseConfig(dto.getConfig())); + OssConfigDO ossConfigDO = OssConfigConvertor.INSTANCE.convertToDO(dto); + Map map = dto.getConfig(); + OssClientConfig ossClientConfig = BeanUtil.fillBeanWithMap(map, new OssClientConfig(), false); + ossConfigDO.setConfig(ossClientConfig); ossConfigMapper.updateById(ossConfigDO); - - // 如果是激活状态那么需要从clients容器中删除该租户的client if (ossConfigDO.getUsable() == ENABLE) { ossClientFactory.removeOssClient(SecurityUtil.getTenantCode()); } @@ -90,6 +93,7 @@ public class OssConfigService { /** * 解析map转换成object + * * @param config * @return */ @@ -100,6 +104,7 @@ public class OssConfigService { /** * 对象存储配置删除 + * * @param configId */ public void removeOne(Long configId) { @@ -113,6 +118,7 @@ public class OssConfigService { /** * 对象存储配置激活 + * * @param configId */ public void enableOne(Long configId) { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java index b10adbd..03f5e21 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java @@ -3,12 +3,12 @@ package org.oswh.sherly.service.role; import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.common.modules.exception.BizException; import org.oswh.sherly.controller.role.dto.*; +import org.oswh.sherly.convertor.role.RoleConvertor; import org.oswh.sherly.mapper.role.RoleMapper; import org.oswh.sherly.mapper.role.RoleMenuMapper; import org.oswh.sherly.mapper.user.UserRoleMapper; import org.oswh.sherly.model.RoleDO; import org.oswh.sherly.model.RoleMenuDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -57,8 +57,7 @@ public class RoleService { List menuIds = roleMenuDOs.stream().map(RoleMenuDO::getMenuId).collect(Collectors.toList()); // 组装vo - RoleRespDTO vo = new RoleRespDTO(); - BeanUtils.copyProperties(roleDO, vo); + RoleRespDTO vo = RoleConvertor.INSTANCE.convertToRespDTO(roleDO); vo.setMenuIds(menuIds); return vo; @@ -75,8 +74,7 @@ public class RoleService { throw new BizException(ROLE_REPEAT); } - RoleDO roleDO = new RoleDO(); - BeanUtils.copyProperties(dto, roleDO); + RoleDO roleDO = RoleConvertor.INSTANCE.convertToDO(dto); roleMapper.insert(roleDO); } @@ -93,8 +91,7 @@ public class RoleService { throw new BizException(ROLE_REPEAT); } - RoleDO roleDO = new RoleDO(); - BeanUtils.copyProperties(dto, roleDO); + RoleDO roleDO = RoleConvertor.INSTANCE.convertToDO(dto); roleMapper.updateById(roleDO); // 先全部删除角色菜单数据 diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java index 66ea145..66d2bb4 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java @@ -3,11 +3,11 @@ package org.oswh.sherly.service.tenant; import org.oswh.sherly.common.enums.UsableEnum; import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.controller.tenant.dto.*; +import org.oswh.sherly.convertor.tenant.TenantPackageConvertor; import org.oswh.sherly.mapper.tenant.TenantPackageMapper; import org.oswh.sherly.mapper.tenant.TenantPackageMenuMapper; import org.oswh.sherly.model.TenantPackageDO; import org.oswh.sherly.model.TenantPackageMenuDO; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,8 +45,7 @@ public class TenantPackageService { * @param dto */ public void saveOne(TenantPackageInsertReqDTO dto) { - TenantPackageDO tenantPackageDO = new TenantPackageDO(); - BeanUtils.copyProperties(dto, tenantPackageDO); + TenantPackageDO tenantPackageDO = TenantPackageConvertor.INSTANCE.convertToDO(dto); tenantPackageDO.setUsable(ENABLE); tenantPackageMapper.insert(tenantPackageDO); List tenantPackageMenuDOs = dto.getMenuIds().stream().map(e -> { @@ -73,8 +72,7 @@ public class TenantPackageService { * @param dto */ public void updateOne(TenantPackageUpdateReqDTO dto) { - TenantPackageDO tenantPackageDO = new TenantPackageDO(); - BeanUtils.copyProperties(dto, tenantPackageDO); + TenantPackageDO tenantPackageDO = TenantPackageConvertor.INSTANCE.convertToDO(dto); tenantPackageMapper.updateById(tenantPackageDO); tenantPackageMenuMapper.removeMenuById(dto.getTenantPackageId()); List tenantPackageMenuDOs = dto.getMenuIds().stream().map(e -> { @@ -93,12 +91,7 @@ public class TenantPackageService { */ public List listAll(TenantPackageSelectReqDTO dto) { List tenantPackageDOs = tenantPackageMapper.listAll(dto); - - return tenantPackageDOs.stream().map(e -> { - TenantPackageSelectRespDTO tenantPackageSelectRespDTO = new TenantPackageSelectRespDTO(); - BeanUtils.copyProperties(e, tenantPackageSelectRespDTO); - return tenantPackageSelectRespDTO; - }).collect(Collectors.toList()); + return TenantPackageConvertor.INSTANCE.convertToSelectRespDTO(tenantPackageDOs); } /** @@ -117,8 +110,7 @@ public class TenantPackageService { */ public TenantPackageRespDTO getOne(Long tenantPackageId) { TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(tenantPackageId); - TenantPackageRespDTO tenantPackageRespDTO = new TenantPackageRespDTO(); - BeanUtils.copyProperties(tenantPackageDO, tenantPackageRespDTO); + TenantPackageRespDTO tenantPackageRespDTO =TenantPackageConvertor.INSTANCE.convertToRespDTO(tenantPackageDO); List tenantPackageMenuDOs = tenantPackageMenuMapper.listByTenantPackageId(tenantPackageId); List menuIds = tenantPackageMenuDOs.stream().map(TenantPackageMenuDO::getMenuId).collect(Collectors.toList()); tenantPackageRespDTO.setMenuIds(menuIds); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java index 85e1ef8..566a2e9 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java @@ -14,6 +14,7 @@ import org.oswh.sherly.common.modules.security.util.SecurityUtil; import org.oswh.sherly.common.modules.sqlexecutor.util.ExecSqlUtil; import org.oswh.sherly.controller.tenant.dto.*; import org.oswh.sherly.controller.tenant.eo.TenantEO; +import org.oswh.sherly.convertor.tenant.TenantConvertor; import org.oswh.sherly.mapper.department.DepartmentMapper; import org.oswh.sherly.mapper.menu.MenuMapper; import org.oswh.sherly.mapper.role.RoleMapper; @@ -23,7 +24,6 @@ import org.oswh.sherly.mapper.user.AccountUserMapper; import org.oswh.sherly.mapper.user.UserMapper; import org.oswh.sherly.mapper.user.UserRoleMapper; import org.oswh.sherly.model.*; -import org.springframework.beans.BeanUtils; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,8 +96,7 @@ public class TenantService { throw new BizException(TENANT_REPEAT); } - TenantDO tenantDO = new TenantDO(); - BeanUtils.copyProperties(dto, tenantDO); + TenantDO tenantDO = TenantConvertor.INSTANCE.convertToDO(dto); tenantMapper.insert(tenantDO); // 执行sql语句创建新租户的数据库表 @@ -162,8 +161,7 @@ public class TenantService { * @param dto */ public void updateOne(TenantUpdateReqDTO dto) { - TenantDO tenantDO = new TenantDO(); - BeanUtils.copyProperties(dto, tenantDO); + TenantDO tenantDO =TenantConvertor.INSTANCE.convertToDO(dto); tenantMapper.updateById(tenantDO); } @@ -241,11 +239,7 @@ public class TenantService { public void listExport(HttpServletResponse response) { List list = tenantMapper.selectList(); - List result = list.stream().map(e -> { - TenantEO tenantEO = new TenantEO(); - BeanUtils.copyProperties(e, tenantEO); - return tenantEO; - }).collect(Collectors.toList()); + List result = list.stream().map(TenantConvertor.INSTANCE::convertToEO).collect(Collectors.toList()); response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); response.setCharacterEncoding("utf-8"); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java index 0ee3905..cd99d66 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java @@ -11,6 +11,7 @@ import org.oswh.sherly.controller.log.dto.OperationLogSelfPageReqDTO; import org.oswh.sherly.controller.user.dto.UserSelfRespDTO; import org.oswh.sherly.controller.user.dto.UserSelfUpdateReqDTO; import org.oswh.sherly.controller.user.dto.UserUpdatePasswordReqDTO; +import org.oswh.sherly.convertor.user.UserSelfConvertor; import org.oswh.sherly.manager.oss.OssManager; import org.oswh.sherly.mapper.department.DepartmentMapper; import org.oswh.sherly.mapper.log.OperationLogMapper; @@ -84,8 +85,7 @@ public class UserSelfService { Map departmentIdMapName = departmentDOList.stream().collect(Collectors.toMap(DepartmentDO::getDepartmentId, DepartmentDO::getDepartmentName)); // 组装vo - UserSelfRespDTO vo = new UserSelfRespDTO(); - BeanUtils.copyProperties(userDO, vo); + UserSelfRespDTO vo = UserSelfConvertor.INSTANCE.convertToRespDTO(userDO); vo.setAvatar(ossManager.accessUrl(vo.getAvatar())); vo.setRoleIds(roleIds); vo.setRoleNames(roleNames); @@ -126,9 +126,8 @@ public class UserSelfService { * @param dto */ public void updateSelf(UserSelfUpdateReqDTO dto) { - UserDO userDO = new UserDO(); + UserDO userDO = UserSelfConvertor.INSTANCE.convertToDO(dto); userDO.setUserId(SecurityUtil.getUserId()); - BeanUtils.copyProperties(dto, userDO); userMapper.updateById(userDO); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java index 5e25133..9a74669 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java @@ -12,6 +12,7 @@ import org.oswh.sherly.common.modules.projectconfig.util.GlobalPropertiesUtil; import org.oswh.sherly.common.modules.security.util.SecurityUtil; import org.oswh.sherly.controller.user.dto.*; import org.oswh.sherly.controller.user.eo.UserEO; +import org.oswh.sherly.convertor.user.UserConvertor; import org.oswh.sherly.mapper.department.DepartmentMapper; import org.oswh.sherly.mapper.tenant.TenantMapper; import org.oswh.sherly.mapper.user.AccountUserMapper; @@ -93,8 +94,7 @@ public class UserService { Map departmentIdMapName = departmentDOList.stream().collect(Collectors.toMap(DepartmentDO::getDepartmentId, DepartmentDO::getDepartmentName)); List result = userDOList.stream().map(e -> { - UserEO userEO = new UserEO(); - BeanUtils.copyProperties(e, userEO); + UserEO userEO = UserConvertor.INSTANCE.convertToEO(e); userEO.setUsable(e.getUsable() == ENABLE ? "启用" : "禁用"); userEO.setDepartmentName(departmentIdMapName.get(e.getDepartmentId())); userEO.setGender(e.getGender() == MALE ? "男" : "女"); @@ -126,8 +126,7 @@ public class UserService { List roleIds = userRoleDOs.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList()); // 组装vo - UserRespDTO vo = new UserRespDTO(); - BeanUtils.copyProperties(userDO, vo); + UserRespDTO vo = UserConvertor.INSTANCE.convertToRespDTO(userDO); vo.setRoleIds(roleIds); return vo; @@ -172,8 +171,7 @@ public class UserService { accountUserMapper.updateById(accountUserDO); } - UserDO userDO = new UserDO(); - BeanUtils.copyProperties(dto, userDO); + UserDO userDO = UserConvertor.INSTANCE.convertToDO(dto); userDO.setUsable(ENABLE); userDO.setAccountUserId(accountUserDO.getAccountUserId()); userDO.setLastLoginTime(new Date()); @@ -192,8 +190,7 @@ public class UserService { if (Objects.equals(dto.getUserId(), 1L)) { throw new BizException(UPDATE_USER_ERROR); } - UserDO userDO = new UserDO(); - BeanUtils.copyProperties(dto, userDO); + UserDO userDO = UserConvertor.INSTANCE.convertToDO(dto); userMapper.updateById(userDO); userRoleMapper.removeUserRoleByUserId(dto.getUserId()); -- Gitee From 0b8de9e7c2ee614adbf00a3e79d8b5fcf0ffbc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Wed, 30 Aug 2023 21:58:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/DepartmentConvertor.java | 21 ++++++++++++ .../emailConfig/EmailConfigConvertor.java | 16 ++++++++++ .../convertor/log/OperationLogConvertor.java | 32 +++++++++++++++++++ .../sherly/convertor/menu/MenuConvertor.java | 23 +++++++++++++ .../convertor/oss/OssConfigConvertor.java | 26 +++++++++++++++ .../quartz/ScheduleTaskConvertor.java | 21 ++++++++++++ .../quartz/ScheduleTaskLogConvertor.java | 18 +++++++++++ .../sherly/convertor/role/RoleConvertor.java | 28 ++++++++++++++++ .../convertor/tenant/TenantConvertor.java | 28 ++++++++++++++++ .../tenant/TenantPackageConvertor.java | 30 +++++++++++++++++ .../sherly/convertor/user/UserConvertor.java | 30 +++++++++++++++++ .../convertor/user/UserSelfConvertor.java | 26 +++++++++++++++ 12 files changed, 299 insertions(+) create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/department/DepartmentConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/emailConfig/EmailConfigConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/log/OperationLogConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskLogConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/role/RoleConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantPackageConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserConvertor.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserSelfConvertor.java diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/department/DepartmentConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/department/DepartmentConvertor.java new file mode 100644 index 0000000..4645e5a --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/department/DepartmentConvertor.java @@ -0,0 +1,21 @@ +package org.oswh.sherly.convertor.department; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.department.dto.DepartmentInsertReqDTO; +import org.oswh.sherly.controller.department.dto.DepartmentRespDTO; +import org.oswh.sherly.controller.department.dto.DepartmentUpdateReqDTO; +import org.oswh.sherly.model.DepartmentDO; + +@Mapper +public interface DepartmentConvertor { + + DepartmentConvertor INSTANCE = Mappers.getMapper(DepartmentConvertor.class); + + DepartmentRespDTO convertToRespDTO(DepartmentDO departmentDO); + + DepartmentDO convertToDO(DepartmentInsertReqDTO reqDTO); + + DepartmentDO convertToDO(DepartmentUpdateReqDTO reqDTO); + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/emailConfig/EmailConfigConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/emailConfig/EmailConfigConvertor.java new file mode 100644 index 0000000..d2d37ba --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/emailConfig/EmailConfigConvertor.java @@ -0,0 +1,16 @@ +package org.oswh.sherly.convertor.emailConfig; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.email.dto.EmailConfigReqDTO; +import org.oswh.sherly.controller.email.dto.EmailConfigRespDTO; +import org.oswh.sherly.model.EmailConfigDO; + +@Mapper +public interface EmailConfigConvertor { + EmailConfigConvertor INSTANCE = Mappers.getMapper(EmailConfigConvertor.class); + + EmailConfigRespDTO convertToRespDTO(EmailConfigDO emailConfigDO); + + EmailConfigDO convertToDO(EmailConfigReqDTO reqDTO); +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/log/OperationLogConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/log/OperationLogConvertor.java new file mode 100644 index 0000000..f89ef66 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/log/OperationLogConvertor.java @@ -0,0 +1,32 @@ +package org.oswh.sherly.convertor.log; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.common.enums.LogTypeEnum; +import org.oswh.sherly.controller.log.dto.OperationLogPageRespDTO; +import org.oswh.sherly.controller.log.dto.OperationLogRespDTO; +import org.oswh.sherly.model.OperationLogDO; + +@Mapper +public interface OperationLogConvertor { + + OperationLogConvertor INSTANCE = Mappers.getMapper(OperationLogConvertor.class); + + OperationLogPageRespDTO convertToPageRespDTO(OperationLogDO operationLogDO); + + @Mapping(source = "type", target = "type") + OperationLogRespDTO convertToRespDTO(OperationLogDO operationLogDO); + + default Integer typeConvertor (LogTypeEnum logTypeEnum){ + int integer; + switch (logTypeEnum) { + case NORMAL: integer = 0; + break; + case EXCEPTION: integer = 1; + break; + default: integer = 0; + } + return integer; + } +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java new file mode 100644 index 0000000..2c3dfa8 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java @@ -0,0 +1,23 @@ +package org.oswh.sherly.convertor.menu; + +import org.apache.ibatis.annotations.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.generic.dto.BasicMenuInfoRespDTO; +import org.oswh.sherly.controller.menu.dto.MenuInsertReqDTO; +import org.oswh.sherly.controller.menu.dto.MenuRespDTO; +import org.oswh.sherly.controller.menu.dto.MenuUpdateReqDTO; +import org.oswh.sherly.model.MenuDO; + +@Mapper +public interface MenuConvertor { + + MenuConvertor INSTANCE = Mappers.getMapper(MenuConvertor.class); + + MenuRespDTO convertToRespDTO(MenuDO menuDO); + + MenuDO convertToDO(MenuInsertReqDTO reqDTO); + + MenuDO convertToDO (MenuUpdateReqDTO reqDTO); + + BasicMenuInfoRespDTO convertToInfoRespDTO(MenuDO menuDO); +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java new file mode 100644 index 0000000..be27d1a --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java @@ -0,0 +1,26 @@ +package org.oswh.sherly.convertor.oss; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.oss.dto.OssConfigInsertReqDTO; +import org.oswh.sherly.controller.oss.dto.OssConfigRespDTO; +import org.oswh.sherly.controller.oss.dto.OssConfigUpdateReqDTO; +import org.oswh.sherly.model.OssConfigDO; + +@Mapper +public interface OssConfigConvertor { + + OssConfigConvertor INSTANCE = Mappers.getMapper(OssConfigConvertor.class); + + @Mapping(target = "config", ignore = true) + OssConfigRespDTO convertToRespDTO(OssConfigDO ossConfigDO); + + + @Mapping(target = "config", ignore = true) + OssConfigDO convertToDO(OssConfigInsertReqDTO reqDTO); + + @Mapping(target = "config", ignore = true) + OssConfigDO convertToDO(OssConfigUpdateReqDTO reqDTO); + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskConvertor.java new file mode 100644 index 0000000..3197d19 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskConvertor.java @@ -0,0 +1,21 @@ +package org.oswh.sherly.convertor.quartz; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.quartz.dto.ScheduleTaskInsertReqDTO; +import org.oswh.sherly.controller.quartz.dto.ScheduleTaskUpdateReqDTO; +import org.oswh.sherly.model.ScheduleTaskDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface ScheduleTaskConvertor { + + ScheduleTaskConvertor INSTANCE = Mappers.getMapper(ScheduleTaskConvertor.class); + + ScheduleTaskDO convertToDO (ScheduleTaskInsertReqDTO reqDTO); + + ScheduleTaskDO convertToDO (ScheduleTaskUpdateReqDTO reqDTO); +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskLogConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskLogConvertor.java new file mode 100644 index 0000000..0b1a4e1 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/quartz/ScheduleTaskLogConvertor.java @@ -0,0 +1,18 @@ +package org.oswh.sherly.convertor.quartz; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.quartz.dto.ScheduleTaskLogRespDTO; +import org.oswh.sherly.model.ScheduleTaskLogDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface ScheduleTaskLogConvertor { + + ScheduleTaskLogConvertor INSTANCE = Mappers.getMapper(ScheduleTaskLogConvertor.class); + + ScheduleTaskLogRespDTO convertToRespDTO (ScheduleTaskLogDO scheduleTaskLogDO); +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/role/RoleConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/role/RoleConvertor.java new file mode 100644 index 0000000..eb88064 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/role/RoleConvertor.java @@ -0,0 +1,28 @@ +package org.oswh.sherly.convertor.role; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.generic.dto.BasicRoleInfoRespDTO; +import org.oswh.sherly.controller.role.dto.RoleInsertReqDTO; +import org.oswh.sherly.controller.role.dto.RoleRespDTO; +import org.oswh.sherly.controller.role.dto.RoleUpdateReqDTO; +import org.oswh.sherly.model.RoleDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface RoleConvertor { + + RoleConvertor INSTANCE = Mappers.getMapper(RoleConvertor.class); + + RoleRespDTO convertToRespDTO (RoleDO roleDO); + + RoleDO convertToDO (RoleInsertReqDTO reqDTO); + + RoleDO convertToDO (RoleUpdateReqDTO reqDTO); + + BasicRoleInfoRespDTO convertToInfoRespDTO(RoleDO roleDO); + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantConvertor.java new file mode 100644 index 0000000..5db5c42 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantConvertor.java @@ -0,0 +1,28 @@ +package org.oswh.sherly.convertor.tenant; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.login.dto.LoginTenantRespDTO; +import org.oswh.sherly.controller.tenant.dto.TenantInsertReqDTO; +import org.oswh.sherly.controller.tenant.dto.TenantUpdateReqDTO; +import org.oswh.sherly.controller.tenant.eo.TenantEO; +import org.oswh.sherly.model.TenantDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface TenantConvertor { + + TenantConvertor INSTANCE = Mappers.getMapper(TenantConvertor.class); + + TenantDO convertToDO (TenantInsertReqDTO reqDTO); + + TenantDO convertToDO (TenantUpdateReqDTO reqDTO); + + TenantEO convertToEO (TenantDO tenantDO); + + LoginTenantRespDTO tenantToLoginTenantRespDTO(TenantDO tenantDO); + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantPackageConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantPackageConvertor.java new file mode 100644 index 0000000..4f57ff5 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/tenant/TenantPackageConvertor.java @@ -0,0 +1,30 @@ +package org.oswh.sherly.convertor.tenant; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.tenant.dto.TenantPackageInsertReqDTO; +import org.oswh.sherly.controller.tenant.dto.TenantPackageRespDTO; +import org.oswh.sherly.controller.tenant.dto.TenantPackageSelectRespDTO; +import org.oswh.sherly.controller.tenant.dto.TenantPackageUpdateReqDTO; +import org.oswh.sherly.model.TenantPackageDO; + +import java.util.List; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface TenantPackageConvertor { + + TenantPackageConvertor INSTANCE = Mappers.getMapper(TenantPackageConvertor.class); + + TenantPackageDO convertToDO (TenantPackageInsertReqDTO reqDTO); + + TenantPackageDO convertToDO (TenantPackageUpdateReqDTO reqDTO); + + List convertToSelectRespDTO (List list); + + TenantPackageRespDTO convertToRespDTO (TenantPackageDO tenantPackageDO); + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserConvertor.java new file mode 100644 index 0000000..0f58e9d --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserConvertor.java @@ -0,0 +1,30 @@ +package org.oswh.sherly.convertor.user; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.generic.dto.BasicUserInfoRespDTO; +import org.oswh.sherly.controller.user.dto.UserInsertReqDTO; +import org.oswh.sherly.controller.user.dto.UserRespDTO; +import org.oswh.sherly.controller.user.dto.UserUpdateReqDTO; +import org.oswh.sherly.controller.user.eo.UserEO; +import org.oswh.sherly.model.UserDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface UserConvertor { + + UserConvertor INSTANCE = Mappers.getMapper(UserConvertor.class); + + UserRespDTO convertToRespDTO (UserDO userDO); + + UserEO convertToEO (UserDO userDO); + + UserDO convertToDO (UserInsertReqDTO reqDTO); + + UserDO convertToDO (UserUpdateReqDTO reqDTO); + + BasicUserInfoRespDTO convertToInfoRespDTO(UserDO userDO); +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserSelfConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserSelfConvertor.java new file mode 100644 index 0000000..e2cc73d --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/user/UserSelfConvertor.java @@ -0,0 +1,26 @@ +package org.oswh.sherly.convertor.user; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.user.dto.UserSelfRespDTO; +import org.oswh.sherly.controller.user.dto.UserSelfUpdateReqDTO; +import org.oswh.sherly.controller.user.dto.UserUpdateReqDTO; +import org.oswh.sherly.model.UserDO; + +/** + * @author 孙泽文 + * @date 2023/8/25 + */ +@Mapper +public interface UserSelfConvertor { + + UserSelfConvertor INSTANCE = Mappers.getMapper(UserSelfConvertor.class); + + UserSelfRespDTO convertToRespDTO (UserDO userDO); + + UserDO convertToDO (UserSelfUpdateReqDTO reqDTO); + + UserDO convertToDO (UserUpdateReqDTO reqDTO); + + +} -- Gitee From f896e5a9a42b92e92e309faed13dcfd48e0d3441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Wed, 30 Aug 2023 22:04:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=A5=E8=B0=A8=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java | 1 - .../main/java/org/oswh/sherly/service/oss/OssConfigService.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java index be27d1a..898392a 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/oss/OssConfigConvertor.java @@ -16,7 +16,6 @@ public interface OssConfigConvertor { @Mapping(target = "config", ignore = true) OssConfigRespDTO convertToRespDTO(OssConfigDO ossConfigDO); - @Mapping(target = "config", ignore = true) OssConfigDO convertToDO(OssConfigInsertReqDTO reqDTO); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java index 72dbc8a..9036ab4 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java @@ -55,10 +55,8 @@ public class OssConfigService { OssClientConfig config = ossConfigDO.getConfig(); String configStr = JSONUtil.toJsonStr(config); Map map = JSONUtil.toBean(configStr, Map.class); - OssConfigRespDTO vo = OssConfigConvertor.INSTANCE.convertToRespDTO(ossConfigDO); vo.setConfig(map); - return vo; } -- Gitee