clay/fateverse
2
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

refactor(core): 统一实体类引用并优化依赖配置

Browse Source
This commit is contained in:
lsym004933
2026-01-13 19:58:25 +08:00
parent 39c20b61e0
commit 5730ae5046
33 changed files with 75 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin/admin-api/src/main/java/cn/fateverse/admin/vo/DictDataVo.java
View File

@@ -7,6 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -73,7 +74,7 @@ public class DictDataVo implements Serializable {
@ApiModelProperty(value = "创建时间")
private Date createTime;
private LocalDateTime createTime;
}

3
admin/admin-api/src/main/java/cn/fateverse/admin/vo/PostVo.java
View File

@@ -8,6 +8,7 @@ import lombok.Builder;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -53,7 +54,7 @@ public class PostVo {
* 创建时间
*/
@JsonFormat(locale = "zh",timezone = "GMT+8",pattern = "yyyy-MM-dd")
private Date createTime;
private LocalDateTime createTime;
public static PostVo toPostVo(Post post){
return PostVo.builder()

5
admin/admin-api/src/main/java/cn/fateverse/admin/vo/RoleVo.java
View File

@@ -8,6 +8,7 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.Set;
@@ -60,8 +61,8 @@ public class RoleVo {
@ApiModelProperty("部门组（数据权限）")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Long[] deptIds;
private Date createTime;
private Date updateTime;
private LocalDateTime createTime;
private LocalDateTime updateTime;
public static RoleVo toRoleVo(Role role){
return RoleVo.builder()

4
admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserChooseVo.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.vo;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.admin.entity.Dept;
import cn.fateverse.common.core.entity.Dept;
import cn.fateverse.common.core.entity.Role;
import lombok.Builder;
import lombok.Data;

2
admin/admin-api/src/main/java/cn/fateverse/admin/vo/UserDetailVo.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.vo;
import cn.fateverse.admin.entity.User;
import cn.fateverse.common.core.entity.Option;
import cn.fateverse.common.core.entity.User;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;

2
admin/admin-biz/pom.xml
View File

@@ -24,7 +24,7 @@
</dependency>
<dependency>
<groupId>cn.fateverse</groupId>
<artifactId>common-mybatis-puls</artifactId>
<artifactId>common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>cn.fateverse</groupId>

4
admin/admin-biz/src/main/java/cn/fateverse/admin/controller/RoleController.java
View File

@@ -1,8 +1,8 @@
package cn.fateverse.admin.controller;
import cn.fateverse.admin.dto.RoleDto;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.admin.entity.User;
import cn.fateverse.common.core.entity.Role;
import cn.fateverse.common.core.entity.User;
import cn.fateverse.admin.query.RoleQuery;
import cn.fateverse.admin.vo.RoleVo;
import cn.fateverse.common.core.entity.IdWrapper;

2
admin/admin-biz/src/main/java/cn/fateverse/admin/dubbo/DubboRoleServiceImpl.java
View File

@@ -1,6 +1,6 @@
package cn.fateverse.admin.dubbo;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.common.core.entity.Role;
import cn.fateverse.admin.mapper.RoleMapper;
import cn.fateverse.admin.query.RoleQuery;
import org.apache.dubbo.config.annotation.DubboService;

5
admin/admin-biz/src/main/java/cn/fateverse/admin/dubbo/DubboUserServiceImpl.java
View File

@@ -1,9 +1,10 @@
package cn.fateverse.admin.dubbo;
import cn.fateverse.admin.entity.User;
import cn.fateverse.admin.service.UserService;
import cn.fateverse.admin.vo.UserVo;
import cn.fateverse.common.core.entity.User;
import cn.fateverse.common.core.exception.CustomException;
import cn.fateverse.common.security.dubbo.DubboUserSearchService;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboService;
@@ -15,7 +16,7 @@ import java.util.List;
*/
@Slf4j
@DubboService
public class DubboUserServiceImpl implements DubboUserService {
public class DubboUserServiceImpl implements DubboUserService, DubboUserSearchService {
private final UserService userService;

2
admin/admin-biz/src/main/java/cn/fateverse/admin/mapper/RoleMapper.java
View File

@@ -1,6 +1,6 @@
package cn.fateverse.admin.mapper;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.common.core.entity.Role;
import cn.fateverse.admin.query.RoleQuery;
import org.apache.ibatis.annotations.Param;

3
admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/DictDataServiceImpl.java
View File

@@ -9,9 +9,8 @@ import cn.fateverse.admin.mapper.DictDataMapper;
import cn.fateverse.admin.service.DictCacheService;
import cn.fateverse.admin.service.DictDataService;
import cn.fateverse.common.core.entity.Option;
import cn.fateverse.common.core.exception.CustomException;
import cn.fateverse.common.core.result.page.TableDataInfo;
import cn.fateverse.common.mybatis.utils.PageUtils;
import cn.fateverse.common.mybatisplus.utils.PageUtils;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;

2
admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/MenuServiceImpl.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.service.impl;
import cn.fateverse.admin.dto.MenuDto;
import cn.fateverse.admin.entity.User;
import cn.fateverse.common.core.entity.User;
import cn.fateverse.admin.vo.MenuSimpVo;
import cn.fateverse.admin.vo.MenuVo;
import cn.fateverse.admin.vo.OptionMenuVo;

2
admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/RoleServiceImpl.java
View File

@@ -1,7 +1,7 @@
package cn.fateverse.admin.service.impl;
import cn.fateverse.admin.dto.RoleDto;
import cn.fateverse.admin.entity.Role;
import cn.fateverse.common.core.entity.Role;
import cn.fateverse.admin.query.RoleQuery;
import cn.fateverse.admin.vo.RoleVo;
import cn.fateverse.admin.entity.RoleMenu;