ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 10:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: continew-starter 1.4.1-SNAPSHOT => 1.5.0-SNAPSHOT

Browse Source 
1.适配 ContiNew Starter IService 包结构优化
2.解决部分冲突
This commit is contained in:
Charles7c
2024-02-21 22:34:11 +08:00
parent 976e9c43df
commit 17fc5266ff
16 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/auth/service/impl/LoginServiceImpl.java
View File

@@ -153,7 +153,7 @@ public class LoginServiceImpl implements LoginService {
// 查询菜单列表
Set<MenuResp> menuSet = new LinkedHashSet<>();
if (roleCodeSet.contains(SysConstants.ADMIN_ROLE_CODE)) {
menuSet.addAll(menuService.list());
menuSet.addAll(menuService.listAll());
} else {
roleCodeSet.forEach(roleCode -> menuSet.addAll(menuService.listByRoleCode(roleCode)));
}

6
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/query/MenuQuery.java
View File

@@ -18,6 +18,7 @@ package top.charles7c.continew.admin.system.model.query;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.NoArgsConstructor;
import top.charles7c.continew.starter.data.core.annotation.Query;
import top.charles7c.continew.starter.data.core.enums.QueryType;
@@ -31,6 +32,7 @@ import java.io.Serializable;
* @since 2023/2/15 20:21
*/
@Data
@NoArgsConstructor
@Schema(description = "菜单查询条件")
public class MenuQuery implements Serializable {
@@ -49,4 +51,8 @@ public class MenuQuery implements Serializable {
*/
@Schema(description = "状态（1：启用；2：禁用）", example = "1")
private Integer status;
public MenuQuery(Integer status) {
this.status = status;
}
}

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/AnnouncementService.java
View File

@@ -23,7 +23,7 @@ import top.charles7c.continew.admin.system.model.resp.AnnouncementDetailResp;
import top.charles7c.continew.admin.system.model.resp.AnnouncementResp;
import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import java.util.List;

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DeptService.java
View File

@@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.DeptReq;
import top.charles7c.continew.admin.system.model.resp.DeptDetailResp;
import top.charles7c.continew.admin.system.model.resp.DeptResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
/**
* 部门业务接口

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictItemService.java
View File

@@ -23,7 +23,7 @@ import top.charles7c.continew.admin.system.model.req.DictItemReq;
import top.charles7c.continew.admin.system.model.resp.DictItemDetailResp;
import top.charles7c.continew.admin.system.model.resp.DictItemResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import java.io.Serializable;
import java.util.List;

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/DictService.java
View File

@@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.DictReq;
import top.charles7c.continew.admin.system.model.resp.DictDetailResp;
import top.charles7c.continew.admin.system.model.resp.DictResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
/**
* 字典业务接口

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/FileService.java
View File

@@ -22,8 +22,8 @@ import top.charles7c.continew.admin.system.model.entity.FileDO;
import top.charles7c.continew.admin.system.model.query.FileQuery;
import top.charles7c.continew.admin.system.model.req.FileReq;
import top.charles7c.continew.admin.system.model.resp.FileResp;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import java.util.List;

9
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/MenuService.java
View File

@@ -21,7 +21,7 @@ import top.charles7c.continew.admin.system.model.query.MenuQuery;
import top.charles7c.continew.admin.system.model.req.MenuReq;
import top.charles7c.continew.admin.system.model.resp.MenuResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import java.util.List;
import java.util.Set;
@@ -34,6 +34,13 @@ import java.util.Set;
*/
public interface MenuService extends BaseService<MenuResp, MenuResp, MenuQuery, MenuReq>, IService<MenuDO> {
/**
* 查询全部菜单
*
* @return 菜单列表
*/
List<MenuResp> listAll();
/**
* 根据用户 ID 查询
*

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/RoleService.java
View File

@@ -24,7 +24,7 @@ import top.charles7c.continew.admin.system.model.req.RoleReq;
import top.charles7c.continew.admin.system.model.resp.RoleDetailResp;
import top.charles7c.continew.admin.system.model.resp.RoleResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import java.util.List;
import java.util.Set;

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/StorageService.java
View File

@@ -22,7 +22,7 @@ import top.charles7c.continew.admin.system.model.req.StorageReq;
import top.charles7c.continew.admin.system.model.resp.StorageDetailResp;
import top.charles7c.continew.admin.system.model.resp.StorageResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
/**
* 存储库业务接口

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/UserService.java
View File

@@ -26,7 +26,7 @@ import top.charles7c.continew.admin.system.model.req.UserRoleUpdateReq;
import top.charles7c.continew.admin.system.model.resp.UserDetailResp;
import top.charles7c.continew.admin.system.model.resp.UserResp;
import top.charles7c.continew.starter.extension.crud.service.BaseService;
import top.charles7c.continew.starter.extension.crud.service.IService;
import top.charles7c.continew.starter.data.mybatis.plus.service.IService;
import java.util.List;

14
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/MenuServiceImpl.java
View File

@@ -71,6 +71,12 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
super.delete(ids);
}
@Override
@Cached(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX)
public List<MenuResp> listAll() {
return super.list(new MenuQuery(DisEnableStatusEnum.ENABLE.getValue()), null);
}
@Override
public Set<String> listPermissionByUserId(Long userId) {
return baseMapper.selectPermissionByUserId(userId);
@@ -85,14 +91,6 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, MenuDO, MenuRes
return list;
}
@Override
@Cached(key = "'ALL'", name = CacheConstants.MENU_KEY_PREFIX)
public List<MenuResp> list() {
MenuQuery menuQuery = new MenuQuery();
menuQuery.setStatus(DisEnableStatusEnum.ENABLE.getValue());
return super.list(menuQuery, null);
}
/**
* 名称是否存在
*

2
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/RoleServiceImpl.java
View File

@@ -132,7 +132,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleRes
if (obj instanceof RoleDetailResp detail) {
Long roleId = detail.getId();
if (SysConstants.ADMIN_ROLE_CODE.equals(detail.getCode())) {
List<MenuResp> list = menuService.list(null, null);
List<MenuResp> list = menuService.listAll();
List<Long> menuIds = list.stream().map(MenuResp::getId).toList();
detail.setMenuIds(menuIds);
} else {