diff --git a/.jpb/jpb-settings.xml b/.jpb/jpb-settings.xml new file mode 100644 index 00000000..5ffa4b85 --- /dev/null +++ b/.jpb/jpb-settings.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d9b3eaf9..eab5fa38 100644 --- a/pom.xml +++ b/pom.xml @@ -114,6 +114,10 @@ 4.0.14 + + org.flywaydb + flyway-core + org.springframework.boot spring-boot-starter-actuator diff --git a/src/main/java/cn/lihongjie/coal/base/mapper/BaseMapper.java b/src/main/java/cn/lihongjie/coal/base/mapper/BaseMapper.java new file mode 100644 index 00000000..e61e5efa --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/base/mapper/BaseMapper.java @@ -0,0 +1,16 @@ +package cn.lihongjie.coal.base.mapper; + +import org.mapstruct.MappingTarget; + +public interface BaseMapper { + Entity copy(Entity i); + Dto copyDto(Dto i); + + + Dto toDto(Entity user); + + Entity toEntity(Create request); + + + void updateEntity(@MappingTarget Entity entity, Update dto); +} diff --git a/src/main/java/cn/lihongjie/coal/coalBlend/mapper/CoalBlendMapper.java b/src/main/java/cn/lihongjie/coal/coalBlend/mapper/CoalBlendMapper.java index 454eb148..7957fd52 100644 --- a/src/main/java/cn/lihongjie/coal/coalBlend/mapper/CoalBlendMapper.java +++ b/src/main/java/cn/lihongjie/coal/coalBlend/mapper/CoalBlendMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.coalBlend.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.coalBlend.dto.CoalBlendDto; import cn.lihongjie.coal.coalBlend.dto.CreateCoalBlendDto; @@ -8,7 +9,6 @@ import cn.lihongjie.coal.coalBlend.dto.UpdateCoalBlendDto; import cn.lihongjie.coal.coalBlend.entity.CoalBlendEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; -import org.mapstruct.MappingTarget; import org.mapstruct.control.DeepClone; @Mapper( @@ -17,12 +17,7 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface CoalBlendMapper { - CoalBlendDto toDto(CoalBlendEntity user); +public interface CoalBlendMapper extends BaseMapper { - CoalBlendEntity toEntity(CreateCoalBlendDto request); - - - void updateEntity(@MappingTarget CoalBlendEntity entity, UpdateCoalBlendDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/coalParameterDef/mapper/CoalParameterDefMapper.java b/src/main/java/cn/lihongjie/coal/coalParameterDef/mapper/CoalParameterDefMapper.java index 31c32e23..73889302 100644 --- a/src/main/java/cn/lihongjie/coal/coalParameterDef/mapper/CoalParameterDefMapper.java +++ b/src/main/java/cn/lihongjie/coal/coalParameterDef/mapper/CoalParameterDefMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.coalParameterDef.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.coalParameterDef.dto.CoalParameterDefDto; import cn.lihongjie.coal.coalParameterDef.dto.CreateCoalParameterDefDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface CoalParameterDefMapper { - CoalParameterDefDto toDto(CoalParameterDefEntity user); +public interface CoalParameterDefMapper extends BaseMapper{ - CoalParameterDefEntity toEntity(CreateCoalParameterDefDto request); - - - void updateEntity(@MappingTarget CoalParameterDefEntity entity, UpdateCoalParameterDefDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/CoalWashingDailyAnalysisMapper.java b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/CoalWashingDailyAnalysisMapper.java index cdc1401b..a1e52a81 100644 --- a/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/CoalWashingDailyAnalysisMapper.java +++ b/src/main/java/cn/lihongjie/coal/coalWashingDailyAnalysis/mapper/CoalWashingDailyAnalysisMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.coalWashingDailyAnalysis.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.coalWashingDailyAnalysis.dto.CoalWashingDailyAnalysisDto; import cn.lihongjie.coal.coalWashingDailyAnalysis.dto.CreateCoalWashingDailyAnalysisDto; @@ -18,11 +19,6 @@ import org.mapstruct.control.DeepClone; ) -public interface CoalWashingDailyAnalysisMapper { - CoalWashingDailyAnalysisDto toDto(CoalWashingDailyAnalysisEntity user); +public interface CoalWashingDailyAnalysisMapper extends BaseMapper{ - CoalWashingDailyAnalysisEntity toEntity(CreateCoalWashingDailyAnalysisDto request); - - - void updateEntity(@MappingTarget CoalWashingDailyAnalysisEntity entity, UpdateCoalWashingDailyAnalysisDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/department/mapper/DepartmentMapper.java b/src/main/java/cn/lihongjie/coal/department/mapper/DepartmentMapper.java index 72d78045..223377a5 100644 --- a/src/main/java/cn/lihongjie/coal/department/mapper/DepartmentMapper.java +++ b/src/main/java/cn/lihongjie/coal/department/mapper/DepartmentMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.department.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.department.dto.CreateDepartmentDto; import cn.lihongjie.coal.department.dto.DepartmentDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface DepartmentMapper { - DepartmentDto toDto(DepartmentEntity user); +public interface DepartmentMapper extends BaseMapper{ - DepartmentEntity toEntity(CreateDepartmentDto request); - - - void updateEntity(@MappingTarget DepartmentEntity entity, UpdateDepartmentDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryItemMapper.java b/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryItemMapper.java index 05a11f8f..a717f9a4 100644 --- a/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryItemMapper.java +++ b/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryItemMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.dictionary.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.coalBlend.mapper.CoalBlendMapper; import cn.lihongjie.coal.dictionary.dto.CreateDictionaryItemDto; @@ -16,14 +17,6 @@ import org.mapstruct.MappingTarget; uses = {CommonMapper.class} ) -public interface DictionaryItemMapper { - CoalBlendMapper INSTANCE = org.mapstruct.factory.Mappers.getMapper(CoalBlendMapper.class); - DictionaryItemEntity copy(DictionaryItemEntity i); +public interface DictionaryItemMapper extends BaseMapper{ - DictionaryItemDto toDto(DictionaryItemEntity user); - - DictionaryItemEntity toEntity(CreateDictionaryItemDto request); - - - void updateEntity(@MappingTarget DictionaryItemEntity entity, UpdateDictionaryItemDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryMapper.java b/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryMapper.java index 85749676..a1b85548 100644 --- a/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryMapper.java +++ b/src/main/java/cn/lihongjie/coal/dictionary/mapper/DictionaryMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.dictionary.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.dictionary.dto.CreateDictionaryDto; import cn.lihongjie.coal.dictionary.dto.DictionaryDetailedDto; @@ -9,7 +10,6 @@ import cn.lihongjie.coal.dictionary.dto.UpdateDictionaryDto; import cn.lihongjie.coal.dictionary.entity.DictionaryEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; -import org.mapstruct.MappingTarget; import org.mapstruct.control.DeepClone; @Mapper( @@ -18,13 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface DictionaryMapper { - DictionaryDto toDto(DictionaryEntity user); - - DictionaryEntity toEntity(CreateDictionaryDto request); - - - void updateEntity(@MappingTarget DictionaryEntity entity, UpdateDictionaryDto dto); - +public interface DictionaryMapper extends BaseMapper{ DictionaryDetailedDto toDetailedDto(DictionaryEntity entity); } diff --git a/src/main/java/cn/lihongjie/coal/organization/mapper/OrganizationMapper.java b/src/main/java/cn/lihongjie/coal/organization/mapper/OrganizationMapper.java index 40d2be2e..55eaeee6 100644 --- a/src/main/java/cn/lihongjie/coal/organization/mapper/OrganizationMapper.java +++ b/src/main/java/cn/lihongjie/coal/organization/mapper/OrganizationMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.organization.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.organization.entity.OrganizationEntity; import cn.lihongjie.coal.organization.dto.CreateOrganizationDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface OrganizationMapper { - OrganizationDto toDto(OrganizationEntity user); +public interface OrganizationMapper extends BaseMapper{ - OrganizationEntity toEntity(CreateOrganizationDto request); - - - void updateEntity(@MappingTarget OrganizationEntity entity, UpdateOrganizationDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/permission/mapper/PermissionMapper.java b/src/main/java/cn/lihongjie/coal/permission/mapper/PermissionMapper.java index 1c5abcef..a83bd609 100644 --- a/src/main/java/cn/lihongjie/coal/permission/mapper/PermissionMapper.java +++ b/src/main/java/cn/lihongjie/coal/permission/mapper/PermissionMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.permission.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.permission.dto.CreatePermissionDto; import cn.lihongjie.coal.permission.dto.PermissionDto; @@ -17,7 +18,7 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface PermissionMapper { +public interface PermissionMapper extends BaseMapper{ PermissionDto toDto(PermissionEntity user); PermissionEntity toEntity(CreatePermissionDto request); diff --git a/src/main/java/cn/lihongjie/coal/resource/mapper/ResourceMapper.java b/src/main/java/cn/lihongjie/coal/resource/mapper/ResourceMapper.java index eb500d65..7bc4cdbb 100644 --- a/src/main/java/cn/lihongjie/coal/resource/mapper/ResourceMapper.java +++ b/src/main/java/cn/lihongjie/coal/resource/mapper/ResourceMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.resource.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.resource.dto.CreateResourceDto; import cn.lihongjie.coal.resource.dto.ResourceDto; @@ -21,7 +22,7 @@ import java.util.List; mappingControl = DeepClone.class ) -public interface ResourceMapper { +public interface ResourceMapper extends BaseMapper{ @Mappings({ @org.mapstruct.Mapping(target = "parent", source = "parent.id") }) diff --git a/src/main/java/cn/lihongjie/coal/role/mapper/RoleMapper.java b/src/main/java/cn/lihongjie/coal/role/mapper/RoleMapper.java index d386d266..c64558bd 100644 --- a/src/main/java/cn/lihongjie/coal/role/mapper/RoleMapper.java +++ b/src/main/java/cn/lihongjie/coal/role/mapper/RoleMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.role.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.role.dto.CreateRoleDto; import cn.lihongjie.coal.role.dto.RoleDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface RoleMapper { - RoleDto toDto(RoleEntity user); +public interface RoleMapper extends BaseMapper{ - RoleEntity toEntity(CreateRoleDto request); - - - void updateEntity(@MappingTarget RoleEntity entity, UpdateRoleDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/script/mapper/ScriptMapper.java b/src/main/java/cn/lihongjie/coal/script/mapper/ScriptMapper.java index 8caec308..34fc520a 100644 --- a/src/main/java/cn/lihongjie/coal/script/mapper/ScriptMapper.java +++ b/src/main/java/cn/lihongjie/coal/script/mapper/ScriptMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.script.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.script.dto.CreateScriptDto; import cn.lihongjie.coal.script.dto.ScriptDto; @@ -15,11 +16,6 @@ import org.mapstruct.MappingTarget; uses = {CommonMapper.class} ) -public interface ScriptMapper { - ScriptDto toDto(ScriptEntity user); +public interface ScriptMapper extends BaseMapper{ - ScriptEntity toEntity(CreateScriptDto request); - - - void updateEntity(@MappingTarget ScriptEntity entity, UpdateScriptDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/supplier/controller/SupplierController.java b/src/main/java/cn/lihongjie/coal/supplier/controller/SupplierController.java index e96678ef..b92e6b75 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/controller/SupplierController.java +++ b/src/main/java/cn/lihongjie/coal/supplier/controller/SupplierController.java @@ -4,9 +4,9 @@ import cn.lihongjie.coal.annotation.OrgScope; import cn.lihongjie.coal.annotation.SysLog; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; -import cn.lihongjie.coal.script.dto.CreateSupplierDto; -import cn.lihongjie.coal.script.dto.SupplierDto; -import cn.lihongjie.coal.script.dto.UpdateSupplierDto; +import cn.lihongjie.coal.supplier.dto.CreateSupplierDto; +import cn.lihongjie.coal.supplier.dto.SupplierDto; +import cn.lihongjie.coal.supplier.dto.UpdateSupplierDto; import cn.lihongjie.coal.supplier.service.SupplierService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/src/main/java/cn/lihongjie/coal/script/dto/CreateSupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java similarity index 90% rename from src/main/java/cn/lihongjie/coal/script/dto/CreateSupplierDto.java rename to src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java index 56e9b0da..efbd10f8 100644 --- a/src/main/java/cn/lihongjie/coal/script/dto/CreateSupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/CreateSupplierDto.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.script.dto; +package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; diff --git a/src/main/java/cn/lihongjie/coal/script/dto/SupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java similarity index 90% rename from src/main/java/cn/lihongjie/coal/script/dto/SupplierDto.java rename to src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java index c59ece20..d68c77bd 100644 --- a/src/main/java/cn/lihongjie/coal/script/dto/SupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/SupplierDto.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.script.dto; +package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; diff --git a/src/main/java/cn/lihongjie/coal/script/dto/UpdateSupplierDto.java b/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java similarity index 90% rename from src/main/java/cn/lihongjie/coal/script/dto/UpdateSupplierDto.java rename to src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java index 80aad7ad..fe31ed04 100644 --- a/src/main/java/cn/lihongjie/coal/script/dto/UpdateSupplierDto.java +++ b/src/main/java/cn/lihongjie/coal/supplier/dto/UpdateSupplierDto.java @@ -1,4 +1,4 @@ -package cn.lihongjie.coal.script.dto; +package cn.lihongjie.coal.supplier.dto; import cn.lihongjie.coal.base.dto.OrgCommonDto; import lombok.Data; diff --git a/src/main/java/cn/lihongjie/coal/supplier/mapper/SupplierMapper.java b/src/main/java/cn/lihongjie/coal/supplier/mapper/SupplierMapper.java index aabe2cd1..dd476d26 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/mapper/SupplierMapper.java +++ b/src/main/java/cn/lihongjie/coal/supplier/mapper/SupplierMapper.java @@ -1,10 +1,11 @@ package cn.lihongjie.coal.supplier.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; -import cn.lihongjie.coal.script.dto.CreateSupplierDto; -import cn.lihongjie.coal.script.dto.SupplierDto; -import cn.lihongjie.coal.script.dto.UpdateSupplierDto; +import cn.lihongjie.coal.supplier.dto.CreateSupplierDto; +import cn.lihongjie.coal.supplier.dto.SupplierDto; +import cn.lihongjie.coal.supplier.dto.UpdateSupplierDto; import cn.lihongjie.coal.supplier.entity.SupplierEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface SupplierMapper { - SupplierDto toDto(SupplierEntity user); +public interface SupplierMapper extends BaseMapper{ - SupplierEntity toEntity(CreateSupplierDto request); - - - void updateEntity(@MappingTarget SupplierEntity entity, UpdateSupplierDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/supplier/service/SupplierService.java b/src/main/java/cn/lihongjie/coal/supplier/service/SupplierService.java index 6218c58b..880366c2 100644 --- a/src/main/java/cn/lihongjie/coal/supplier/service/SupplierService.java +++ b/src/main/java/cn/lihongjie/coal/supplier/service/SupplierService.java @@ -3,9 +3,9 @@ package cn.lihongjie.coal.supplier.service; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; -import cn.lihongjie.coal.script.dto.CreateSupplierDto; -import cn.lihongjie.coal.script.dto.SupplierDto; -import cn.lihongjie.coal.script.dto.UpdateSupplierDto; +import cn.lihongjie.coal.supplier.dto.CreateSupplierDto; +import cn.lihongjie.coal.supplier.dto.SupplierDto; +import cn.lihongjie.coal.supplier.dto.UpdateSupplierDto; import cn.lihongjie.coal.supplier.repository.SupplierRepository; import cn.lihongjie.coal.supplier.entity.SupplierEntity; import cn.lihongjie.coal.supplier.mapper.SupplierMapper; diff --git a/src/main/java/cn/lihongjie/coal/sysconfig/mapper/SysConfigMapper.java b/src/main/java/cn/lihongjie/coal/sysconfig/mapper/SysConfigMapper.java index 75afeee3..5d1f7068 100644 --- a/src/main/java/cn/lihongjie/coal/sysconfig/mapper/SysConfigMapper.java +++ b/src/main/java/cn/lihongjie/coal/sysconfig/mapper/SysConfigMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.sysconfig.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.sysconfig.dto.CreateSysConfigDto; import cn.lihongjie.coal.sysconfig.dto.SysConfigDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface SysConfigMapper { - SysConfigDto toDto(SysConfigEntity user); +public interface SysConfigMapper extends BaseMapper{ - SysConfigEntity toEntity(CreateSysConfigDto request); - - - void updateEntity(@MappingTarget SysConfigEntity entity, UpdateSysConfigDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/syslog/mapper/SysLogMapper.java b/src/main/java/cn/lihongjie/coal/syslog/mapper/SysLogMapper.java index aaa9ef93..6bfcbfe3 100644 --- a/src/main/java/cn/lihongjie/coal/syslog/mapper/SysLogMapper.java +++ b/src/main/java/cn/lihongjie/coal/syslog/mapper/SysLogMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.syslog.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.syslog.dto.CreateSysLogDto; import cn.lihongjie.coal.syslog.dto.SysLogDto; @@ -17,11 +18,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface SysLogMapper { - SysLogDto toDto(SysLogEntity user); +public interface SysLogMapper extends BaseMapper{ - SysLogEntity toEntity(CreateSysLogDto request); - - - void updateEntity(@MappingTarget SysLogEntity entity, UpdateSysLogDto dto); } diff --git a/src/main/java/cn/lihongjie/coal/user/mapper/UserMapper.java b/src/main/java/cn/lihongjie/coal/user/mapper/UserMapper.java index 3a79e3cd..61b9155e 100644 --- a/src/main/java/cn/lihongjie/coal/user/mapper/UserMapper.java +++ b/src/main/java/cn/lihongjie/coal/user/mapper/UserMapper.java @@ -1,6 +1,7 @@ package cn.lihongjie.coal.user.mapper; +import cn.lihongjie.coal.base.mapper.BaseMapper; import cn.lihongjie.coal.base.mapper.CommonMapper; import cn.lihongjie.coal.user.dto.CreateUserDto; import cn.lihongjie.coal.user.dto.UpdateUserDto; @@ -8,7 +9,6 @@ import cn.lihongjie.coal.user.dto.UserDto; import cn.lihongjie.coal.user.entity.UserEntity; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; -import org.mapstruct.MappingTarget; import org.mapstruct.control.DeepClone; @Mapper( @@ -17,11 +17,6 @@ import org.mapstruct.control.DeepClone; mappingControl = DeepClone.class ) -public interface UserMapper { - UserDto toDto(UserEntity user); +public interface UserMapper extends BaseMapper{ - UserEntity toEntity(CreateUserDto request); - - - void updateEntity(@MappingTarget UserEntity entity, UpdateUserDto dto); }