diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogRespDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogRespDTO.java index 70b54b6878434960823473bc1254f955ac5f7d31..6b02daaee1bc8c4cc7e89cc0204bab845f5aef44 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogRespDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogRespDTO.java @@ -2,6 +2,7 @@ package org.oswh.sherly.controller.log.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.oswh.sherly.common.enums.LogTypeEnum; /** * @author 谷子毅 @@ -15,7 +16,7 @@ public class OperationLogRespDTO { /** 日志类型 */ @Schema(description = "日志类型") - private Integer type; + private LogTypeEnum type; /** 描述 */ @Schema(description = "描述") 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 index 4645e5a8c47984074e8ba9811e9ca8583bd64b43..1b136ed87751a42ad9c7b36e284adc1801908d5c 100644 --- 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 @@ -10,7 +10,7 @@ import org.oswh.sherly.model.DepartmentDO; @Mapper public interface DepartmentConvertor { - DepartmentConvertor INSTANCE = Mappers.getMapper(DepartmentConvertor.class); + DepartmentConvertor DepartmentConvertor = Mappers.getMapper(DepartmentConvertor.class); DepartmentRespDTO convertToRespDTO(DepartmentDO departmentDO); 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 index d2d37baa0d07ad82dcb410edb566ab00b2553206..d4c2c7b17166df4d77fb838150543117a868f6bc 100644 --- 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 @@ -8,7 +8,7 @@ import org.oswh.sherly.model.EmailConfigDO; @Mapper public interface EmailConfigConvertor { - EmailConfigConvertor INSTANCE = Mappers.getMapper(EmailConfigConvertor.class); + EmailConfigConvertor EmailConfigConvertor = Mappers.getMapper(EmailConfigConvertor.class); EmailConfigRespDTO convertToRespDTO(EmailConfigDO emailConfigDO); 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 index f89ef66a4aa514fedd73218d36d089c769a315c6..27bcf2e6d3c402c789cd978844a11ad3e6910063 100644 --- 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 @@ -1,9 +1,7 @@ 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; @@ -11,22 +9,10 @@ import org.oswh.sherly.model.OperationLogDO; @Mapper public interface OperationLogConvertor { - OperationLogConvertor INSTANCE = Mappers.getMapper(OperationLogConvertor.class); + OperationLogConvertor OperationLogConvertor = Mappers.getMapper(OperationLogConvertor.class); OperationLogPageRespDTO convertToPageRespDTO(OperationLogDO operationLogDO); - @Mapping(source = "type", target = "type") - OperationLogRespDTO convertToRespDTO(OperationLogDO operationLogDO); + OperationLogRespDTO convertToLogRespDTO(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 index 2c3dfa891f1f9c3fb89e8eb7b0c9513fbf2cd241..88e9e4bc48a6a6d4ff9d85adebb3740b5dddce88 100644 --- 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 @@ -1,6 +1,6 @@ package org.oswh.sherly.convertor.menu; -import org.apache.ibatis.annotations.Mapper; +import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import org.oswh.sherly.controller.generic.dto.BasicMenuInfoRespDTO; import org.oswh.sherly.controller.menu.dto.MenuInsertReqDTO; @@ -11,7 +11,7 @@ import org.oswh.sherly.model.MenuDO; @Mapper public interface MenuConvertor { - MenuConvertor INSTANCE = Mappers.getMapper(MenuConvertor.class); + MenuConvertor MenuConvertor = Mappers.getMapper(MenuConvertor.class); MenuRespDTO convertToRespDTO(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 index 898392a774f20ce59215c5ccc663aa39d3ebd334..747aff9c7cd2c1cb4d10cb4e751fd979a138c5c7 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 @@ -11,7 +11,7 @@ import org.oswh.sherly.model.OssConfigDO; @Mapper public interface OssConfigConvertor { - OssConfigConvertor INSTANCE = Mappers.getMapper(OssConfigConvertor.class); + OssConfigConvertor OssConfigConvertor = Mappers.getMapper(OssConfigConvertor.class); @Mapping(target = "config", ignore = true) OssConfigRespDTO convertToRespDTO(OssConfigDO ossConfigDO); 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 index 3197d19237a88c6f30a3dc1266bb0faf6585d9d1..61247c244723462f48145bb0b94dc06454767120 100644 --- 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 @@ -13,7 +13,7 @@ import org.oswh.sherly.model.ScheduleTaskDO; @Mapper public interface ScheduleTaskConvertor { - ScheduleTaskConvertor INSTANCE = Mappers.getMapper(ScheduleTaskConvertor.class); + ScheduleTaskConvertor ScheduleTaskConvertor = Mappers.getMapper(ScheduleTaskConvertor.class); ScheduleTaskDO convertToDO (ScheduleTaskInsertReqDTO 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 index 0b1a4e1f80cd25a06eae1f6ff6ead6903f959218..ac02825664d5eeaa23c284dcd2459c2a4334bd7a 100644 --- 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 @@ -12,7 +12,7 @@ import org.oswh.sherly.model.ScheduleTaskLogDO; @Mapper public interface ScheduleTaskLogConvertor { - ScheduleTaskLogConvertor INSTANCE = Mappers.getMapper(ScheduleTaskLogConvertor.class); + ScheduleTaskLogConvertor ScheduleTaskLogConvertor = 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 index eb88064b257a6aad67b239f0ef1ce901bf817ba3..a862d997a626cdf9b840bb5f59a9afde35feb943 100644 --- 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 @@ -15,7 +15,7 @@ import org.oswh.sherly.model.RoleDO; @Mapper public interface RoleConvertor { - RoleConvertor INSTANCE = Mappers.getMapper(RoleConvertor.class); + RoleConvertor RoleConvertor = Mappers.getMapper(RoleConvertor.class); RoleRespDTO convertToRespDTO (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 index 5db5c42065908bb74113a25903034be8ebd3ad0d..1af453fcac5c0870591b77f969132271092a1381 100644 --- 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 @@ -8,6 +8,8 @@ import org.oswh.sherly.controller.tenant.dto.TenantUpdateReqDTO; import org.oswh.sherly.controller.tenant.eo.TenantEO; import org.oswh.sherly.model.TenantDO; +import java.util.List; + /** * @author 孙泽文 * @date 2023/8/25 @@ -15,14 +17,13 @@ import org.oswh.sherly.model.TenantDO; @Mapper public interface TenantConvertor { - TenantConvertor INSTANCE = Mappers.getMapper(TenantConvertor.class); + TenantConvertor TenantConvertor = Mappers.getMapper(TenantConvertor.class); TenantDO convertToDO (TenantInsertReqDTO reqDTO); TenantDO convertToDO (TenantUpdateReqDTO reqDTO); - TenantEO convertToEO (TenantDO tenantDO); - LoginTenantRespDTO tenantToLoginTenantRespDTO(TenantDO tenantDO); + List convertToListEO(List list); } 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 index 4f57ff53558d8711bbd36b86367dafc3a1aed879..f00503cd8b87dfa179c19de5bbc61f7d878bf968 100644 --- 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 @@ -17,7 +17,7 @@ import java.util.List; @Mapper public interface TenantPackageConvertor { - TenantPackageConvertor INSTANCE = Mappers.getMapper(TenantPackageConvertor.class); + TenantPackageConvertor TenantPackageConvertor = Mappers.getMapper(TenantPackageConvertor.class); TenantPackageDO convertToDO (TenantPackageInsertReqDTO reqDTO); 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 index 0f58e9d444c37782e3bdd1bc5aa22cd9f977c7d9..8af84d4ebc0d845abdadac8a477e38f6c7052c5e 100644 --- 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 @@ -16,7 +16,7 @@ import org.oswh.sherly.model.UserDO; @Mapper public interface UserConvertor { - UserConvertor INSTANCE = Mappers.getMapper(UserConvertor.class); + UserConvertor UserConvertor = Mappers.getMapper(UserConvertor.class); UserRespDTO convertToRespDTO (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 index e2cc73dfa42c4f76a3a9f8c514ed6985fefdc4a6..86b726f3958af84842528d819b1c023def278999 100644 --- 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 @@ -14,7 +14,7 @@ import org.oswh.sherly.model.UserDO; @Mapper public interface UserSelfConvertor { - UserSelfConvertor INSTANCE = Mappers.getMapper(UserSelfConvertor.class); + UserSelfConvertor UserSelfConvertor = Mappers.getMapper(UserSelfConvertor.class); UserSelfRespDTO convertToRespDTO (UserDO userDO); 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 57792e5af4b90f59da199e6061142016fcfc75d1..929e6c6f80123481b33f83e0d031379cdf6936a6 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,7 +6,6 @@ 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.stereotype.Service; @@ -15,6 +14,7 @@ import javax.annotation.Resource; import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.NO_EMAIL_CONFIG; +import static org.oswh.sherly.convertor.emailConfig.EmailConfigConvertor.EmailConfigConvertor; /** * @author 谷子毅 @@ -36,7 +36,7 @@ public class EmailManager { if (emailConfigDO == null) { return emailConfigRespDTO; } - return EmailConfigConvertor.INSTANCE.convertToRespDTO(emailConfigDO); + return EmailConfigConvertor.convertToRespDTO(emailConfigDO); } /** @@ -44,7 +44,7 @@ public class EmailManager { * @param dto */ public void saveOrUpdate(EmailConfigReqDTO dto) { - EmailConfigDO emailConfigDO = EmailConfigConvertor.INSTANCE.convertToDO(dto); + EmailConfigDO emailConfigDO = EmailConfigConvertor.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 81b8990c79b6909a54c33dd0c6f2f29337cc9260..449f5ff1f7a346521f6630a46dfa2c088e9eb2f0 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,7 +9,6 @@ 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; @@ -22,6 +21,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static org.oswh.sherly.convertor.log.OperationLogConvertor.OperationLogConvertor; + /** * @author 谷子毅 * @date 2022/7/14 @@ -54,7 +55,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 = OperationLogConvertor.INSTANCE.convertToPageRespDTO(e); + OperationLogPageRespDTO vo = OperationLogConvertor.convertToPageRespDTO(e); vo.setOperateUser(userMap.get(e.getCreateUserId())); return vo; }).collect(Collectors.toList()); @@ -65,7 +66,7 @@ public class OperationLogManagerImpl implements OperationLogManager { @Override public OperationLogRespDTO getOne(Long logId) { OperationLogDO log = operationLogMapper.selectById(logId); - return OperationLogConvertor.INSTANCE.convertToRespDTO(log); + return OperationLogConvertor.convertToLogRespDTO(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 6514ef52cc771923ceb8993ca8b92ac154711fe6..72c8dfd0d37ffc1868a81518136e4b7b4e8763aa 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 @@ -11,6 +11,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import static org.oswh.sherly.convertor.quartz.ScheduleTaskLogConvertor.*; + /** * @author 谷子毅 * @date 2022/12/5 @@ -27,6 +29,6 @@ public class ScheduleTaskLogManager { public ScheduleTaskLogRespDTO getOne(Long scheduleTaskLogId) { ScheduleTaskLogDO scheduleTaskLogDO = scheduleTaskLogMapper.selectById(scheduleTaskLogId); - return ScheduleTaskLogConvertor.INSTANCE.convertToRespDTO(scheduleTaskLogDO); + return ScheduleTaskLogConvertor.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 ac41ac82c7be32352ab687cf648bf9a8d239b88c..cffbd698ea13dfeda8c81e0a814b2850051f5888 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,7 +7,6 @@ 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; @@ -20,6 +19,7 @@ import java.util.List; import static org.oswh.sherly.common.enums.UsableEnum.DISABLE; import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; +import static org.oswh.sherly.convertor.quartz.ScheduleTaskConvertor.ScheduleTaskConvertor; import static org.oswh.sherly.other.quartz.util.ScheduleTaskUtil.getJobKey; /** @@ -61,8 +61,7 @@ public class ScheduleTaskManager { * @param dto */ public void saveOne(ScheduleTaskInsertReqDTO dto) { - ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.INSTANCE.convertToDO(dto); - scheduleTaskMapper.insert(scheduleTaskDO); + ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.convertToDO(dto); ScheduleTaskUtil.createScheduleTaskJob(scheduler, scheduleTaskDO); } @@ -91,7 +90,7 @@ public class ScheduleTaskManager { */ @SneakyThrows public void updateOne(ScheduleTaskUpdateReqDTO dto) { - ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.INSTANCE.convertToDO(dto); + ScheduleTaskDO scheduleTaskDO = ScheduleTaskConvertor.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 fe18e57debf85fb380886ab98bc589a24e8c8f63..0b6399c1c47b559a5dc20a8001311be3f6a9d633 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,7 +5,6 @@ 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; @@ -20,6 +19,7 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.constants.CommonConstants.ROOT_PARENT_ID; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.*; +import static org.oswh.sherly.convertor.department.DepartmentConvertor.DepartmentConvertor; /** * @author 谷子毅 @@ -44,7 +44,7 @@ public class DepartmentService { // 对象转换成vo类型 List all = list.stream() .sorted(Comparator.comparing(DepartmentDO::getSort)) - .map(DepartmentConvertor.INSTANCE::convertToRespDTO).collect(Collectors.toList()); + .map(DepartmentConvertor::convertToRespDTO).collect(Collectors.toList()); // 拼装子结点并返回 return all.stream() @@ -77,7 +77,7 @@ public class DepartmentService { throw new BizException(DEPARTMENT_REPEAT); } - DepartmentDO departmentDO = DepartmentConvertor.INSTANCE.convertToDO(dto); + DepartmentDO departmentDO = DepartmentConvertor.convertToDO(dto); departmentMapper.insert(departmentDO); } @@ -98,7 +98,7 @@ public class DepartmentService { throw new BizException(DEPARTMENT_REPEAT); } - DepartmentDO departmentDO = DepartmentConvertor.INSTANCE.convertToDO(dto); + DepartmentDO departmentDO = DepartmentConvertor.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 f63d5e1be8e609f41bc3bc273c03062ffbe426db..74894bff8df60116979f205d889ca99af30fad60 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,9 +5,6 @@ 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; @@ -29,6 +26,9 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.constants.CommonConstants.ROOT_PARENT_ID; import static org.oswh.sherly.controller.menu.enums.MenuTypeEnum.BUTTON; import static org.oswh.sherly.controller.menu.enums.MenuTypeEnum.DIR; +import static org.oswh.sherly.convertor.menu.MenuConvertor.MenuConvertor; +import static org.oswh.sherly.convertor.role.RoleConvertor.RoleConvertor; +import static org.oswh.sherly.convertor.user.UserConvertor.UserConvertor; /** * @author 谷子毅 @@ -68,7 +68,7 @@ public class GenericService { // 用户信息收集 UserDO userDO = userMapper.selectById(userId); - BasicUserInfoRespDTO userRespDTO = UserConvertor.INSTANCE.convertToInfoRespDTO(userDO); + BasicUserInfoRespDTO userRespDTO = UserConvertor.convertToInfoRespDTO(userDO); userRespDTO.setAvatar(ossManager.accessUrl(userRespDTO.getAvatar())); userRespDTO.setTenantCode(tenantDO.getTenantCode()); userRespDTO.setTenantName(tenantDO.getTenantName()); @@ -77,7 +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(RoleConvertor.INSTANCE::convertToInfoRespDTO).collect(Collectors.toList()); + List roleRespDTOList = roleDOs.stream().map(RoleConvertor::convertToInfoRespDTO).collect(Collectors.toList()); // 菜单信息收集 List roleMenuDOs = roleMenuMapper.listByRoleIds(roleIds); @@ -100,7 +100,7 @@ public class GenericService { // 跳转相关数据转换成树 List menuRespDTOList = jumps.stream().filter(e -> Objects.equals(e.getParentId(), ROOT_PARENT_ID)).map(e -> { - BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.INSTANCE.convertToInfoRespDTO(e); + BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.convertToInfoRespDTO(e); basicMenuInfoRespDTO.setChildren(getChildren(e, jumps)); return basicMenuInfoRespDTO; }).collect(Collectors.toList()); @@ -127,7 +127,7 @@ public class GenericService { return all.stream() .filter(e -> Objects.equals(e.getParentId(), parent.getMenuId())) .map(e -> { - BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.INSTANCE.convertToInfoRespDTO(e); + BasicMenuInfoRespDTO basicMenuInfoRespDTO = MenuConvertor.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 6accfbfd0f67f904600c7e451b5234438fbbabad..3016ba035490f46cef268ccfb00adb6c9ed909a5 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,7 +16,6 @@ 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; @@ -47,6 +46,7 @@ import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.*; import static org.oswh.sherly.controller.log.enums.LoginResultEnum.*; import static org.oswh.sherly.controller.log.enums.LoginTypeEnum.PASSWORD; import static org.oswh.sherly.controller.menu.enums.MenuTypeEnum.DIR; +import static org.oswh.sherly.convertor.tenant.TenantConvertor.TenantConvertor; /** * @author 谷子毅 @@ -188,7 +188,7 @@ public class LoginService { throw new BizException(NO_TENANT); } - return tenantDOs.stream().map(TenantConvertor.INSTANCE::tenantToLoginTenantRespDTO).collect(Collectors.toList()); + return tenantDOs.stream().map(TenantConvertor::tenantToLoginTenantRespDTO).collect(Collectors.toList()); } @@ -258,7 +258,7 @@ public class LoginService { throw new BizException(NO_TENANT); } - return tenantDOs.stream().map(TenantConvertor.INSTANCE::tenantToLoginTenantRespDTO).collect(Collectors.toList()); + return tenantDOs.stream().map(TenantConvertor::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 b467b7613cd815545b6a4dd0daa513d816687d7f..28b4d140471bcaa3038c6002c7d6b273110aecbe 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,7 +4,6 @@ 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; @@ -18,6 +17,7 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.constants.CommonConstants.ROOT_PARENT_ID; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.*; +import static org.oswh.sherly.convertor.menu.MenuConvertor.MenuConvertor; /** * @author 谷子毅 @@ -40,7 +40,7 @@ public class MenuService { List list = menuMapper.selectList(); // 对象转换成vo类型 - List all = list.stream().map(MenuConvertor.INSTANCE::convertToRespDTO) + List all = list.stream().map(MenuConvertor::convertToRespDTO) .sorted(Comparator.comparing(MenuRespDTO::getSort)).collect(Collectors.toList()); return all.stream().filter(e -> Objects.equals(e.getParentId(), ROOT_PARENT_ID)) @@ -67,7 +67,7 @@ public class MenuService { * @param dto */ public void saveOne(MenuInsertReqDTO dto) { - MenuDO menuDO = MenuConvertor.INSTANCE.convertToDO(dto); + MenuDO menuDO = MenuConvertor.convertToDO(dto); menuMapper.insert(menuDO); } @@ -93,7 +93,7 @@ public class MenuService { if (Objects.equals(dto.getParentId(), dto.getMenuId())) { throw new BizException(MENU_PARENT_SELF); } - MenuDO menuDO = MenuConvertor.INSTANCE.convertToDO(dto); + MenuDO menuDO = MenuConvertor.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 9036ab4d389b77e42ec20f71e3187d050268711a..16f29e931b6c5753a2509911bc6efe300f2cd0cf 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 @@ -7,7 +7,6 @@ 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.stereotype.Service; @@ -20,6 +19,7 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.enums.UsableEnum.DISABLE; import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; +import static org.oswh.sherly.convertor.oss.OssConfigConvertor.OssConfigConvertor; /** * @author 谷子毅 @@ -55,7 +55,7 @@ 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); + OssConfigRespDTO vo = OssConfigConvertor.convertToRespDTO(ossConfigDO); vo.setConfig(map); return vo; } @@ -66,7 +66,7 @@ public class OssConfigService { * @param dto */ public void saveOne(OssConfigInsertReqDTO dto) { - OssConfigDO ossConfigDO = OssConfigConvertor.INSTANCE.convertToDO(dto); + OssConfigDO ossConfigDO = OssConfigConvertor.convertToDO(dto); Map map = dto.getConfig(); OssClientConfig ossClientConfig = BeanUtil.fillBeanWithMap(map, new OssClientConfig(), false); ossConfigDO.setConfig(ossClientConfig); @@ -79,7 +79,7 @@ public class OssConfigService { * @param dto */ public void updateOne(OssConfigUpdateReqDTO dto) { - OssConfigDO ossConfigDO = OssConfigConvertor.INSTANCE.convertToDO(dto); + OssConfigDO ossConfigDO = OssConfigConvertor.convertToDO(dto); Map map = dto.getConfig(); OssClientConfig ossClientConfig = BeanUtil.fillBeanWithMap(map, new OssClientConfig(), false); ossConfigDO.setConfig(ossClientConfig); 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 03f5e21a4d9eb90cd27b8308135003c9698d69d2..81388bb8ee8e8650681c880db707142d2edcbb2b 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,7 +3,6 @@ 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; @@ -19,6 +18,7 @@ import java.util.Objects; import java.util.stream.Collectors; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.*; +import static org.oswh.sherly.convertor.role.RoleConvertor.RoleConvertor; /** * @author 谷子毅 @@ -57,7 +57,7 @@ public class RoleService { List menuIds = roleMenuDOs.stream().map(RoleMenuDO::getMenuId).collect(Collectors.toList()); // 组装vo - RoleRespDTO vo = RoleConvertor.INSTANCE.convertToRespDTO(roleDO); + RoleRespDTO vo = RoleConvertor.convertToRespDTO(roleDO); vo.setMenuIds(menuIds); return vo; @@ -74,7 +74,7 @@ public class RoleService { throw new BizException(ROLE_REPEAT); } - RoleDO roleDO = RoleConvertor.INSTANCE.convertToDO(dto); + RoleDO roleDO = RoleConvertor.convertToDO(dto); roleMapper.insert(roleDO); } @@ -91,7 +91,7 @@ public class RoleService { throw new BizException(ROLE_REPEAT); } - RoleDO roleDO = RoleConvertor.INSTANCE.convertToDO(dto); + RoleDO roleDO = RoleConvertor.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 66d2bb48a092a5e05816a4ed178367fc6856d8d0..2721f049e4eb06b527309547c8e040d3fcbd0fa1 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,7 +3,6 @@ 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; @@ -16,6 +15,7 @@ import java.util.List; import java.util.stream.Collectors; import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; +import static org.oswh.sherly.convertor.tenant.TenantPackageConvertor.TenantPackageConvertor; /** @@ -45,7 +45,7 @@ public class TenantPackageService { * @param dto */ public void saveOne(TenantPackageInsertReqDTO dto) { - TenantPackageDO tenantPackageDO = TenantPackageConvertor.INSTANCE.convertToDO(dto); + TenantPackageDO tenantPackageDO = TenantPackageConvertor.convertToDO(dto); tenantPackageDO.setUsable(ENABLE); tenantPackageMapper.insert(tenantPackageDO); List tenantPackageMenuDOs = dto.getMenuIds().stream().map(e -> { @@ -72,7 +72,7 @@ public class TenantPackageService { * @param dto */ public void updateOne(TenantPackageUpdateReqDTO dto) { - TenantPackageDO tenantPackageDO = TenantPackageConvertor.INSTANCE.convertToDO(dto); + TenantPackageDO tenantPackageDO = TenantPackageConvertor.convertToDO(dto); tenantPackageMapper.updateById(tenantPackageDO); tenantPackageMenuMapper.removeMenuById(dto.getTenantPackageId()); List tenantPackageMenuDOs = dto.getMenuIds().stream().map(e -> { @@ -91,7 +91,7 @@ public class TenantPackageService { */ public List listAll(TenantPackageSelectReqDTO dto) { List tenantPackageDOs = tenantPackageMapper.listAll(dto); - return TenantPackageConvertor.INSTANCE.convertToSelectRespDTO(tenantPackageDOs); + return TenantPackageConvertor.convertToSelectRespDTO(tenantPackageDOs); } /** @@ -110,7 +110,7 @@ public class TenantPackageService { */ public TenantPackageRespDTO getOne(Long tenantPackageId) { TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(tenantPackageId); - TenantPackageRespDTO tenantPackageRespDTO =TenantPackageConvertor.INSTANCE.convertToRespDTO(tenantPackageDO); + TenantPackageRespDTO tenantPackageRespDTO =TenantPackageConvertor.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 566a2e9e52f84a6deca41a12f9139342d6169c65..a9dface284e99db7a7ec276bceb867b777638642 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,7 +14,6 @@ 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; @@ -39,6 +38,7 @@ import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.DELETE_TENANT_ERROR; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.TENANT_REPEAT; import static org.oswh.sherly.controller.user.enums.GenderEnum.MALE; +import static org.oswh.sherly.convertor.tenant.TenantConvertor.TenantConvertor; /** @@ -96,7 +96,7 @@ public class TenantService { throw new BizException(TENANT_REPEAT); } - TenantDO tenantDO = TenantConvertor.INSTANCE.convertToDO(dto); + TenantDO tenantDO = TenantConvertor.convertToDO(dto); tenantMapper.insert(tenantDO); // 执行sql语句创建新租户的数据库表 @@ -161,7 +161,7 @@ public class TenantService { * @param dto */ public void updateOne(TenantUpdateReqDTO dto) { - TenantDO tenantDO =TenantConvertor.INSTANCE.convertToDO(dto); + TenantDO tenantDO =TenantConvertor.convertToDO(dto); tenantMapper.updateById(tenantDO); } @@ -239,7 +239,7 @@ public class TenantService { public void listExport(HttpServletResponse response) { List list = tenantMapper.selectList(); - List result = list.stream().map(TenantConvertor.INSTANCE::convertToEO).collect(Collectors.toList()); + List result = TenantConvertor.convertToListEO(list); 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 cd99d66b17c18997ef5cd1bba0c768a98fdc7dcf..c0eb125dc33553ec1541288d5eccef5870750216 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,7 +11,6 @@ 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; @@ -34,6 +33,7 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.USER_PASSWORD_ERROR; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.USER_PASSWORD_REPEAT; import static org.oswh.sherly.controller.user.enums.GenderEnum.MALE; +import static org.oswh.sherly.convertor.user.UserSelfConvertor.UserSelfConvertor; /** * @author 谷子毅 @@ -85,7 +85,7 @@ public class UserSelfService { Map departmentIdMapName = departmentDOList.stream().collect(Collectors.toMap(DepartmentDO::getDepartmentId, DepartmentDO::getDepartmentName)); // 组装vo - UserSelfRespDTO vo = UserSelfConvertor.INSTANCE.convertToRespDTO(userDO); + UserSelfRespDTO vo = UserSelfConvertor.convertToRespDTO(userDO); vo.setAvatar(ossManager.accessUrl(vo.getAvatar())); vo.setRoleIds(roleIds); vo.setRoleNames(roleNames); @@ -126,7 +126,7 @@ public class UserSelfService { * @param dto */ public void updateSelf(UserSelfUpdateReqDTO dto) { - UserDO userDO = UserSelfConvertor.INSTANCE.convertToDO(dto); + UserDO userDO = UserSelfConvertor.convertToDO(dto); userDO.setUserId(SecurityUtil.getUserId()); 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 9a7466906f2209ff3e6ecc78c8c66035f87b3b64..e79cde4abc1ddad4d4a8e2f6ecbec48fc757cd0a 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,7 +12,6 @@ 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; @@ -36,6 +35,7 @@ import java.util.stream.Collectors; import static org.oswh.sherly.common.enums.UsableEnum.ENABLE; import static org.oswh.sherly.common.modules.exception.enums.AdminErrorEnum.*; import static org.oswh.sherly.controller.user.enums.GenderEnum.MALE; +import static org.oswh.sherly.convertor.user.UserConvertor.UserConvertor; /** * @author 谷子毅 @@ -94,7 +94,7 @@ public class UserService { Map departmentIdMapName = departmentDOList.stream().collect(Collectors.toMap(DepartmentDO::getDepartmentId, DepartmentDO::getDepartmentName)); List result = userDOList.stream().map(e -> { - UserEO userEO = UserConvertor.INSTANCE.convertToEO(e); + UserEO userEO = UserConvertor.convertToEO(e); userEO.setUsable(e.getUsable() == ENABLE ? "启用" : "禁用"); userEO.setDepartmentName(departmentIdMapName.get(e.getDepartmentId())); userEO.setGender(e.getGender() == MALE ? "男" : "女"); @@ -126,7 +126,7 @@ public class UserService { List roleIds = userRoleDOs.stream().map(UserRoleDO::getRoleId).collect(Collectors.toList()); // 组装vo - UserRespDTO vo = UserConvertor.INSTANCE.convertToRespDTO(userDO); + UserRespDTO vo = UserConvertor.convertToRespDTO(userDO); vo.setRoleIds(roleIds); return vo; @@ -171,7 +171,7 @@ public class UserService { accountUserMapper.updateById(accountUserDO); } - UserDO userDO = UserConvertor.INSTANCE.convertToDO(dto); + UserDO userDO = UserConvertor.convertToDO(dto); userDO.setUsable(ENABLE); userDO.setAccountUserId(accountUserDO.getAccountUserId()); userDO.setLastLoginTime(new Date()); @@ -190,7 +190,7 @@ public class UserService { if (Objects.equals(dto.getUserId(), 1L)) { throw new BizException(UPDATE_USER_ERROR); } - UserDO userDO = UserConvertor.INSTANCE.convertToDO(dto); + UserDO userDO = UserConvertor.convertToDO(dto); userMapper.updateById(userDO); userRoleMapper.removeUserRoleByUserId(dto.getUserId());