Skip to content

Commit d2e5849

Browse files
cadecodecadecode
committed
feat: 实体类名称规范化
1. 接口使用 request/vo 2. feign client 使用 dto/response
1 parent dd448a8 commit d2e5849

28 files changed

Lines changed: 281 additions & 172 deletions

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/bean/dto/SysLogDto.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SysLogDto {
2121
@AllArgsConstructor
2222
@NoArgsConstructor
2323
@Builder
24-
public static class SysLogInfoDto {
24+
public static class SysLogSaveDto {
2525

2626
private LogTypeEnum logType;
2727

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/bean/dto/SysUserDto.java‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/config/FeignConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import cn.hutool.extra.servlet.ServletUtil;
88
import com.fasterxml.jackson.databind.ObjectMapper;
99
import com.github.cadecode.uniboot.common.core.util.JacksonUtil;
10-
import com.github.cadecode.uniboot.framework.api.bean.dto.SysUserDto.SysUserDetailsDto;
1110
import com.github.cadecode.uniboot.framework.api.consts.SecurityConst;
1211
import com.github.cadecode.uniboot.framework.api.feign.FeignClientDecorator;
1312
import com.github.cadecode.uniboot.framework.api.feign.FeignErrorDecoder;
13+
import com.github.cadecode.uniboot.framework.api.security.model.SysUserDetails;
1414
import com.github.cadecode.uniboot.framework.api.util.RequestUtil;
1515
import com.github.cadecode.uniboot.framework.api.util.SecurityUtil;
1616
import feign.Client;
@@ -67,7 +67,7 @@ protected void configRequestTemplate(RequestTemplate requestTemplate) {
6767
String userDetailsJson = ServletUtil.getHeader(servletRequest, SecurityConst.HEAD_USER_DETAILS, CharsetUtil.CHARSET_UTF_8);
6868
// 不存在则生成
6969
if (StrUtil.isEmpty(userDetailsJson)) {
70-
SysUserDetailsDto userDetailsDto = SecurityUtil.getUserDetails(null);
70+
SysUserDetails userDetailsDto = SecurityUtil.getUserDetails(null);
7171
userDetailsJson = JacksonUtil.toJson(userDetailsDto);
7272
}
7373
requestTemplate.header(SecurityConst.HEAD_USER_DETAILS, EscapeUtil.escape(userDetailsJson));

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysApiConvert.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.github.cadecode.uniboot.framework.api.convert;
22

33
import com.github.cadecode.uniboot.framework.api.bean.po.SysApi;
4-
import com.github.cadecode.uniboot.framework.api.bean.vo.SysApiVo.SysApiRolesVo;
54
import com.github.cadecode.uniboot.framework.api.request.SysApiRequest.SysApiAddRequest;
65
import com.github.cadecode.uniboot.framework.api.request.SysApiRequest.SysApiUpdateRequest;
76
import org.mapstruct.Mapper;
7+
import org.mapstruct.Mapping;
88
import org.mapstruct.factory.Mappers;
99

1010
/**
@@ -18,10 +18,15 @@ public interface SysApiConvert {
1818

1919
SysApiConvert INSTANCE = Mappers.getMapper(SysApiConvert.class);
2020

21-
SysApiRolesVo poToRolesVo(SysApi po);
22-
21+
@Mapping(target = "updateUser", ignore = true)
22+
@Mapping(target = "updateTime", ignore = true)
23+
@Mapping(target = "createTime", ignore = true)
2324
SysApi requestToPo(SysApiUpdateRequest request);
2425

26+
@Mapping(target = "updateUser", ignore = true)
27+
@Mapping(target = "updateTime", ignore = true)
28+
@Mapping(target = "id", ignore = true)
29+
@Mapping(target = "createTime", ignore = true)
2530
SysApi requestToPo(SysApiAddRequest request);
2631

2732
}

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysDictConvert.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.github.cadecode.uniboot.framework.api.request.SysDictRequest.SysDictAddRequest;
88
import com.github.cadecode.uniboot.framework.api.request.SysDictRequest.SysDictUpdateRequest;
99
import org.mapstruct.Mapper;
10+
import org.mapstruct.Mapping;
1011
import org.mapstruct.factory.Mappers;
1112

1213
import java.util.List;
@@ -23,8 +24,15 @@ public interface SysDictConvert {
2324

2425
List<SysDictPageVo> poToPageVo(List<SysDict> records);
2526

27+
@Mapping(target = "updateUser", ignore = true)
28+
@Mapping(target = "updateTime", ignore = true)
29+
@Mapping(target = "id", ignore = true)
30+
@Mapping(target = "createTime", ignore = true)
2631
SysDict requestToPo(SysDictAddRequest request);
2732

33+
@Mapping(target = "updateUser", ignore = true)
34+
@Mapping(target = "updateTime", ignore = true)
35+
@Mapping(target = "createTime", ignore = true)
2836
SysDict requestToPo(SysDictUpdateRequest request);
2937

3038
List<SysDictGetByTypeVo> poToGetByTypeVo(List<SysDict> dictList);

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysLogConvert.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.cadecode.uniboot.framework.api.convert;
22

3-
import com.github.cadecode.uniboot.framework.api.bean.dto.SysLogDto.SysLogInfoDto;
43
import com.github.cadecode.uniboot.framework.api.bean.po.SysLog;
54
import com.github.cadecode.uniboot.framework.api.bean.vo.SysLogVo.SysLogPageVo;
5+
import com.github.cadecode.uniboot.framework.api.request.SysLogRequest.SysLogSaveRequest;
66
import org.mapstruct.Mapper;
77
import org.mapstruct.factory.Mappers;
88

@@ -19,9 +19,7 @@ public interface SysLogConvert {
1919

2020
SysLogConvert INSTANCE = Mappers.getMapper(SysLogConvert.class);
2121

22-
SysLog dtoToPo(SysLogInfoDto dto);
23-
24-
List<SysLog> dtoToPo(List<SysLogInfoDto> dto);
25-
2622
List<SysLogPageVo> poToVo(List<SysLog> records);
23+
24+
List<SysLog> requestToPo(List<SysLogSaveRequest> requestList);
2725
}

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysMenuConvert.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github.cadecode.uniboot.framework.api.request.SysMenuRequest.SysMenuAddRequest;
66
import com.github.cadecode.uniboot.framework.api.request.SysMenuRequest.SysMenuUpdateRequest;
77
import org.mapstruct.Mapper;
8+
import org.mapstruct.Mapping;
89
import org.mapstruct.factory.Mappers;
910

1011
/**
@@ -18,10 +19,20 @@ public interface SysMenuConvert {
1819

1920
SysMenuConvert INSTANCE = Mappers.getMapper(SysMenuConvert.class);
2021

22+
@Mapping(target = "children", ignore = true)
2123
SysMenuTreeVo toTreeVo(SysMenu sysMenu);
2224

25+
@Mapping(target = "updateUser", ignore = true)
26+
@Mapping(target = "updateTime", ignore = true)
27+
@Mapping(target = "leafFlag", ignore = true)
28+
@Mapping(target = "enableFlag", ignore = true)
29+
@Mapping(target = "createTime", ignore = true)
2330
SysMenu requestToPo(SysMenuUpdateRequest request);
2431

32+
@Mapping(target = "updateUser", ignore = true)
33+
@Mapping(target = "updateTime", ignore = true)
34+
@Mapping(target = "id", ignore = true)
35+
@Mapping(target = "createTime", ignore = true)
2536
SysMenu requestToPo(SysMenuAddRequest request);
2637

2738
}

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysRoleConvert.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github.cadecode.uniboot.framework.api.request.SysRoleRequest.SysRoleAddRequest;
66
import com.github.cadecode.uniboot.framework.api.request.SysRoleRequest.SysRoleUpdateRequest;
77
import org.mapstruct.Mapper;
8+
import org.mapstruct.Mapping;
89
import org.mapstruct.factory.Mappers;
910

1011
import java.util.List;
@@ -24,7 +25,14 @@ public interface SysRoleConvert {
2425

2526
List<SysRoleListVo> poToListVo(List<SysRole> po);
2627

28+
@Mapping(target = "updateUser", ignore = true)
29+
@Mapping(target = "updateTime", ignore = true)
30+
@Mapping(target = "createTime", ignore = true)
2731
SysRole requestToPo(SysRoleUpdateRequest request);
2832

33+
@Mapping(target = "updateUser", ignore = true)
34+
@Mapping(target = "updateTime", ignore = true)
35+
@Mapping(target = "id", ignore = true)
36+
@Mapping(target = "createTime", ignore = true)
2937
SysRole requestToPo(SysRoleAddRequest request);
3038
}

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/convert/SysUserConvert.java‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package com.github.cadecode.uniboot.framework.api.convert;
22

3-
import com.github.cadecode.uniboot.framework.api.bean.dto.SysUserDto.SysUserDetailsDto;
43
import com.github.cadecode.uniboot.framework.api.bean.po.SysUser;
54
import com.github.cadecode.uniboot.framework.api.bean.vo.SysUserVo.SysUserRolesVo;
65
import com.github.cadecode.uniboot.framework.api.request.SysUserRequest.SysUserAddRequest;
76
import com.github.cadecode.uniboot.framework.api.request.SysUserRequest.SysUserModifyInfoRequest;
87
import com.github.cadecode.uniboot.framework.api.request.SysUserRequest.SysUserUpdateRequest;
8+
import com.github.cadecode.uniboot.framework.api.security.model.SysUserDetails;
99
import org.mapstruct.Mapper;
10+
import org.mapstruct.Mapping;
1011
import org.mapstruct.factory.Mappers;
1112

1213
/**
@@ -20,15 +21,32 @@ public interface SysUserConvert {
2021

2122
SysUserConvert INSTANCE = Mappers.getMapper(SysUserConvert.class);
2223

23-
SysUserRolesVo poToRolesVo(SysUser po);
24-
25-
SysUserDetailsDto poToDetailsDto(SysUser po);
26-
27-
SysUserDetailsDto voToDetailsDto(SysUserRolesVo vo);
24+
SysUserDetails voToSysUserDetails(SysUserRolesVo vo);
2825

26+
@Mapping(target = "updateUser", ignore = true)
27+
@Mapping(target = "updateTime", ignore = true)
28+
@Mapping(target = "loginIp", ignore = true)
29+
@Mapping(target = "loginDate", ignore = true)
30+
@Mapping(target = "id", ignore = true)
31+
@Mapping(target = "createTime", ignore = true)
2932
SysUser requestToPo(SysUserAddRequest request);
3033

34+
@Mapping(target = "username", ignore = true)
35+
@Mapping(target = "updateUser", ignore = true)
36+
@Mapping(target = "updateTime", ignore = true)
37+
@Mapping(target = "password", ignore = true)
38+
@Mapping(target = "loginIp", ignore = true)
39+
@Mapping(target = "loginDate", ignore = true)
40+
@Mapping(target = "id", ignore = true)
41+
@Mapping(target = "enableFlag", ignore = true)
42+
@Mapping(target = "createTime", ignore = true)
3143
SysUser requestToPo(SysUserModifyInfoRequest request);
3244

45+
@Mapping(target = "updateUser", ignore = true)
46+
@Mapping(target = "updateTime", ignore = true)
47+
@Mapping(target = "loginIp", ignore = true)
48+
@Mapping(target = "loginDate", ignore = true)
49+
@Mapping(target = "enableFlag", ignore = true)
50+
@Mapping(target = "createTime", ignore = true)
3351
SysUser requestToPo(SysUserUpdateRequest request);
3452
}

‎framework/framework_api/src/main/java/com/github/cadecode/uniboot/framework/api/feignclient/SysApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.github.cadecode.uniboot.framework.api.feignclient;
22

3-
import com.github.cadecode.uniboot.framework.api.bean.vo.SysApiVo.SysApiRolesVo;
43
import com.github.cadecode.uniboot.framework.api.consts.KeyPrefix;
54
import com.github.cadecode.uniboot.framework.api.consts.SvcName;
5+
import com.github.cadecode.uniboot.framework.api.response.SysApiResponse.SysApiRolesResponse;
66
import org.springframework.cache.annotation.Cacheable;
77
import org.springframework.cloud.openfeign.FeignClient;
88
import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +20,6 @@ public interface SysApiClient {
2020

2121
@Cacheable(cacheNames = KeyPrefix.API_ROLES, key = "'all'")
2222
@PostMapping("system/api/list_roles_vo")
23-
List<SysApiRolesVo> listRolesVo();
23+
List<SysApiRolesResponse> listRolesVo();
2424

2525
}

0 commit comments

Comments
 (0)