fangqiao/qiaoba-boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
ailanyin
2023-06-25 17:22:05 +08:00
parent 3fd3a09888
commit caeae9127f
51 changed files with 235 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysDictTypeController.java
View File

@ -41,7 +41,7 @@ public class SysDictTypeController {
@PostMapping("/export")
public void export(HttpServletResponse response, SysDictTypeParam param) throws Exception {
List<SysDictType> list = sysDictTypeService.selectList(param);
ExcelUtil.exportExcel(list, SysDictType.class, "字典类型" , response);
ExcelUtil.exportExcel(list, SysDictType.class, "字典类型", response);
}
@PreAuthorize("hasAuthority('system:dict:query')")

7
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/controller/SysMenuController.java
View File

@ -2,7 +2,6 @@ package com.qiaoba.module.system.controller;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.param.SysMenuParam;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.common.base.result.AjaxResult;
import com.qiaoba.module.system.service.SysMenuService;
import io.swagger.v3.oas.annotations.Operation;
@ -32,7 +31,7 @@ public class SysMenuController {
@GetMapping("/list")
@Operation(summary = "获取列表")
public AjaxResult list(SysMenuParam param) {
List<SysMenuVo> menus = sysMenuService.selectVoList(param);
List<SysMenu> menus = sysMenuService.selectList(param);
return AjaxResult.success(menus);
}
@ -67,7 +66,7 @@ public class SysMenuController {
@GetMapping("/tree-select")
@Operation(summary = "构建菜单树")
public AjaxResult treeSelect(SysMenuParam param) {
List<SysMenuVo> menus = sysMenuService.selectVoList(param);
List<SysMenu> menus = sysMenuService.selectList(param);
return AjaxResult.success(sysMenuService.buildMenuTree(menus));
}
@ -76,7 +75,7 @@ public class SysMenuController {
public AjaxResult roleMenuTreeSelect(@PathVariable("roleId") String roleId) {
AjaxResult ajax = AjaxResult.success();
ajax.put("checkedKeys", sysMenuService.selectMenuIdsByRoleId(roleId));
ajax.put("menus", sysMenuService.buildMenuTree(sysMenuService.selectVoList(new SysMenuParam())));
ajax.put("menus", sysMenuService.buildMenuTree(sysMenuService.selectList(new SysMenuParam())));
return ajax;
}
}

4
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/mapper/SysMenuMapper.java
View File

@ -1,9 +1,9 @@
package com.qiaoba.module.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.common.database.annotations.SelectOneRow;
import com.qiaoba.common.database.mapper.BaseMapperPlus;
import java.util.List;
import java.util.Set;
@ -15,7 +15,7 @@ import java.util.Set;
* @version 1.0
* @since 2023/5/5 11:36
*/
public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenuVo> {
public interface SysMenuMapper extends BaseMapper<SysMenu> {
/**
* 校验菜单名称是否唯一

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysLoginService.java
View File

@ -1,8 +1,6 @@
package com.qiaoba.module.system.service;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.api.system.entity.dto.LoginDto;
import com.qiaoba.common.base.result.AjaxResult;
import java.util.Map;

3
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/SysMenuService.java
View File

@ -1,6 +1,7 @@
package com.qiaoba.module.system.service;
import cn.hutool.core.lang.tree.Tree;
import com.qiaoba.api.system.entity.SysMenu;
import com.qiaoba.api.system.entity.vo.RouterVo;
import com.qiaoba.api.system.entity.vo.SysMenuVo;
import com.qiaoba.api.system.service.SysMenuApiService;
@ -24,7 +25,7 @@ public interface SysMenuService extends SysMenuApiService {
* @param menus 菜单列表
* @return 下拉树结构列表
*/
List<Tree<String>> buildMenuTree(List<SysMenuVo> menus);
List<Tree<String>> buildMenuTree(List<SysMenu> menus);
/**
* 根据角色ID查询菜单树信息

6
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysMenuServiceImpl.java
View File

@ -56,8 +56,8 @@ public class SysMenuServiceImpl implements SysMenuService {
}
@Override
public List<SysMenuVo> selectVoList(SysMenuParam param) {
return sysMenuMapper.selectVoList(param2Wrapper((param)));
public List<SysMenu> selectList(SysMenuParam param) {
return sysMenuMapper.selectList(param2Wrapper((param)));
}
@Override
@ -81,7 +81,7 @@ public class SysMenuServiceImpl implements SysMenuService {
}
@Override
public List<Tree<String>> buildMenuTree(List<SysMenuVo> menus) {
public List<Tree<String>> buildMenuTree(List<SysMenu> menus) {
TreeNodeConfig config = TreeNodeConfig.DEFAULT_CONFIG.setNameKey(BaseConstant.TREE_KEY_NAME);
return TreeUtil.build(menus, BaseConstant.DEFAULT_PARENT_ID_VALUE, config, (menu, tree) ->
tree.setId(menu.getMenuId())

1
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysRoleServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.qiaoba.api.system.entity.dto.DataScopeDto;
import com.qiaoba.api.system.entity.dto.SysRoleDto;
import com.qiaoba.api.system.entity.param.SysRoleParam;
import com.qiaoba.auth.utils.SecurityUtil;
import com.qiaoba.common.base.constants.BaseConstant;
import com.qiaoba.common.base.exceptions.ServiceException;
import com.qiaoba.common.database.entity.PageQuery;
import com.qiaoba.common.database.entity.TableDataInfo;

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserDetailsServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.qiaoba.module.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.api.auth.service.SysUserDetailsApiService;
import com.qiaoba.api.system.entity.SysUser;
import com.qiaoba.auth.constants.SecurityConstant;
import com.qiaoba.auth.entity.LoginUser;
import com.qiaoba.auth.entity.SecurityUser;

1
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserRoleServiceImpl.java
View File

@ -14,7 +14,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

2
qiaoba-modules/qiaoba-module-system/src/main/java/com/qiaoba/module/system/service/impl/SysUserServiceImpl.java
View File

@ -103,7 +103,7 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
@DataScope(userAlias = "u",deptAlias = "t2")
@DataScope(userAlias = "u", deptAlias = "t2")
public TableDataInfo<SysUserVo> selectVoPageList(SysUserParam param, PageQuery pageQuery) {
Page<SysUserVo> page = sysUserMapper.selectVoPageList(pageQuery.build(), param);
return TableDataInfo.build(page);

5
qiaoba-modules/qiaoba-module-system/src/main/resources/mapper/SysConfigMapper.xml
View File

@ -12,8 +12,9 @@
</select>
<select id="selectByIds" resultType="com.qiaoba.api.system.entity.SysConfig">
select config_id, config_name, config_key, config_value, config_type, create_user, create_time, update_user, update_time, remark
from sys_config where config_id in
select config_id, config_name, config_key, config_value, config_type, create_user, create_time, update_user,
update_time, remark
from sys_config where config_id in
<foreach item="configId" collection="list" open="(" separator="," close=")">
#{configId}
</foreach>