优化mapper

.jpb/jpb-settings.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PersistenceUnitSettings">
+    <persistence-units>
+      <persistence-unit name="Default">
+        <packages>
+          <package value="cn.lihongjie.coal" />
+        </packages>
+      </persistence-unit>
+    </persistence-units>
+  </component>
+</project>

pom.xml

@@ -114,6 +114,10 @@
             <version>4.0.14</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>

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, Dto, Create,Update> {
+    Entity copy(Entity i);
+    Dto copyDto(Dto i);
+
+
+    Dto toDto(Entity user);
+
+    Entity toEntity(Create request);
+
+
+    void updateEntity(@MappingTarget Entity entity, Update dto);
+}

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, CoalBlendDto, CreateCoalBlendDto, UpdateCoalBlendDto> {
 
-    CoalBlendEntity toEntity(CreateCoalBlendDto request);
-
-
-    void updateEntity(@MappingTarget CoalBlendEntity entity, UpdateCoalBlendDto dto);
 
 }

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, CoalParameterDefDto, CreateCoalParameterDefDto, UpdateCoalParameterDefDto>{
 
-    CoalParameterDefEntity toEntity(CreateCoalParameterDefDto request);
-
-
-    void updateEntity(@MappingTarget CoalParameterDefEntity entity, UpdateCoalParameterDefDto dto);
 }

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, CoalWashingDailyAnalysisDto, CreateCoalWashingDailyAnalysisDto, UpdateCoalWashingDailyAnalysisDto>{
 
-    CoalWashingDailyAnalysisEntity toEntity(CreateCoalWashingDailyAnalysisDto request);
-
-
-    void updateEntity(@MappingTarget CoalWashingDailyAnalysisEntity entity, UpdateCoalWashingDailyAnalysisDto dto);
 }

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, DepartmentDto, CreateDepartmentDto, UpdateDepartmentDto>{
 
-    DepartmentEntity toEntity(CreateDepartmentDto request);
-
-
-    void updateEntity(@MappingTarget DepartmentEntity entity, UpdateDepartmentDto dto);
 }

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<DictionaryItemEntity, DictionaryItemDto, CreateDictionaryItemDto, UpdateDictionaryItemDto>{
 
-    DictionaryItemDto toDto(DictionaryItemEntity user);
-
-    DictionaryItemEntity toEntity(CreateDictionaryItemDto request);
-
-
-    void updateEntity(@MappingTarget DictionaryItemEntity entity, UpdateDictionaryItemDto dto);
 }

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<DictionaryEntity, DictionaryDto, CreateDictionaryDto, UpdateDictionaryDto>{
     DictionaryDetailedDto toDetailedDto(DictionaryEntity entity);
 }

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, OrganizationDto, CreateOrganizationDto, UpdateOrganizationDto>{
 
-    OrganizationEntity toEntity(CreateOrganizationDto request);
-
-
-    void updateEntity(@MappingTarget OrganizationEntity entity, UpdateOrganizationDto dto);
 }

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<PermissionEntity, PermissionDto, CreatePermissionDto, UpdatePermissionDto>{
     PermissionDto toDto(PermissionEntity user);
 
     PermissionEntity toEntity(CreatePermissionDto request);

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<ResourceEntity, ResourceDto, CreateResourceDto, UpdateResourceDto>{
     @Mappings({
             @org.mapstruct.Mapping(target = "parent", source = "parent.id")
     })

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, RoleDto, CreateRoleDto, UpdateRoleDto>{
 
-    RoleEntity toEntity(CreateRoleDto request);
-
-
-    void updateEntity(@MappingTarget RoleEntity entity, UpdateRoleDto dto);
 }

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, ScriptDto, CreateScriptDto, UpdateScriptDto>{
 
-    ScriptEntity toEntity(CreateScriptDto request);
-
-
-    void updateEntity(@MappingTarget ScriptEntity entity, UpdateScriptDto dto);
 }

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;

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;

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;

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;

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, SupplierDto, CreateSupplierDto, UpdateSupplierDto>{
 
-    SupplierEntity toEntity(CreateSupplierDto request);
-
-
-    void updateEntity(@MappingTarget SupplierEntity entity, UpdateSupplierDto dto);
 }

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;

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, SysConfigDto, CreateSysConfigDto, UpdateSysConfigDto>{
 
-    SysConfigEntity toEntity(CreateSysConfigDto request);
-
-
-    void updateEntity(@MappingTarget SysConfigEntity entity, UpdateSysConfigDto dto);
 }

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, SysLogDto, CreateSysLogDto, UpdateSysLogDto>{
 
-    SysLogEntity toEntity(CreateSysLogDto request);
-
-
-    void updateEntity(@MappingTarget SysLogEntity entity, UpdateSysLogDto dto);
 }

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, UserDto, CreateUserDto, UpdateUserDto>{
 
-    UserEntity toEntity(CreateUserDto request);
-
-
-    void updateEntity(@MappingTarget UserEntity entity,  UpdateUserDto dto);
 }