diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000000000000000000000000000000000000..6ee36ae3cdf4507de6fdb1f85e5fd820830b23eb --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/java/com/fc/v2/controller/AdminController.java b/src/main/java/com/fc/v2/controller/AdminController.java index ddf17c3ec08fb9bd9c7b23e230c7f647de0f0305..45a8b2a0c72ccc0da14196769a4cd786bf47181e 100644 --- a/src/main/java/com/fc/v2/controller/AdminController.java +++ b/src/main/java/com/fc/v2/controller/AdminController.java @@ -42,6 +42,12 @@ public class AdminController extends BaseController { private String prefix = "admin"; + /** + * index首页 + * + * @param request + * @return + */ @ApiOperation(value = "首页", notes = "首页") @GetMapping({"", "/index"}) public String index(HttpServletRequest request) { @@ -52,16 +58,18 @@ public class AdminController extends BaseController { return prefix + "/index"; } - + /** + * 获取菜单 + * + * @return + */ @ApiOperation(value = "获取登录用户菜单栏", notes = "获取登录用户菜单栏") @GetMapping("/getUserMenu") @ResponseBody public List getUserMenu() { - List sysMenus = sysPermissionService.getSysMenus(ShiroUtils.getUserId()); - return sysMenus; + return sysPermissionService.getSysMenus(ShiroUtils.getUserId()); } - /** * 请求到登陆界面 * diff --git a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java index cbfab0e6f7be68d92558502255efd78616bf0c51..6751f6bc1ce68dfc26b9a1562228f0c6cbfd6053 100644 --- a/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java +++ b/src/main/java/com/fc/v2/mapper/auto/TSysPermissionMapper.java @@ -4,6 +4,7 @@ package com.fc.v2.mapper.auto; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fc.v2.model.auto.TSysPermission; +import com.fc.v2.model.custom.SysMenu; /** * 权限Mapper接口 @@ -36,4 +37,11 @@ public interface TSysPermissionMapper extends BaseMapper { */ public List queryRoleId(Long roleid); + /** + * 根据用户id查询菜单 + * + * @param userId + * @return + */ + public List findAllByIdMenu(Long userId); } \ No newline at end of file diff --git a/src/main/java/com/fc/v2/model/custom/Tablepar.java b/src/main/java/com/fc/v2/model/custom/Tablepar.java index e7a3a7acd2e550431c559b73c80c714ff060f6df..f6c8e0e74ce35b7c89b90f7290e70be23518dc61 100644 --- a/src/main/java/com/fc/v2/model/custom/Tablepar.java +++ b/src/main/java/com/fc/v2/model/custom/Tablepar.java @@ -1,12 +1,7 @@ package com.fc.v2.model.custom; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fc.v2.util.ServletUtils; import com.fc.v2.util.StringUtils; -import sun.security.pkcs11.wrapper.Constants; - -import javax.servlet.http.HttpServletRequest; -import javax.xml.ws.spi.http.HttpContext; /** * boostrap table post 参数 diff --git a/src/main/java/com/fc/v2/service/ITSysPermissionService.java b/src/main/java/com/fc/v2/service/ITSysPermissionService.java index 828a33ff10c30a87f38c7962cdea5bac5ea632dc..07adb96ba5557fa19c5cbe1fd5b0b464dac71401 100644 --- a/src/main/java/com/fc/v2/service/ITSysPermissionService.java +++ b/src/main/java/com/fc/v2/service/ITSysPermissionService.java @@ -2,9 +2,9 @@ package com.fc.v2.service; import java.util.List; + import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; - import com.fc.v2.model.auto.TSysPermission; import com.fc.v2.model.custom.SysMenu; import com.fc.v2.model.custom.SysPower; @@ -12,133 +12,130 @@ import org.apache.commons.lang3.tuple.ImmutablePair; /** * 权限Service接口 - * + * * @author zhaonz * @date 2021-08-05 */ public interface ITSysPermissionService extends IService { - /** - * 查询权限 - * - * @param id 权限ID - * @return 权限 - */ - public TSysPermission selectTSysPermissionById(Long id); - - /** - * 查询权限 - * - * @param ids 权限ID - * @return 权限 - */ - public List selectTSysPermissionByIds(List ids); - - /** - * 查询权限列表 - * - * @param queryWrapper 权限 - * @return 权限集合 - */ - public List selectTSysPermissionList(Wrapper queryWrapper); - - /** - * 查询权限列表 - * - * @param tSysPermission 权限 - * @return 权限集合 - */ - public List selectTSysPermissionList(TSysPermission tSysPermission); - - /** - * 新增权限 - * - * @param tSysPermission 权限 - * @return 结果 - */ - public int insertTSysPermission(TSysPermission tSysPermission); - - /** - * 修改权限 - * - * @param tSysPermission 权限 - * @return 结果 - */ - public int updateTSysPermission(TSysPermission tSysPermission); - - /** - * 批量删除权限 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public ImmutablePair deleteTSysPermissionByIds(String ids); - - /** - * 删除权限信息 - * - * @param id 权限ID - * @return 结果 - */ - public int deleteTSysPermissionById(Long id); - - /** - * 检查权限name - * - * @param tsysPermission - * @return - */ - public int checkNameUnique(TSysPermission tsysPermission); - - /** - * 检查权限URL - * - * @param tsysPermission - * @return - */ - public int checkURLUnique(TSysPermission tsysPermission); - - /** - * 检查权限perms字段 - * - * @param tsysPermission - * @return - */ - public int checkPermsUnique(TSysPermission tsysPermission); - - /** - * - * @param roleId - * @return - */ - public List getRolePower(Long roleId); - - /** - * - * @param userid - * @return - */ - public List getall(Long userid); - - /** - * 修改权限状态展示或者不展示 - * - * @param tSysPermission - * @return - */ - public int updateVisible(TSysPermission tSysPermission); - - /** - * 根据用户id查询菜单栏 - * - * @param userId - * @return - */ - public List getSysMenus(Long userId); - - /** - * - * @param rolid - * @return - */ - public List queryRoleId(Long rolid); + /** + * 查询权限 + * + * @param id 权限ID + * @return 权限 + */ + public TSysPermission selectTSysPermissionById(Long id); + + /** + * 查询权限 + * + * @param ids 权限ID + * @return 权限 + */ + public List selectTSysPermissionByIds(List ids); + + /** + * 查询权限列表 + * + * @param queryWrapper 权限 + * @return 权限集合 + */ + public List selectTSysPermissionList(Wrapper queryWrapper); + + /** + * 查询权限列表 + * + * @param tSysPermission 权限 + * @return 权限集合 + */ + public List selectTSysPermissionList(TSysPermission tSysPermission); + + /** + * 新增权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + public int insertTSysPermission(TSysPermission tSysPermission); + + /** + * 修改权限 + * + * @param tSysPermission 权限 + * @return 结果 + */ + public int updateTSysPermission(TSysPermission tSysPermission); + + /** + * 批量删除权限 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public ImmutablePair deleteTSysPermissionByIds(String ids); + + /** + * 删除权限信息 + * + * @param id 权限ID + * @return 结果 + */ + public int deleteTSysPermissionById(Long id); + + /** + * 检查权限name + * + * @param tsysPermission + * @return + */ + public int checkNameUnique(TSysPermission tsysPermission); + + /** + * 检查权限URL + * + * @param tsysPermission + * @return + */ + public int checkURLUnique(TSysPermission tsysPermission); + + /** + * 检查权限perms字段 + * + * @param tsysPermission + * @return + */ + public int checkPermsUnique(TSysPermission tsysPermission); + + /** + * @param roleId + * @return + */ + public List getRolePower(Long roleId); + + /** + * @param userid + * @return + */ + public List getall(Long userid); + + /** + * 修改权限状态展示或者不展示 + * + * @param tSysPermission + * @return + */ + public int updateVisible(TSysPermission tSysPermission); + + /** + * 根据用户id查询菜单栏 + * + * @param userId + * @return + */ + public List getSysMenus(Long userId); + + /** + * @param rolid + * @return + */ + public List queryRoleId(Long rolid); } diff --git a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java index 3ba9fcdd882239dc0a8846a678cc93bba213b559..db19deeaebfabf3346fcbd0318e26a4df5ea0a27 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysAreaServiceImpl.java @@ -65,10 +65,10 @@ public class TSysAreaServiceImpl extends ServiceImpl */ @Override public List selectTSysAreaList(TSysArea tSysArea) { - Map map = BeanUtil.beanToMap(tSysArea, true, true); - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.allEq(map,false); - return this.baseMapper.selectList(queryWrapper); + Map map = BeanUtil.beanToMap(tSysArea, true, true); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.allEq(map, false); + return this.baseMapper.selectList(queryWrapper); } /** diff --git a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java index 4d514eb949bc1e637145b23275c0cf331a513a5c..eeaded2258e46c9739e1902c4983c8d6a995d11a 100644 --- a/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java +++ b/src/main/java/com/fc/v2/service/impl/TSysQuartzJobLogServiceImpl.java @@ -7,6 +7,7 @@ import java.util.Arrays; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,6 +82,7 @@ public class TSysQuartzJobLogServiceImpl extends ServiceImpl + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index fafe9d9763bd9f02e9337af29d603ea6e20c1056..5b6003c3b72b2bf51b8e9ba070151c944b6a2804 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -1,5 +1,6 @@ + 前端展示 diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 404f563405631b4fcaa3b402d39ac7948dbf8e30..af1513bb193ce0c79f0f866b82c69e4794413953 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -1,6 +1,7 @@ + @@ -15,13 +16,13 @@
- +
- +
- +
@@ -39,6 +40,7 @@ let form = layui.form; let $ = layui.jquery; let layer = layui.layer; + form.on('submit(login)', function(data){ $(".login").attr("disabled","disabled") let loader = layer.load(); diff --git a/src/test/java/GetUserMenu.java b/src/test/java/GetUserMenu.java new file mode 100644 index 0000000000000000000000000000000000000000..a9af939435e43cee407ca66d51e3f4194a6e1751 --- /dev/null +++ b/src/test/java/GetUserMenu.java @@ -0,0 +1,19 @@ +import com.fc.v2.model.custom.SysMenu; +import com.fc.v2.service.ITSysPermissionService; +import com.fc.v2.shiro.util.ShiroUtils; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +public class GetUserMenu { + + @Autowired + public ITSysPermissionService sysPermissionService; + + @Test + public void getMenu(){ + List sysMenus = sysPermissionService.getSysMenus(ShiroUtils.getUserId()); + System.out.println(sysMenus.toArray()); + } +}