refactor: 目录结构调整和代码优化

This commit is contained in:
ray
2024-08-31 14:59:40 +08:00
parent f9e9dbcedd
commit 5a3694f2af
112 changed files with 644 additions and 572 deletions

View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysConfig;
import com.youlai.boot.system.model.entity.Config;
import com.youlai.boot.system.model.vo.ConfigVO;
import com.youlai.boot.system.model.form.ConfigForm;
import org.mapstruct.Mapper;
@@ -15,9 +15,9 @@ import org.mapstruct.Mapper;
@Mapper(componentModel = "spring")
public interface ConfigConverter {
Page<ConfigVO> toPageVo(Page<SysConfig> page);
Page<ConfigVO> toPageVo(Page<Config> page);
SysConfig toEntity(ConfigForm configForm);
Config toEntity(ConfigForm configForm);
ConfigForm toForm(SysConfig entity);
ConfigForm toForm(Config entity);
}

View File

@@ -1,6 +1,6 @@
package com.youlai.boot.system.converter;
import com.youlai.boot.system.model.entity.SysDept;
import com.youlai.boot.system.model.entity.Dept;
import com.youlai.boot.system.model.vo.DeptVO;
import com.youlai.boot.system.model.form.DeptForm;
import org.mapstruct.Mapper;
@@ -14,10 +14,10 @@ import org.mapstruct.Mapper;
@Mapper(componentModel = "spring")
public interface DeptConverter {
DeptForm toForm(SysDept entity);
DeptForm toForm(Dept entity);
DeptVO toVo(SysDept entity);
DeptVO toVo(Dept entity);
SysDept toEntity(DeptForm deptForm);
Dept toEntity(DeptForm deptForm);
}

View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysDict;
import com.youlai.boot.system.model.entity.Dict;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.system.model.form.DictForm;
import org.mapstruct.Mapper;
@@ -15,9 +15,9 @@ import org.mapstruct.Mapper;
@Mapper(componentModel = "spring")
public interface DictConverter {
Page<DictPageVO> toPageVo(Page<SysDict> page);
Page<DictPageVO> toPageVo(Page<Dict> page);
DictForm toForm(SysDict entity);
DictForm toForm(Dict entity);
SysDict toEntity(DictForm entity);
Dict toEntity(DictForm entity);
}

View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysDictItem;
import com.youlai.boot.system.model.entity.DictItem;
import com.youlai.boot.system.model.vo.DictPageVO;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.form.DictForm;
@@ -20,20 +20,20 @@ import java.util.List;
@Mapper(componentModel = "spring")
public interface DictItemConverter {
Page<DictPageVO> toPageVo(Page<SysDictItem> page);
Page<DictPageVO> toPageVo(Page<DictItem> page);
DictForm toForm(SysDictItem entity);
DictForm toForm(DictItem entity);
SysDictItem toEntity(DictForm.DictItem dictItems);
List<SysDictItem> toEntity(List<DictForm.DictItem> dictItems);
DictItem toEntity(DictForm.DictItem dictItems);
List<DictItem> toEntity(List<DictForm.DictItem> dictItems);
DictForm.DictItem toDictItem(SysDictItem entity);
List<DictForm.DictItem> toDictItem(List<SysDictItem> entities);
DictForm.DictItem toDictItem(DictItem entity);
List<DictForm.DictItem> toDictItem(List<DictItem> entities);
@Mappings({
@Mapping(target = "value", source = "value"),
@Mapping(target = "label", source = "name")
})
Option<Long> toOption(SysDictItem dictItem);
List<Option<Long>> toOption(List<SysDictItem> dictItems);
Option<Long> toOption(DictItem dictItem);
List<Option<Long>> toOption(List<DictItem> dictItems);
}

View File

@@ -1,8 +1,8 @@
package com.youlai.boot.system.converter;
import com.youlai.boot.infrastructure.generator.model.entity.GenConfig;
import com.youlai.boot.infrastructure.generator.model.entity.GenFieldConfig;
import com.youlai.boot.infrastructure.generator.model.form.GenConfigForm;
import com.youlai.boot.platform.generator.model.entity.GenConfig;
import com.youlai.boot.platform.generator.model.entity.GenFieldConfig;
import com.youlai.boot.platform.generator.model.form.GenConfigForm;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;

View File

@@ -1,6 +1,6 @@
package com.youlai.boot.system.converter;
import com.youlai.boot.system.model.entity.SysMenu;
import com.youlai.boot.system.model.entity.Menu;
import com.youlai.boot.system.model.vo.MenuVO;
import com.youlai.boot.system.model.form.MenuForm;
import org.mapstruct.Mapper;
@@ -15,12 +15,12 @@ import org.mapstruct.Mapping;
@Mapper(componentModel = "spring")
public interface MenuConverter {
MenuVO toVo(SysMenu entity);
MenuVO toVo(Menu entity);
@Mapping(target = "params", ignore = true)
MenuForm toForm(SysMenu entity);
MenuForm toForm(Menu entity);
@Mapping(target = "params", ignore = true)
SysMenu toEntity(MenuForm menuForm);
Menu toEntity(MenuForm menuForm);
}

View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysRole;
import com.youlai.boot.system.model.entity.Role;
import com.youlai.boot.system.model.vo.RolePageVO;
import com.youlai.boot.common.model.Option;
import com.youlai.boot.system.model.form.RoleForm;
@@ -20,17 +20,17 @@ import java.util.List;
@Mapper(componentModel = "spring")
public interface RoleConverter {
Page<RolePageVO> toPageVo(Page<SysRole> page);
Page<RolePageVO> toPageVo(Page<Role> page);
@Mappings({
@Mapping(target = "value", source = "id"),
@Mapping(target = "label", source = "name")
})
Option<Long> entity2Option(SysRole role);
Option<Long> entity2Option(Role role);
List<Option<Long>> entities2Options(List<SysRole> roles);
List<Option<Long>> entities2Options(List<Role> roles);
SysRole toEntity(RoleForm roleForm);
Role toEntity(RoleForm roleForm);
RoleForm toForm(SysRole entity);
RoleForm toForm(Role entity);
}

View File

@@ -1,7 +1,7 @@
package com.youlai.boot.system.converter;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.youlai.boot.system.model.entity.SysUser;
import com.youlai.boot.system.model.entity.User;
import com.youlai.boot.system.model.vo.UserInfoVO;
import com.youlai.boot.system.model.vo.UserPageVO;
import com.youlai.boot.system.model.vo.UserProfileVO;
@@ -30,20 +30,20 @@ public interface UserConverter {
Page<UserPageVO> toPageVo(Page<UserBO> bo);
UserForm toForm(SysUser entity);
UserForm toForm(User entity);
@InheritInverseConfiguration(name = "toForm")
SysUser toEntity(UserForm entity);
User toEntity(UserForm entity);
@Mappings({
@Mapping(target = "userId", source = "id")
})
UserInfoVO toUserInfoVo(SysUser entity);
UserInfoVO toUserInfoVo(User entity);
SysUser toEntity(UserImportDTO vo);
User toEntity(UserImportDTO vo);
UserProfileVO toProfileVO(UserBO bo);
SysUser toEntity(UserProfileForm formData);
User toEntity(UserProfileForm formData);
}