submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysConfigController.java

@@ -1,12 +1,15 @@
 package com.zhongzheng.controller.top;
 
 import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.annotation.RepeatSubmit;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
+import com.zhongzheng.modules.top.service.ITopSysConfigService;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -15,6 +18,8 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Controller
  * 
@@ -27,7 +32,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/system/top/config")
 public class TopSysConfigController extends BaseController {
     @Autowired
-    private ISysConfigService configService;
+    private ITopSysConfigService topConfigService;
 
     /**
      * 获取参数配置列表
@@ -35,10 +40,10 @@ public class TopSysConfigController extends BaseController {
     @ApiOperation("配置列表")
     @PreAuthorize("@ss.hasPermi('system:config:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysConfigVo config)
+    public TableDataInfo list(TopSysConfigVo config)
     {
         startPage();
-        List<SysConfigVo> list = configService.selectConfigList(config);
+        List<TopSysConfigVo> list = topConfigService.selectConfigList(config);
         return getDataTable(list);
     }
 
@@ -47,7 +52,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(SysConfig config)
     {
-        List<SysConfig> list = configService.selectConfigList(config);
+        List<SysConfig> list = topConfigService.selectConfigList(config);
         ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
         return util.exportExcel(list, "参数数据");
     }*/
@@ -60,7 +65,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping(value = "/{configId}")
     public AjaxResult getInfo(@PathVariable Long configId)
     {
-        return AjaxResult.success(configService.selectConfigById(configId));
+        return AjaxResult.success(topConfigService.selectConfigById(configId));
     }
 
     /**
@@ -70,7 +75,7 @@ public class TopSysConfigController extends BaseController {
     @GetMapping(value = "/configKey/{configKey}")
     public AjaxResult getConfigKey(@PathVariable String configKey)
     {
-        return AjaxResult.success("配置内容",configService.selectConfigByKey(configKey));
+        return AjaxResult.success("配置内容",topConfigService.selectConfigByKey(configKey));
     }
 
     /**
@@ -81,14 +86,14 @@ public class TopSysConfigController extends BaseController {
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
     @RepeatSubmit
-    public AjaxResult add(@Validated @RequestBody SysConfigVo config)
+    public AjaxResult add(@Validated @RequestBody TopSysConfigVo config)
     {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
         {
             return AjaxResult.error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(configService.insertConfig(config));
+        return toAjax(topConfigService.insertConfig(config));
     }
 
     /**
@@ -98,14 +103,14 @@ public class TopSysConfigController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:config:edit')")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysConfigVo config)
+    public AjaxResult edit(@Validated @RequestBody TopSysConfigVo config)
     {
-        if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
+        if (UserConstants.NOT_UNIQUE.equals(topConfigService.checkConfigKeyUnique(config)))
         {
             return AjaxResult.error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
         config.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(configService.updateConfig(config));
+        return toAjax(topConfigService.updateConfig(config));
     }
 
     /**
@@ -117,7 +122,7 @@ public class TopSysConfigController extends BaseController {
     @DeleteMapping("/{configIds}")
     public AjaxResult remove(@PathVariable Long[] configIds)
     {
-        return toAjax(configService.deleteConfigByIds(configIds));
+        return toAjax(topConfigService.deleteConfigByIds(configIds));
     }
 
     /**
@@ -129,7 +134,7 @@ public class TopSysConfigController extends BaseController {
     @DeleteMapping("/clearCache")
     public AjaxResult clearCache()
     {
-        configService.clearCache();
+        topConfigService.clearCache();
         return AjaxResult.success();
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysDeptController.java

@@ -1,16 +1,27 @@
 package com.zhongzheng.controller.top;
 
+import cn.hutool.core.util.StrUtil;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.service.ITopSysDeptService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -25,7 +36,7 @@ import java.util.Map;
 @RequestMapping("/system/top/dept")
 public class TopSysDeptController extends BaseController {
     @Autowired
-    private ISysDeptService deptService;
+    private ITopSysDeptService topDeptService;
 
     /**
      * 获取部门列表
@@ -33,9 +44,9 @@ public class TopSysDeptController extends BaseController {
     @ApiOperation("部门列表")
     @PreAuthorize("@ss.hasPermi('system:dept:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysDept dept)
+    public AjaxResult list(TopSysDept dept)
     {
-        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
         return AjaxResult.success(depts);
     }
 
@@ -47,11 +58,11 @@ public class TopSysDeptController extends BaseController {
     @GetMapping("/list/exclude/{deptId}")
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Iterator<SysDept> it = depts.iterator();
+        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
+        Iterator<TopSysDept> it = depts.iterator();
         while (it.hasNext())
         {
-            SysDept d = (SysDept) it.next();
+            TopSysDept d = (TopSysDept) it.next();
             if (d.getDeptId().intValue() == deptId
                     || ArrayUtils.contains(StrUtil.split(d.getAncestors(), ","), deptId + ""))
             {
@@ -69,7 +80,7 @@ public class TopSysDeptController extends BaseController {
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
-        return AjaxResult.success(deptService.selectDeptById(deptId));
+        return AjaxResult.success(topDeptService.selectDeptById(deptId));
     }
 
     /**
@@ -77,10 +88,10 @@ public class TopSysDeptController extends BaseController {
      */
     @ApiOperation("获取部门下拉树列表")
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysDept dept)
+    public AjaxResult treeselect(TopSysDept dept)
     {
-        List<SysDept> depts = deptService.selectDeptList(dept);
-        return AjaxResult.success(deptService.buildDeptTreeSelect(depts));
+        List<TopSysDept> depts = topDeptService.selectDeptList(dept);
+        return AjaxResult.success(topDeptService.buildDeptTreeSelect(depts));
     }
 
     /**
@@ -90,10 +101,10 @@ public class TopSysDeptController extends BaseController {
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
     public AjaxResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
     {
-        List<SysDept> depts = deptService.selectDeptList(new SysDept());
+        List<TopSysDept> depts = topDeptService.selectDeptList(new TopSysDept());
         Map<String,Object> map = new HashMap<>();
-        map.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
-        map.put("depts", deptService.buildDeptTreeSelect(depts));
+        map.put("checkedKeys", topDeptService.selectDeptListByRoleId(roleId));
+        map.put("depts", topDeptService.buildDeptTreeSelect(depts));
         return AjaxResult.success(map);
     }
 
@@ -105,14 +116,14 @@ public class TopSysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:add')")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDept dept)
+    public AjaxResult add(@Validated @RequestBody TopSysDept dept)
     {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.insertDept(dept));
+        return toAjax(topDeptService.insertDept(dept));
     }
 
     /**
@@ -122,9 +133,9 @@ public class TopSysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:dept:edit')")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysDept dept)
+    public AjaxResult edit(@Validated @RequestBody TopSysDept dept)
     {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
+        if (UserConstants.NOT_UNIQUE.equals(topDeptService.checkDeptNameUnique(dept)))
         {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
@@ -133,12 +144,12 @@ public class TopSysDeptController extends BaseController {
             return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }
         else if (StrUtil.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
+                && topDeptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
         {
             return AjaxResult.error("该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(deptService.updateDept(dept));
+        return toAjax(topDeptService.updateDept(dept));
     }
 
     /**
@@ -150,14 +161,14 @@ public class TopSysDeptController extends BaseController {
     @PostMapping("/delete")
     public AjaxResult remove(@PathVariable Long deptId)
     {
-        if (deptService.hasChildByDeptId(deptId))
+        if (topDeptService.hasChildByDeptId(deptId))
         {
             return AjaxResult.error("存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
+        if (topDeptService.checkDeptExistUser(deptId))
         {
             return AjaxResult.error("部门存在用户,不允许删除");
         }
-        return toAjax(deptService.deleteDeptById(deptId));
+        return toAjax(topDeptService.deleteDeptById(deptId));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysMenuController.java

@@ -7,13 +7,13 @@ import com.zhongzheng.common.constant.Constants;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.framework.web.service.TokenService;
-import com.zhongzheng.modules.system.service.ISysMenuService;
+import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.service.ITopSysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -36,7 +36,7 @@ import java.util.List;
 @RequestMapping("/system/top/menu")
 public class TopSysMenuController extends BaseController {
     @Autowired
-    private ISysMenuService menuService;
+    private ITopSysMenuService topMenuService;
 
     @Autowired
     private TokenService tokenService;
@@ -47,11 +47,11 @@ public class TopSysMenuController extends BaseController {
     @ApiOperation("获取菜单列表")
     @PreAuthorize("@ss.hasPermi('system:menu:list')")
     @GetMapping("/list")
-    public AjaxResult list(SysMenu menu)
+    public AjaxResult list(TopSysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
+        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
         return AjaxResult.success(menus);
     }
 
@@ -63,7 +63,7 @@ public class TopSysMenuController extends BaseController {
     @GetMapping(value = "/{menuId}")
     public AjaxResult getInfo(@PathVariable Long menuId)
     {
-        return AjaxResult.success(menuService.selectMenuById(menuId));
+        return AjaxResult.success(topMenuService.selectMenuById(menuId));
     }
 
     /**
@@ -72,12 +72,12 @@ public class TopSysMenuController extends BaseController {
     @ApiOperation("获取菜单下拉树列表")
     @ApiOperationSupport(includeParameters = {})
     @GetMapping("/treeselect")
-    public AjaxResult treeselect(SysMenu menu)
+    public AjaxResult treeselect(TopSysMenu menu)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long userId = loginUser.getUser().getUserId();
-        List<SysMenu> menus = menuService.selectMenuList(menu, userId);
-        return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
+        List<TopSysMenu> menus = topMenuService.selectMenuList(menu, userId);
+        return AjaxResult.success(topMenuService.buildMenuTreeSelect(menus));
     }
 
     /**
@@ -88,10 +88,10 @@ public class TopSysMenuController extends BaseController {
     public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
     {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+        List<TopSysMenu> menus = topMenuService.selectMenuList(loginUser.getUser().getUserId());
         AjaxResult ajax = AjaxResult.success();
-        ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
-        ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+        ajax.put("checkedKeys", topMenuService.selectMenuListByRoleId(roleId));
+        ajax.put("menus", topMenuService.buildMenuTreeSelect(menus));
         return ajax;
     }
 
@@ -104,9 +104,9 @@ public class TopSysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:add')")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysMenu menu)
+    public AjaxResult add(@Validated @RequestBody TopSysMenu menu)
     {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
         {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -116,7 +116,7 @@ public class TopSysMenuController extends BaseController {
             return AjaxResult.error("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
         menu.setCreateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.insertMenu(menu));
+        return toAjax(topMenuService.insertMenu(menu));
     }
 
     /**
@@ -128,9 +128,9 @@ public class TopSysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:edit')")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
+    public AjaxResult edit(@Validated @RequestBody TopSysMenu menu)
     {
-        if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
+        if (UserConstants.NOT_UNIQUE.equals(topMenuService.checkMenuNameUnique(menu)))
         {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         }
@@ -144,7 +144,7 @@ public class TopSysMenuController extends BaseController {
             return AjaxResult.error("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
         }
         menu.setUpdateBy(SecurityUtils.getUsername());
-        return toAjax(menuService.updateMenu(menu));
+        return toAjax(topMenuService.updateMenu(menu));
     }
 
     /**
@@ -156,14 +156,14 @@ public class TopSysMenuController extends BaseController {
     @PostMapping("/delete/{menuId}")
     public AjaxResult remove(@PathVariable Long menuId)
     {
-        if (menuService.hasChildByMenuId(menuId))
+        if (topMenuService.hasChildByMenuId(menuId))
         {
             return AjaxResult.error("存在子菜单,不允许删除");
         }
-        if (menuService.checkMenuExistRole(menuId))
+        if (topMenuService.checkMenuExistRole(menuId))
         {
             return AjaxResult.error("菜单已分配,不允许删除");
         }
-        return toAjax(menuService.deleteMenuById(menuId));
+        return toAjax(topMenuService.deleteMenuById(menuId));
     }
 }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleController.java

@@ -6,8 +6,7 @@ import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.domain.entity.SysRole;
-import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.enums.BusinessType;
 import com.zhongzheng.common.utils.SecurityUtils;
@@ -15,6 +14,7 @@ import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
 import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.framework.web.service.TopSysPermissionService;
+import com.zhongzheng.modules.top.domain.TopSysRole;
 import com.zhongzheng.modules.top.service.ITopSysRoleService;
 import com.zhongzheng.modules.top.service.ITopSysUserService;
 import io.swagger.annotations.Api;
@@ -53,20 +53,20 @@ public class TopSysRoleController extends BaseController {
     @ApiOperation("角色列表")
     @PreAuthorize("@ss.hasPermi('system:role:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysRole role)
+    public TableDataInfo list(TopSysRole role)
     {
         startPage();
-        List<SysRole> list = topSysRoleService.selectRoleList(role);
+        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
         return getDataTable(list);
     }
 
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @GetMapping("/export")
-    public AjaxResult export(SysRole role)
+    public AjaxResult export(TopSysRole role)
     {
-        List<SysRole> list = topSysRoleService.selectRoleList(role);
-        ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+        List<TopSysRole> list = topSysRoleService.selectRoleList(role);
+        ExcelUtil<TopSysRole> util = new ExcelUtil<TopSysRole>(TopSysRole.class);
         return util.exportExcel(list, "角色数据");
     }
 
@@ -90,7 +90,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:add')")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysRole role)
+    public AjaxResult add(@Validated @RequestBody TopSysRole role)
     {
         if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
         {
@@ -112,7 +112,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@Validated @RequestBody SysRole role)
+    public AjaxResult edit(@Validated @RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         if (UserConstants.NOT_UNIQUE.equals(topSysRoleService.checkRoleNameUnique(role)))
@@ -128,12 +128,12 @@ public class TopSysRoleController extends BaseController {
         if (topSysRoleService.updateRole(role) > 0)
         {
             // 更新缓存用户权限
-            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            TopLoginUser loginUser = tokenService.getTopLoginUser(ServletUtils.getRequest());
             if (Validator.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
             {
                 loginUser.setPermissions(topSysPermissionService.getMenuPermission(loginUser.getUser()));
                 loginUser.setUser(topSysUserService.selectUserByUserName(loginUser.getUser().getUserName()));
-                tokenService.setLoginUser(loginUser);
+                tokenService.setTopLoginUser(loginUser);
             }
             return AjaxResult.success();
         }
@@ -147,7 +147,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role)
+    public AjaxResult dataScope(@RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         return toAjax(topSysRoleService.authDataScope(role));
@@ -160,7 +160,7 @@ public class TopSysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PostMapping("/changeStatus")
-    public AjaxResult changeStatus(@RequestBody SysRole role)
+    public AjaxResult changeStatus(@RequestBody TopSysRole role)
     {
         topSysRoleService.checkRoleAllowed(role);
         role.setUpdateBy(SecurityUtils.getUsername());

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysRoleMenuController.java

@@ -1,22 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "【请填写功能名称】控制器", tags = {"【请填写功能名称】管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/menu")
-public class TopSysRoleMenuController extends BaseController {
-
-}

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserController.java

@@ -118,7 +118,7 @@ public class TopSysUserController extends BaseController
         AjaxResult ajax = AjaxResult.success();
         List<TopSysRole> roles = topSysRoleService.selectRoleAll();
         TopSysUser sysUser = topSysUserService.selectUserById(userId);
-        ajax.put("roles", TopSysUser.isAdmin(sysUser.getUserId()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("roles", TopSysUser.isAdmin(sysUser.getUserName()) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", topSysPostService.selectPostAll());
         if (Validator.isNotNull(userId))
         {

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/top/TopSysUserRoleController.java

@@ -1,21 +0,0 @@
-package com.zhongzheng.controller.top;
-
-import com.zhongzheng.common.core.controller.BaseController;
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 用户和角色关联Controller
- * 
- * @author ruoyi
- * @date 2023-03-10
- */
-@Api(value = "用户和角色关联控制器", tags = {"用户和角色关联管理"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RestController
-@RequestMapping("/system/top/role")
-public class TopSysUserRoleController extends BaseController {
-}

zhongzheng-admin-saas/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+                url: jdbc:mysql://192.168.1.222:3306/zz_edu_saas?rewriteBatchedStatements=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
                 username: root
-                password: zhongzheng2021
+                password:  zhongzheng2021
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -85,13 +85,65 @@ aliyun:
         bucketName: zhongzheng-test # oss的存储空间
         policy:
             expire: 30 # 签名有效期(S)
-        maxSize: 10 # 上传文件大小(M)
+        maxSize: 100 # 上传文件大小(M)
         callback: http://120.79.166.78:19004/aliyun/oss/callback # 文件上传成功后的回调地址
         dir:
             prefix: oss/images/ # 上传文件夹路径前缀 `
+
 poliv:
     token:
         userid: d5f6d309fe
         writetoken: 8f14a371-9d02-4ec1-922d-54d7b4f79dca
         readtoken: f2c397b4-e2a3-46dc-9266-e6a43ac26a35
         secretkey: xpPrYdcbA1
+
+wx:
+    small:
+        appid: wxd3c8ae80cf43a305
+        appsecret: 193a001ebfd46f227008a21e9d13e750
+    gzh:
+        appid: wx6f48f721d18244eb
+        appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
+        studyNoteTpId: DndIixcAp15Sqgb4KOGTMf73VLF09NlCUifPSel5Y_s
+        qdyTpId: s981yq3SyIODNUEXFzVSWn0OYj90E72aKdtKtSp05_E
+        qdySubTpId: gzE6zddD7OzDLUtOO4GfU-KPCxpMqWFhCj86uXExqB8
+        qdySubStatusTpId: 7oKaAHmc4P7jqfonuiM1wnjfNLh9T662Ywm1OAFaUFA
+        qdyExamTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
+        qdyExamStatusTpId: J7nNogGhD38OD20gI-3CzwawfEMu7lOjR8fsi4LgJ5g
+        signatureTpId: 66LitnYp0AIWFclo0rLdyLQP4-_vVc4pM95fyFs6l-c
+    wepay:
+        mchid: 1342013901
+        key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        appsecret: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
+        notifyUrl: http://120.79.166.78:19012/wx/pay/callback
+    scanLogin:
+        host: https://testm.xyyxt.net/
+
+wisdomExamRoom:
+    mchid: 10001
+    appid: ZZ-YXT-GZ-20220820-0001
+    app_secret: mt70O1s/Xd5LwuH7yHLpj9R+tKUn5j9vTnCvmgBnbJDA11Hpl7+q4lEZliqPAjN+YHPn9bGmHkAbw5XwhhMiYg==
+    host:  http://bg.sam457.site:9020
+
+certificate:
+    host: http://192.168.1.38:8000/
+
+liveGotoURL: http://120.79.166.78:19014/
+
+enCodeVersion: develop
+
+oldStudySys:
+    syncPath: http://gdxypx.xy.com/System/BussinessApi/PostUserStudyRecords
+    sharePath: http://192.168.1.210:8086/witsystem/dataapi/SaleOrder
+    shareCanclePath: http://192.168.1.210:8086/witsystem/dataapi/ordercance
+    searchGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCount
+    pushGradeCount: http://gdxypx.xy.com/System/BussinessApi/OfficialGradeCountAuto
+    educationalInspector: http://192.168.1.210/EduSystem/BusinessApi/NewYxtUserPrompt
+    classUserListPath: http://gdxypx.xy.com/System/BussinessApi/UserCourseCategoryListcno
+    classOpenPath: http://gdxypx.xy.com/System/BussinessApi/OpenClass
+
+officialPush:
+    infoPath: http://jypt-dev.gdcic.net/organjxjy/ShangBaoMingdan
+    periodPath: http://jypt-dev.gdcic.net/organjxjy/XueshiShenqing
+    infoAccount: peixunjigou
+    token: 0ca175b9c0f726a831d895e26933246

zhongzheng-admin-saas/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 zhongzheng:
   # 名称
-  name: zhongzheng-admin-saas
+  name: zhongzheng
   # 版本
   version: 3.4.0
   # 版权年份
@@ -61,6 +61,9 @@ logging:
 
 # Spring配置
 spring:
+  mvc:
+    async:
+      request-timeout: 30000
   main:
     allow-bean-definition-overriding: true
   # 资源信息
@@ -71,11 +74,11 @@ spring:
     active: @profiles.active@
   # 文件上传
   servlet:
-     multipart:
-       # 单个文件大小
-       max-file-size:  10MB
-       # 设置总上传的文件大小
-       max-request-size:  20MB
+    multipart:
+      # 单个文件大小
+      max-file-size:  10MB
+      # 设置总上传的文件大小
+      max-request-size:  20MB
   # 服务模块
   devtools:
     restart:
@@ -109,12 +112,12 @@ management:
 
 # token配置
 token:
-    # 令牌自定义标识
-    header: AuthorizationToken
-    # 令牌密钥
-    secret: abcdefghijklmnopqrstuvwxyz
-    # 令牌有效期（默认30分钟）
-    expireTime: 360
+  # 令牌自定义标识
+  header: AuthorizationToken
+  # 令牌密钥
+  secret: abcdefghijklmnopqrstuvwxyz
+  # 令牌有效期（默认30分钟）
+  expireTime: 360
 
 # MyBatis配置
 # https://baomidou.com/config/
@@ -138,6 +141,7 @@ mybatis-plus:
   executorType: SIMPLE
   # 指定外部化 MyBatis Properties 配置，通过该配置可以抽离配置，实现不同环境的配置部署
   configurationProperties: null
+  typeHandlersPackage: com.zhongzheng.common.type
   configuration:
     # 自动驼峰命名规则（camel case）映射
     # 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
@@ -205,20 +209,23 @@ mybatis-plus:
       selectStrategy: NOT_EMPTY
   # 开启多租户
   tenant:
-    enabled-tenant: false
+    enabled-tenant: true
 # PageHelper分页插件
 pagehelper:
   helperDialect: mysql
   reasonable: true
   supportMethodsArguments: true
   params: count=countSql
-
 # Swagger配置
 swagger:
   # 是否开启swagger
   enabled: true
   # 请求前缀
   pathMapping:
+knife4j:
+  enable: true
+  setting:
+    enableFooter: false
 
 # 防止XSS攻击
 xss:
@@ -241,23 +248,17 @@ feign:
   hystrix:
     enabled: true
 
-wx:
-  small:
-    appid: wx8295c6fa6b0b3106
-    appsecret: 2a95e366da4c4b17a3963e9756b878fd
-  gzh:
-    appid: wx6f48f721d18244eb
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-  wepay:
-    mchid: 1342013901
-    key: GdXyPxYjZx1234123yJzXgDxYpXyjpx9
-    appsecret: 2f8b2b4ff66e2f6adfb9f08ae22d7474
-    notifyUrl: http://42.192.164.187:19005/wx/pay/callback
+poliv:
+  sdk:
+    userid: egsxlptzdq
+    appId: ezl5uy4zei
+    appSecret: 2bf5bb3c31d34531943df10284edd50b
 
 tencent:
   cloud:
     SecretId: AKIDd6XkjTw9D1atwkJceS2NSIuHPK1ThfOr
     SecretKey: GG2ZqrdCWcS6Yx72h6F7k7E4ey2qPnwq
+
 aliyun:
   sms:
     signName: 祥粤学校
@@ -265,13 +266,14 @@ aliyun:
     loginTemplateCode: SMS_228670005
     forgetTemplateCode: SMS_228685033
     pwdTemplateCode: SMS_230220381
+    bindNewTelCode: SMS_232178371
     accessKeyId: LTAIgC8O2WUXvXuR
     accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX
     OpenTheGoodsCode: SMS_230970155     #商品开通提醒
     informationNotificationCode: SMS_230965149  #完善报名资料通知
     materialReviewCode: SMS_230980165         #报名资料审核通过通知
     NotificationOfFailureCode: SMS_230980172  #报名资料审核不通过通知
-    remainingDaysValidityCode: SMS_230960174  #开通班级有效期还剩天数
+    remainingDaysValidityCode: SMS_236566823  #开通班级有效期还剩天数
     completionReminderCode: SMS_230965157   #学时学习完成提醒
     schoolHoursCode: SMS_230970166    #学时机构审核通过提醒
     auditFailedCode: SMS_230970167  #学时机构审核不通过提醒
@@ -282,7 +284,7 @@ aliyun:
     reservationSuccess: SMS_230980186 #考试预约成功提醒
     examinationRemind: SMS_230960195  #考试提醒
     newExamPass: SMS_230970179  #七大员新考考试通过提醒
-    newExamFail: SMS_230960198  #七大员新考考试不通过提醒
+    newExamFail: SMS_235491082  #七大员新考考试不通过提醒
     openingReminder: SMS_230970209  #七大员题库开通提醒（12-22
     classRemind: SMS_230965224  #二建继教开班提醒
     OverdueReminder: SMS_230980259  #班级过期提醒
@@ -292,4 +294,12 @@ aliyun:
     commitmentFailsCode: SMS_231215516     #承诺书审核不通过通知
     mockBookingReminder: SMS_243430276     #模考预约提醒
     mockRemind: SMS_243355276      #模考开始提醒
-    liveStartRemind: SMS_243345514      #直播开课提醒
+    liveStartRemind: SMS_243345514      #直播开课提醒
+    buyNotStudyStudentRemind : SMS_247745294  #学生购买未学习
+    buyNotStudyTeacherRemind : SMS_247935257  #学生购买未学习老师
+    longNotStudyStudentRemind: SMS_247910221  #学生长时间未学习
+    longNotStudyTeacherRemind: SMS_247765294  #学生长时间未学习老师
+    signCommitmentRemind: SMS_250390195  #签署承诺书提醒
+    todayExamNotRecordWarn: SMS_257713140  #学员打卡提醒（每日一练）
+    todayExamNotRecordTeachWarn: SMS_257702971  #学员打卡教务提醒（每日一练）
+    noFinishExamNoteCode: SMS_262460267  #未做完试卷通知

zhongzheng-common/src/main/java/com/zhongzheng/common/core/domain/entity/TopSysUser.java

@@ -150,15 +150,19 @@ public class TopSysUser implements Serializable
     @TableField(exist = false)
     private Long[] postIds;
 
+    public TopSysUser(Long userId)
+    {
+        this.userId = userId;
+    }
 
     public boolean isAdmin()
     {
-        return isAdmin(this.userId);
+        return isAdmin(this.userName);
     }
 
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(String userName)
     {
-        return userId != null && 1L == userId;
+        return userName != null && "admin".equals(userName) ;
     }
 
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/TopSysPermissionService.java

@@ -1,6 +1,6 @@
 package com.zhongzheng.framework.web.service;
 
-import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.modules.top.service.ITopSysMenuService;
 import com.zhongzheng.modules.top.service.ITopSysRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +29,7 @@ public class TopSysPermissionService
      * @param user 用户信息
      * @return 角色权限信息
      */
-    public Set<String> getRolePermission(SysUser user)
+    public Set<String> getRolePermission(TopSysUser user)
     {
         Set<String> roles = new HashSet<String>();
         // 管理员拥有所有权限
@@ -50,7 +50,7 @@ public class TopSysPermissionService
      * @param user 用户信息
      * @return 菜单权限信息
      */
-    public Set<String> getMenuPermission(SysUser user)
+    public Set<String> getMenuPermission(TopSysUser user)
     {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/bo/DistributionActivityQueryBo.java

@@ -59,7 +59,7 @@ public class DistributionActivityQueryBo extends BaseEntity {
 	private Long tempId;
 	/** 海报模板ID */
 	@ApiModelProperty("海报模板ID")
-	private Long posterTempId;
+	private Long posterId;
 	/** 海报标题 */
 	@ApiModelProperty("海报标题")
 	private String posterHead;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityServiceImpl.java

@@ -44,7 +44,7 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         lqw.eq(bo.getStartTime() != null, DistributionActivity::getStartTime, bo.getStartTime());
         lqw.eq(bo.getEndTime() != null, DistributionActivity::getEndTime, bo.getEndTime());
         lqw.eq(bo.getTempId() != null, DistributionActivity::getTempId, bo.getTempId());
-        lqw.eq(bo.getPosterTempId() != null, DistributionActivity::getPosterTempId, bo.getPosterTempId());
+        lqw.eq(bo.getPosterId() != null, DistributionActivity::getPosterId, bo.getPosterId());
         return entity2Vo(this.list(lqw));
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTempGoodsServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsAddBo;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTempGoodsQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityTempGoods;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempGoodsMapper;

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanAccountServiceImpl.java

@@ -1,95 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanAccountServiceImpl extends ServiceImpl<DistributionSalesmanAccountMapper, DistributionSalesmanAccount> implements IDistributionSalesmanAccountService {
-
-    @Override
-    public DistributionSalesmanAccountVo queryById(Long id){
-        DistributionSalesmanAccount db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanAccountVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanAccountVo> queryList(DistributionSalesmanAccountQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanAccount> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanAccount::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(bo.getType() != null, DistributionSalesmanAccount::getType, bo.getType());
-        lqw.eq(StrUtil.isNotBlank(bo.getOpenId()), DistributionSalesmanAccount::getOpenId, bo.getOpenId());
-        lqw.eq(StrUtil.isNotBlank(bo.getUnionId()), DistributionSalesmanAccount::getUnionId, bo.getUnionId());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanAccount::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanAccountVo> entity2Vo(Collection<DistributionSalesmanAccount> collection) {
-        List<DistributionSalesmanAccountVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanAccountVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanAccount> page = (Page<DistributionSalesmanAccount>)collection;
-            Page<DistributionSalesmanAccountVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanAccountAddBo bo) {
-        DistributionSalesmanAccount add = BeanUtil.toBean(bo, DistributionSalesmanAccount.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanAccountEditBo bo) {
-        DistributionSalesmanAccount update = BeanUtil.toBean(bo, DistributionSalesmanAccount.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanAccount entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanPosterServiceImpl.java

@@ -1,96 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanPosterServiceImpl extends ServiceImpl<DistributionSalesmanPosterMapper, DistributionSalesmanPoster> implements IDistributionSalesmanPosterService {
-
-    @Override
-    public DistributionSalesmanPosterVo queryById(Long id){
-        DistributionSalesmanPoster db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanPosterVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanPosterVo> queryList(DistributionSalesmanPosterQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanPoster> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getPosterId() != null, DistributionSalesmanPoster::getPosterId, bo.getPosterId());
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanPoster::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterHead()), DistributionSalesmanPoster::getPosterHead, bo.getPosterHead());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterSlogan()), DistributionSalesmanPoster::getPosterSlogan, bo.getPosterSlogan());
-        lqw.eq(StrUtil.isNotBlank(bo.getPosterConfig()), DistributionSalesmanPoster::getPosterConfig, bo.getPosterConfig());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanPoster::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanPosterVo> entity2Vo(Collection<DistributionSalesmanPoster> collection) {
-        List<DistributionSalesmanPosterVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanPosterVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanPoster> page = (Page<DistributionSalesmanPoster>)collection;
-            Page<DistributionSalesmanPosterVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanPosterAddBo bo) {
-        DistributionSalesmanPoster add = BeanUtil.toBean(bo, DistributionSalesmanPoster.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanPosterEditBo bo) {
-        DistributionSalesmanPoster update = BeanUtil.toBean(bo, DistributionSalesmanPoster.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanPoster entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanRelationServiceImpl.java

@@ -1,92 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanRelationServiceImpl extends ServiceImpl<DistributionSalesmanRelationMapper, DistributionSalesmanRelation> implements IDistributionSalesmanRelationService {
-
-    @Override
-    public DistributionSalesmanRelationVo queryById(Long id){
-        DistributionSalesmanRelation db = this.baseMapper.selectById(id);
-        return BeanUtil.toBean(db, DistributionSalesmanRelationVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanRelationVo> queryList(DistributionSalesmanRelationQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesmanRelation> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getDistributionId() != null, DistributionSalesmanRelation::getDistributionId, bo.getDistributionId());
-        lqw.eq(bo.getSalesmanId() != null, DistributionSalesmanRelation::getSalesmanId, bo.getSalesmanId());
-        lqw.eq(bo.getStatus() != null, DistributionSalesmanRelation::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanRelationVo> entity2Vo(Collection<DistributionSalesmanRelation> collection) {
-        List<DistributionSalesmanRelationVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanRelationVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesmanRelation> page = (Page<DistributionSalesmanRelation>)collection;
-            Page<DistributionSalesmanRelationVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanRelationAddBo bo) {
-        DistributionSalesmanRelation add = BeanUtil.toBean(bo, DistributionSalesmanRelation.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanRelationEditBo bo) {
-        DistributionSalesmanRelation update = BeanUtil.toBean(bo, DistributionSalesmanRelation.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesmanRelation entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionSalesmanServiceImpl.java

@@ -1,103 +0,0 @@
-package com.zhongzheng.modules.distribution.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.zhongzheng.common.utils.DateUtils;
-import org.springframework.stereotype.Service
-
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author ruoyi
- * @date 2023-03-06
- */
-@Service
-public class DistributionSalesmanServiceImpl extends ServiceImpl<DistributionSalesmanMapper, DistributionSalesman> implements IDistributionSalesmanService {
-
-    @Override
-    public DistributionSalesmanVo queryById(Long salesmanId){
-        DistributionSalesman db = this.baseMapper.selectById(salesmanId);
-        return BeanUtil.toBean(db, DistributionSalesmanVo.class);
-    }
-
-    @Override
-    public List<DistributionSalesmanVo> queryList(DistributionSalesmanQueryBo bo) {
-        LambdaQueryWrapper<DistributionSalesman> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StrUtil.isNotBlank(bo.getUserAccount()), DistributionSalesman::getUserAccount, bo.getUserAccount());
-        lqw.like(StrUtil.isNotBlank(bo.getNickname()), DistributionSalesman::getNickname, bo.getNickname());
-        lqw.like(StrUtil.isNotBlank(bo.getRealname()), DistributionSalesman::getRealname, bo.getRealname());
-        lqw.eq(bo.getSex() != null, DistributionSalesman::getSex, bo.getSex());
-        lqw.eq(StrUtil.isNotBlank(bo.getIdCard()), DistributionSalesman::getIdCard, bo.getIdCard());
-        lqw.eq(StrUtil.isNotBlank(bo.getTelphone()), DistributionSalesman::getTelphone, bo.getTelphone());
-        lqw.eq(bo.getUserLevel() != null, DistributionSalesman::getUserLevel, bo.getUserLevel());
-        lqw.eq(StrUtil.isNotBlank(bo.getUserBirth()), DistributionSalesman::getUserBirth, bo.getUserBirth());
-        lqw.eq(bo.getParentId() != null, DistributionSalesman::getParentId, bo.getParentId());
-        lqw.eq(bo.getBrokerageTotal() != null, DistributionSalesman::getBrokerageTotal, bo.getBrokerageTotal());
-        lqw.eq(bo.getBrokeragePractical() != null, DistributionSalesman::getBrokeragePractical, bo.getBrokeragePractical());
-        lqw.eq(bo.getBrokerageFreeze() != null, DistributionSalesman::getBrokerageFreeze, bo.getBrokerageFreeze());
-        lqw.eq(bo.getStatus() != null, DistributionSalesman::getStatus, bo.getStatus());
-        return entity2Vo(this.list(lqw));
-    }
-
-    /**
-    * 实体类转化成视图对象
-    *
-    * @param collection 实体类集合
-    * @return
-    */
-    private List<DistributionSalesmanVo> entity2Vo(Collection<DistributionSalesman> collection) {
-        List<DistributionSalesmanVo> voList = collection.stream()
-                .map(any -> BeanUtil.toBean(any, DistributionSalesmanVo.class))
-                .collect(Collectors.toList());
-        if (collection instanceof Page) {
-            Page<DistributionSalesman> page = (Page<DistributionSalesman>)collection;
-            Page<DistributionSalesmanVo> pageVo = new Page<>();
-            BeanUtil.copyProperties(page,pageVo);
-            pageVo.addAll(voList);
-            voList = pageVo;
-        }
-        return voList;
-    }
-
-    @Override
-    public Boolean insertByAddBo(DistributionSalesmanAddBo bo) {
-        DistributionSalesman add = BeanUtil.toBean(bo, DistributionSalesman.class);
-        validEntityBeforeSave(add);
-        add.setCreateTime(DateUtils.getNowTime());
-        add.setUpdateTime(DateUtils.getNowTime());
-        return this.save(add);
-    }
-
-    @Override
-    public Boolean updateByEditBo(DistributionSalesmanEditBo bo) {
-        DistributionSalesman update = BeanUtil.toBean(bo, DistributionSalesman.class);
-        validEntityBeforeSave(update);
-        update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(DistributionSalesman entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return this.removeByIds(ids);
-    }
-}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysDept.java

@@ -4,10 +4,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
+import java.util.*;
 
 /**
  * 部门对象 top_sys_dept
@@ -57,4 +56,20 @@ private static final long serialVersionUID=1L;
     /** 更新时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
+
+    /** 父部门名称 */
+    @TableField(exist = false)
+    private String parentName;
+
+    /** 子部门 */
+    @TableField(exist = false)
+    private List<TopSysDept> children = new ArrayList<TopSysDept>();
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    @TableField(exist = false)
+    private List<String> statusArray;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysMenu.java

@@ -1,13 +1,15 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
+import java.util.*;
 
 /**
  * 【请填写功能名称】对象 top_sys_menu
@@ -64,4 +66,12 @@ private static final long serialVersionUID=1L;
     private Date updateTime;
     /** 备注 */
     private String remark;
+
+    /** 请求参数 */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /** 子菜单 */
+    @TableField(exist = false)
+    private List<TopSysMenu> children = new ArrayList<TopSysMenu>();
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysPost.java

@@ -10,6 +10,9 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 【请填写功能名称】对象 top_sys_post
@@ -50,4 +53,19 @@ private static final long serialVersionUID=1L;
     private Date updateTime;
     /** 备注 */
     private String remark;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+    /**
+     * 用户是否存在此岗位标识 默认不存在
+     */
+    @TableField(exist = false)
+    private boolean flag = false;
+
+    @TableField(exist = false)
+    private List<String> statusArray;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRole.java

@@ -1,10 +1,12 @@
 package com.zhongzheng.modules.top.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Value;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -35,12 +37,17 @@ private static final long serialVersionUID=1L;
     private String roleKey;
     /** 显示顺序 */
     private Long roleSort;
-    /** 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限） */
+    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限） */
+    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限")
     private String dataScope;
-    /** 菜单树选择项是否关联显示 */
-    private Integer menuCheckStrictly;
-    /** 部门树选择项是否关联显示 */
-    private Integer deptCheckStrictly;
+
+    @Value("true")
+    /** 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） */
+    private boolean menuCheckStrictly;
+
+    @Value("true")
+    /** 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ） */
+    private boolean deptCheckStrictly;
     /** 角色状态（1正常 0停用） */
     private String status;
     /** 删除标志（0代表存在 2代表删除） */
@@ -75,6 +82,8 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private Long[] menuIds;
 
+
+
     /** 部门组（数据权限） */
     @TableField(exist = false)
     private Long[] deptIds;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRoleDept.java

@@ -1,13 +1,13 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 top_sys_role_dept
@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "role_id")
     private Long roleId;
     /** 部门ID */
-    @TableId(value = "dept_id")
+    @TableField(value = "dept_id")
     private Long deptId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysRoleMenu.java

@@ -1,13 +1,13 @@
 package com.zhongzheng.modules.top.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-import com.zhongzheng.common.annotation.Excel;
 
 /**
  * 【请填写功能名称】对象 top_sys_role_menu
@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "role_id")
     private Long roleId;
     /** 菜单ID */
-    @TableId(value = "menu_id")
+    @TableField(value = "menu_id")
     private Long menuId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysUserPost.java

@@ -27,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "user_id")
     private Long userId;
     /** 岗位ID */
-    @TableId(value = "post_id")
+    @TableField(value = "post_id")
     private Long postId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/domain/TopSysUserRole.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -26,6 +27,6 @@ private static final long serialVersionUID=1L;
     @TableId(value = "user_id")
     private Long userId;
     /** 角色ID */
-    @TableId(value = "role_id")
+    @TableField(value = "role_id")
     private Long roleId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysConfigMapper.java

@@ -1,7 +1,9 @@
 package com.zhongzheng.modules.top.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -10,5 +12,6 @@ import com.zhongzheng.modules.top.domain.TopSysConfig;
  * @date 2023-03-10
  */
 public interface TopSysConfigMapper extends BaseMapper<TopSysConfig> {
-
+    @InterceptorIgnore(tenantLine = "true")
+    TopSysConfig getSysConfigByKeyTenant(@Param("key") String key);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysDeptMapper.java

@@ -2,6 +2,9 @@ package com.zhongzheng.modules.top.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 部门Mapper接口
@@ -10,5 +13,12 @@ import com.zhongzheng.modules.top.domain.TopSysDept;
  * @date 2023-03-10
  */
 public interface TopSysDeptMapper extends BaseMapper<TopSysDept> {
-
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId            角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+     List<Integer> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysMenuMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.top.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysMenu;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -10,5 +14,56 @@ import com.zhongzheng.modules.top.domain.TopSysMenu;
  * @date 2023-03-10
  */
 public interface TopSysMenuMapper extends BaseMapper<TopSysMenu> {
+    /**
+     * 根据用户所有权限
+     *
+     * @return 权限列表
+     */
+     List<String> selectMenuPerms();
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuListByUserId(TopSysMenu menu);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+     List<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuTreeAll();
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+     List<TopSysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId            角色ID
+     * @param menuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+     List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+
+    @InterceptorIgnore(tenantLine = "true")
+    List<TopSysMenu> listSysMenuByTenant(Long tenantId);
 
+    @InterceptorIgnore(tenantLine = "true")
+    Integer updateParentById(@Param("newMenus") TopSysMenu newMenus);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysPostMapper.java

@@ -4,6 +4,8 @@ package com.zhongzheng.modules.top.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.top.domain.TopSysPost;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Mapper接口
  *
@@ -11,5 +13,19 @@ import com.zhongzheng.modules.top.domain.TopSysPost;
  * @date 2023-03-10
  */
 public interface TopSysPostMapper extends BaseMapper<TopSysPost> {
+    /**
+     * 根据用户ID获取岗位选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    List<Integer> selectPostListByUserId(Long userId);
 
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userName 用户名
+     * @return 结果
+     */
+    List<TopSysPost> selectPostsByUserName(String userName);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysRoleMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2023-03-10
  */
- interface TopSysRoleMapper extends BaseMapper<TopSysRole> {
+ public interface TopSysRoleMapper extends BaseMapper<TopSysRole> {
 
     /**
      * 根据用户ID查询角色
@@ -20,7 +20,7 @@ import java.util.List;
      * @param userId 用户ID
      * @return 角色列表
      */
-     List<SysRole> selectRolePermissionByUserId(Long userId);
+     List<TopSysRole> selectRolePermissionByUserId(Long userId);
 
 
     /**
@@ -37,5 +37,5 @@ import java.util.List;
      * @param userName 用户名
      * @return 角色列表
      */
-     List<SysRole> selectRolesByUserName(String userName);
+     List<TopSysRole> selectRolesByUserName(String userName);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/mapper/TopSysUserMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @author ruoyi
  * @date 2021-08-04
  */
-interface TopSysUserMapper extends BaseMapper<TopSysUser> {
+public interface TopSysUserMapper extends BaseMapper<TopSysUser> {
 
     /**
      * 通过用户名查询用户

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysConfigService.java

@@ -2,9 +2,10 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.system.domain.SysConfig;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
+
+import java.util.List;
 
 /**
  * 【请填写功能名称】Service接口
@@ -19,7 +20,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configId 参数配置ID
      * @return 参数配置信息
      */
-    public SysConfig selectConfigById(Long configId);
+     TopSysConfig selectConfigById(Long configId);
 
     /**
      * 根据键名查询参数配置信息
@@ -27,9 +28,9 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configKey 参数键名
      * @return 参数键值
      */
-    public String selectConfigByKey(String configKey);
+     String selectConfigByKey(String configKey);
 
-    public String selectConfigByKeyNoCache(String configKey);
+     String selectConfigByKeyNoCache(String configKey);
 
     /**
      * 查询参数配置列表
@@ -37,7 +38,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 参数配置集合
      */
-    public List<SysConfigVo> selectConfigList(SysConfigVo config);
+     List<TopSysConfigVo> selectConfigList(TopSysConfigVo config);
 
     /**
      * 新增参数配置
@@ -45,7 +46,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 结果
      */
-    public int insertConfig(SysConfigVo config);
+     int insertConfig(TopSysConfigVo config);
 
     /**
      * 修改参数配置
@@ -53,7 +54,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数配置信息
      * @return 结果
      */
-    public int updateConfig(SysConfigVo config);
+     int updateConfig(TopSysConfigVo config);
 
     /**
      * 批量删除参数信息
@@ -61,12 +62,12 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param configIds 需要删除的参数ID
      * @return 结果
      */
-    public int deleteConfigByIds(Long[] configIds);
+     int deleteConfigByIds(Long[] configIds);
 
     /**
      * 清空缓存数据
      */
-    public void clearCache();
+     void clearCache();
 
     /**
      * 校验参数键名是否唯一
@@ -74,7 +75,7 @@ public interface ITopSysConfigService extends IService<TopSysConfig> {
      * @param config 参数信息
      * @return 结果
      */
-    public String checkConfigKeyUnique(SysConfigVo config);
+     String checkConfigKeyUnique(TopSysConfigVo config);
 
-    SysConfig getSysConfigByKeyTenant(String key, Long tenantId);
+    TopSysConfig getSysConfigByKeyTenant(String key);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysDeptService.java

@@ -2,9 +2,8 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysDept;
 import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 
 import java.util.List;
 
@@ -21,7 +20,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 部门信息集合
      */
-    public List<SysDept> selectDeptList(SysDept dept);
+     List<TopSysDept> selectDeptList(TopSysDept dept);
 
     /**
      * 构建前端所需要树结构
@@ -29,7 +28,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param depts 部门列表
      * @return 树结构列表
      */
-    public List<SysDept> buildDeptTree(List<SysDept> depts);
+     List<TopSysDept> buildDeptTree(List<TopSysDept> depts);
 
     /**
      * 构建前端所需要下拉树结构
@@ -37,7 +36,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
+     List<TreeSelectTop> buildDeptTreeSelect(List<TopSysDept> depts);
 
     /**
      * 根据角色ID查询部门树信息
@@ -45,7 +44,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param roleId 角色ID
      * @return 选中部门列表
      */
-    public List<Integer> selectDeptListByRoleId(Long roleId);
+     List<Integer> selectDeptListByRoleId(Long roleId);
 
     /**
      * 根据部门ID查询信息
@@ -53,7 +52,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+     TopSysDept selectDeptById(Long deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
@@ -61,7 +60,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+     int selectNormalChildrenDeptById(Long deptId);
 
     /**
      * 是否存在部门子节点
@@ -69,7 +68,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+     boolean hasChildByDeptId(Long deptId);
 
     /**
      * 查询部门是否存在用户
@@ -77,7 +76,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+     boolean checkDeptExistUser(Long deptId);
 
     /**
      * 校验部门名称是否唯一
@@ -85,7 +84,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public String checkDeptNameUnique(SysDept dept);
+     String checkDeptNameUnique(TopSysDept dept);
 
     /**
      * 新增保存部门信息
@@ -93,7 +92,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public int insertDept(SysDept dept);
+     int insertDept(TopSysDept dept);
 
     /**
      * 修改保存部门信息
@@ -101,7 +100,7 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param dept 部门信息
      * @return 结果
      */
-    public int updateDept(SysDept dept);
+     int updateDept(TopSysDept dept);
 
     /**
      * 删除部门管理信息
@@ -109,5 +108,5 @@ public interface ITopSysDeptService extends IService<TopSysDept> {
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+     int deleteDeptById(Long deptId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysMenuService.java

@@ -2,10 +2,9 @@ package com.zhongzheng.modules.top.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.modules.system.domain.vo.RouterVo;
 import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 
 import java.util.List;
 import java.util.Set;
@@ -23,7 +22,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(Long userId);
+     List<TopSysMenu> selectMenuList(Long userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -32,7 +31,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+     List<TopSysMenu> selectMenuList(TopSysMenu menu, Long userId);
 
     /**
      * 根据用户ID查询权限
@@ -40,7 +39,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+     Set<String> selectMenuPermsByUserId(Long userId);
 
     /**
      * 根据用户ID查询菜单树信息
@@ -48,7 +47,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+     List<TopSysMenu> selectMenuTreeByUserId(Long userId);
 
     /**
      * 根据角色ID查询菜单树信息
@@ -56,7 +55,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param roleId 角色ID
      * @return 选中菜单列表
      */
-    public List<Integer> selectMenuListByRoleId(Long roleId);
+     List<Integer> selectMenuListByRoleId(Long roleId);
 
     /**
      * 构建前端路由所需要的菜单
@@ -64,7 +63,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 路由列表
      */
-    public List<RouterVo> buildMenus(List<SysMenu> menus);
+     List<RouterVo> buildMenus(List<TopSysMenu> menus);
 
     /**
      * 构建前端所需要树结构
@@ -72,7 +71,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 树结构列表
      */
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus);
+     List<TopSysMenu> buildMenuTree(List<TopSysMenu> menus);
 
     /**
      * 构建前端所需要下拉树结构
@@ -80,7 +79,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menus 菜单列表
      * @return 下拉树结构列表
      */
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus);
+     List<TreeSelectTop> buildMenuTreeSelect(List<TopSysMenu> menus);
 
     /**
      * 根据菜单ID查询信息
@@ -88,7 +87,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 菜单信息
      */
-    public SysMenu selectMenuById(Long menuId);
+     TopSysMenu selectMenuById(Long menuId);
 
     /**
      * 是否存在菜单子节点
@@ -96,7 +95,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean hasChildByMenuId(Long menuId);
+     boolean hasChildByMenuId(Long menuId);
 
     /**
      * 查询菜单是否存在角色
@@ -104,7 +103,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkMenuExistRole(Long menuId);
+     boolean checkMenuExistRole(Long menuId);
 
     /**
      * 新增保存菜单信息
@@ -112,7 +111,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public int insertMenu(SysMenu menu);
+     int insertMenu(TopSysMenu menu);
 
     /**
      * 修改保存菜单信息
@@ -120,7 +119,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public int updateMenu(SysMenu menu);
+     int updateMenu(TopSysMenu menu);
 
     /**
      * 删除菜单管理信息
@@ -128,7 +127,7 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menuId 菜单ID
      * @return 结果
      */
-    public int deleteMenuById(Long menuId);
+     int deleteMenuById(Long menuId);
 
     /**
      * 校验菜单名称是否唯一
@@ -136,9 +135,9 @@ public interface ITopSysMenuService extends IService<TopSysMenu> {
      * @param menu 菜单信息
      * @return 结果
      */
-    public String checkMenuNameUnique(SysMenu menu);
+     String checkMenuNameUnique(TopSysMenu menu);
 
-    List<SysMenu> listSysMenuByTenant(Long tenantId);
+    List<TopSysMenu> listSysMenuByTenant(Long tenantId);
 
-    Integer updateParentById(SysMenu newMenus);
+    Integer updateParentById(TopSysMenu newMenus);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysPostService.java

@@ -1,7 +1,6 @@
 package com.zhongzheng.modules.top.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.zhongzheng.modules.system.domain.SysPost;
 import com.zhongzheng.modules.top.domain.TopSysPost;
 
 import java.util.List;
@@ -19,14 +18,14 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 岗位列表
      */
-    public List<SysPost> selectPostList(SysPost post);
+     List<TopSysPost> selectPostList(TopSysPost post);
 
     /**
      * 查询所有岗位
      *
      * @return 岗位列表
      */
-    public List<SysPost> selectPostAll();
+     List<TopSysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
@@ -34,7 +33,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 角色对象信息
      */
-    public SysPost selectPostById(Long postId);
+     TopSysPost selectPostById(Long postId);
 
     /**
      * 根据用户ID获取岗位选择框列表
@@ -42,7 +41,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Integer> selectPostListByUserId(Long userId);
+     List<Integer> selectPostListByUserId(Long userId);
 
     /**
      * 校验岗位名称
@@ -50,7 +49,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public String checkPostNameUnique(SysPost post);
+     String checkPostNameUnique(TopSysPost post);
 
     /**
      * 校验岗位编码
@@ -58,7 +57,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public String checkPostCodeUnique(SysPost post);
+     String checkPostCodeUnique(TopSysPost post);
 
     /**
      * 通过岗位ID查询岗位使用数量
@@ -66,7 +65,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 结果
      */
-    public int countUserPostById(Long postId);
+     int countUserPostById(Long postId);
 
     /**
      * 删除岗位信息
@@ -74,7 +73,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param postId 岗位ID
      * @return 结果
      */
-    public int deletePostById(Long postId);
+     int deletePostById(Long postId);
 
     /**
      * 批量删除岗位信息
@@ -83,7 +82,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @return 结果
      * @throws Exception 异常
      */
-    public int deletePostByIds(Long[] postIds);
+     int deletePostByIds(Long[] postIds);
 
     /**
      * 新增保存岗位信息
@@ -91,7 +90,7 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public int insertPost(SysPost post);
+     int insertPost(TopSysPost post);
 
     /**
      * 修改保存岗位信息
@@ -99,5 +98,5 @@ public interface ITopSysPostService extends IService<TopSysPost> {
      * @param post 岗位信息
      * @return 结果
      */
-    public int updatePost(SysPost post);
+     int updatePost(TopSysPost post);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/ITopSysRoleService.java

@@ -12,7 +12,7 @@ import java.util.Set;
  * @author ruoyi
  * @date 2023-03-10
  */
- interface ITopSysRoleService extends IService<TopSysRole> {
+ public interface ITopSysRoleService extends IService<TopSysRole> {
     /**
      * 根据条件分页查询角色数据
      *

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysConfigServiceImpl.java

@@ -13,12 +13,11 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.enums.DataSourceType;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.modules.system.domain.SysConfig;
 import com.zhongzheng.modules.system.service.ISysTenantService;
-import com.zhongzheng.modules.system.vo.SysConfigVo;
 import com.zhongzheng.modules.top.domain.TopSysConfig;
 import com.zhongzheng.modules.top.mapper.TopSysConfigMapper;
 import com.zhongzheng.modules.top.service.ITopSysConfigService;
+import com.zhongzheng.modules.top.vo.TopSysConfigVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,8 +45,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      */
     @PostConstruct
     public void init() {
-      /*  List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
-        for (SysConfig config : configsList) {
+      /*  List<TopSysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
+        for (TopSysConfig config : configsList) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
         }*/
     }
@@ -60,7 +59,7 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      */
     @Override
     @DataSource(DataSourceType.MASTER)
-    public SysConfig selectConfigById(Long configId) {
+    public TopSysConfig selectConfigById(Long configId) {
         return baseMapper.selectById(configId);
     }
 
@@ -76,8 +75,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
         if (Validator.isNotEmpty(configValue)) {
             return configValue;
         }
-        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getConfigKey, configKey));
+        TopSysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>()
+                .eq(TopSysConfig::getConfigKey, configKey));
         if (Validator.isNotNull(retConfig)) {
             redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue(),120, TimeUnit.MINUTES);
             return retConfig.getConfigValue();
@@ -87,8 +86,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
 
     @Override
     public String selectConfigByKeyNoCache(String configKey) {
-        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
-                .eq(SysConfig::getConfigKey, configKey));
+        TopSysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>()
+                .eq(TopSysConfig::getConfigKey, configKey));
         if (Validator.isNotNull(retConfig)) {
             return retConfig.getConfigValue();
         }
@@ -102,12 +101,12 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 参数配置集合
      */
     @Override
-    public List<SysConfigVo> selectConfigList(SysConfigVo config) {
-        LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
-        lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
-        lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
-        lqw.eq(StrUtil.isNotBlank(config.getConfigModule()), SysConfig::getConfigModule, config.getConfigModule());
-        lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
+    public List<TopSysConfigVo> selectConfigList(TopSysConfigVo config) {
+        LambdaQueryWrapper<TopSysConfig> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StrUtil.isNotBlank(config.getConfigName()), TopSysConfig::getConfigName, config.getConfigName());
+        lqw.eq(StrUtil.isNotBlank(config.getConfigType()), TopSysConfig::getConfigType, config.getConfigType());
+        lqw.eq(StrUtil.isNotBlank(config.getConfigModule()), TopSysConfig::getConfigModule, config.getConfigModule());
+        lqw.like(StrUtil.isNotBlank(config.getConfigKey()), TopSysConfig::getConfigKey, config.getConfigKey());
         Map<String, Object> params = config.getParams();
         lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
                 "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
@@ -115,11 +114,11 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
         lqw.apply(Validator.isNotEmpty(params.get("endTime")),
                 "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
                 params.get("endTime"));
-        List<SysConfig> sysConfigs = baseMapper.selectList(lqw);
+        List<TopSysConfig> sysConfigs = baseMapper.selectList(lqw);
         if (CollectionUtils.isEmpty(sysConfigs)){
             return new ArrayList<>();
         }
-        return sysConfigs.stream().map(x -> BeanUtil.toBean(x,SysConfigVo.class)).collect(Collectors.toList());
+        return sysConfigs.stream().map(x -> BeanUtil.toBean(x,TopSysConfigVo.class)).collect(Collectors.toList());
     }
 
     /**
@@ -129,9 +128,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public int insertConfig(SysConfigVo config) {
-        SysConfig sysConfig = BeanUtil.toBean(config, SysConfig.class);
-        sysConfig.setTenantId(Long.valueOf(config.getTenantId()));
+    public int insertConfig(TopSysConfigVo config) {
+        TopSysConfig sysConfig = BeanUtil.toBean(config, TopSysConfig.class);
         int row = baseMapper.insert(sysConfig);
         if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -146,9 +144,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public int updateConfig(SysConfigVo config) {
-        SysConfig sysConfig = BeanUtil.toBean(config, SysConfig.class);
-        sysConfig.setTenantId(Long.valueOf(config.getTenantId()));
+    public int updateConfig(TopSysConfigVo config) {
+        TopSysConfig sysConfig = BeanUtil.toBean(config, TopSysConfig.class);
         int row = baseMapper.updateById(sysConfig);
         if (row > 0) {
             redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
@@ -178,7 +175,7 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
     @Override
     public int deleteConfigByIds(Long[] configIds) {
         for (Long configId : configIds) {
-            SysConfig config = selectConfigById(configId);
+            TopSysConfig config = selectConfigById(configId);
             if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
@@ -207,9 +204,9 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
      * @return 结果
      */
     @Override
-    public String checkConfigKeyUnique(SysConfigVo config) {
+    public String checkConfigKeyUnique(TopSysConfigVo config) {
         Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
-        SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
+        TopSysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<TopSysConfig>().eq(TopSysConfig::getConfigKey, config.getConfigKey()));
         if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -217,8 +214,8 @@ public class TopSysConfigServiceImpl extends ServiceImpl<TopSysConfigMapper, Top
     }
 
     @Override
-    public SysConfig getSysConfigByKeyTenant(String key, Long tenantId) {
-        return baseMapper.getSysConfigByKeyTenant(key, tenantId);
+    public TopSysConfig getSysConfigByKeyTenant(String key) {
+        return baseMapper.getSysConfigByKeyTenant(key);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysDeptServiceImpl.java

@@ -7,16 +7,15 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysDept;
-import com.zhongzheng.common.core.domain.entity.SysRole;
-import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.modules.system.mapper.SysRoleMapper;
-import com.zhongzheng.modules.system.mapper.SysUserMapper;
 import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.domain.TopSysRole;
 import com.zhongzheng.modules.top.mapper.TopSysDeptMapper;
+import com.zhongzheng.modules.top.mapper.TopSysRoleMapper;
+import com.zhongzheng.modules.top.mapper.TopSysUserMapper;
 import com.zhongzheng.modules.top.service.ITopSysDeptService;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,10 +35,10 @@ import java.util.stream.Collectors;
 public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysDept> implements ITopSysDeptService {
 
     @Autowired
-    private SysRoleMapper roleMapper;
+    private TopSysRoleMapper topRoleMapper;
 
     @Autowired
-    private SysUserMapper userMapper;
+    private TopSysUserMapper topUserMapper;
 
     /**
      * 查询部门管理数据
@@ -49,17 +48,17 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept) {
+    public List<TopSysDept> selectDeptList(TopSysDept dept) {
         Object dataScope = dept.getParams().get("dataScope");
-        return list(new LambdaQueryWrapper<SysDept>()
+        return list(new LambdaQueryWrapper<TopSysDept>()
                 .eq(dept.getParentId() != null && dept.getParentId() != 0,
-                        SysDept::getParentId, dept.getParentId())
-                .like(StrUtil.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
-                .eq(StrUtil.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
-                .in(dept.getStatusArray()!=null, SysDept::getStatus, dept.getStatusArray())
+                        TopSysDept::getParentId, dept.getParentId())
+                .like(StrUtil.isNotBlank(dept.getDeptName()), TopSysDept::getDeptName, dept.getDeptName())
+                .eq(StrUtil.isNotBlank(dept.getStatus()), TopSysDept::getStatus, dept.getStatus())
+                .in(dept.getStatusArray()!=null, TopSysDept::getStatus, dept.getStatusArray())
                 .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
-                .orderByAsc(SysDept::getParentId)
-                .orderByAsc(SysDept::getOrderNum));
+                .orderByAsc(TopSysDept::getParentId)
+                .orderByAsc(TopSysDept::getOrderNum));
     }
 
     /**
@@ -69,14 +68,14 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 树结构列表
      */
     @Override
-    public List<SysDept> buildDeptTree(List<SysDept> depts) {
-        List<SysDept> returnList = new ArrayList<SysDept>();
+    public List<TopSysDept> buildDeptTree(List<TopSysDept> depts) {
+        List<TopSysDept> returnList = new ArrayList<TopSysDept>();
         List<Long> tempList = new ArrayList<Long>();
-        for (SysDept dept : depts) {
+        for (TopSysDept dept : depts) {
             tempList.add(dept.getDeptId());
         }
-        for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
-            SysDept dept = (SysDept) iterator.next();
+        for (Iterator<TopSysDept> iterator = depts.iterator(); iterator.hasNext(); ) {
+            TopSysDept dept = (TopSysDept) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(dept.getParentId())) {
                 recursionFn(depts, dept);
@@ -96,9 +95,9 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
-        List<SysDept> deptTrees = buildDeptTree(depts);
-        return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    public List<TreeSelectTop> buildDeptTreeSelect(List<TopSysDept> depts) {
+        List<TopSysDept> deptTrees = buildDeptTree(depts);
+        return deptTrees.stream().map(TreeSelectTop::new).collect(Collectors.toList());
     }
 
     /**
@@ -109,7 +108,7 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      */
     @Override
     public List<Integer> selectDeptListByRoleId(Long roleId) {
-        SysRole role = roleMapper.selectById(roleId);
+        TopSysRole role = topRoleMapper.selectById(roleId);
         return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
     }
 
@@ -120,7 +119,7 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId) {
+    public TopSysDept selectDeptById(Long deptId) {
         return getById(deptId);
     }
 
@@ -132,8 +131,8 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      */
     @Override
     public int selectNormalChildrenDeptById(Long deptId) {
-        return count(new LambdaQueryWrapper<SysDept>()
-                .eq(SysDept::getStatus, 0)
+        return count(new LambdaQueryWrapper<TopSysDept>()
+                .eq(TopSysDept::getStatus, 0)
                 .apply("find_in_set({0}, ancestors)", deptId));
     }
 
@@ -145,8 +144,8 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      */
     @Override
     public boolean hasChildByDeptId(Long deptId) {
-        int result = count(new LambdaQueryWrapper<SysDept>()
-                .eq(SysDept::getParentId, deptId)
+        int result = count(new LambdaQueryWrapper<TopSysDept>()
+                .eq(TopSysDept::getParentId, deptId)
                 .last("limit 1"));
         return result > 0 ? true : false;
     }
@@ -159,8 +158,8 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      */
     @Override
     public boolean checkDeptExistUser(Long deptId) {
-        int result = userMapper.selectCount(new LambdaQueryWrapper<SysUser>()
-                .eq(SysUser::getDeptId, deptId));
+        int result = topUserMapper.selectCount(new LambdaQueryWrapper<TopSysUser>()
+                .eq(TopSysUser::getDeptId, deptId));
         return result > 0 ? true : false;
     }
 
@@ -171,11 +170,11 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 结果
      */
     @Override
-    public String checkDeptNameUnique(SysDept dept) {
+    public String checkDeptNameUnique(TopSysDept dept) {
         Long deptId = Validator.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = getOne(new LambdaQueryWrapper<SysDept>()
-                .eq(SysDept::getDeptName, dept.getDeptName())
-                .eq(SysDept::getParentId, dept.getParentId())
+        TopSysDept info = getOne(new LambdaQueryWrapper<TopSysDept>()
+                .eq(TopSysDept::getDeptName, dept.getDeptName())
+                .eq(TopSysDept::getParentId, dept.getParentId())
                 .last("limit 1"));
         if (Validator.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -190,9 +189,9 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 结果
      */
     @Override
-    public int insertDept(SysDept dept) {
+    public int insertDept(TopSysDept dept) {
         if(dept.getParentId()>0){
-            SysDept info = getById(dept.getParentId());
+            TopSysDept info = getById(dept.getParentId());
             // 如果父节点不为正常状态,则不允许新增子节点
             if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
                 throw new CustomException("部门停用，不允许新增");
@@ -212,9 +211,9 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @return 结果
      */
     @Override
-    public int updateDept(SysDept dept) {
-        SysDept newParentDept = getById(dept.getParentId());
-        SysDept oldDept = getById(dept.getDeptId());
+    public int updateDept(TopSysDept dept) {
+        TopSysDept newParentDept = getById(dept.getParentId());
+        TopSysDept oldDept = getById(dept.getDeptId());
         if (Validator.isNotNull(newParentDept) && Validator.isNotNull(oldDept)) {
             String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
             String oldAncestors = oldDept.getAncestors();
@@ -234,16 +233,16 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      *
      * @param dept 当前部门
      */
-    private void updateParentDeptStatus(SysDept dept) {
+    private void updateParentDeptStatus(TopSysDept dept) {
         String updateBy = dept.getUpdateBy();
         dept = getById(dept.getDeptId());
         dept.setUpdateBy(updateBy);
-        update(null,new LambdaUpdateWrapper<SysDept>()
+        update(null,new LambdaUpdateWrapper<TopSysDept>()
                 .set(StrUtil.isNotBlank(dept.getStatus()),
-                        SysDept::getStatus,dept.getStatus())
+                        TopSysDept::getStatus,dept.getStatus())
                 .set(StrUtil.isNotBlank(dept.getUpdateBy()),
-                        SysDept::getUpdateBy,dept.getUpdateBy())
-                .in(SysDept::getDeptId, Arrays.asList(dept.getAncestors().split(","))));
+                        TopSysDept::getUpdateBy,dept.getUpdateBy())
+                .in(TopSysDept::getDeptId, Arrays.asList(dept.getAncestors().split(","))));
     }
 
     /**
@@ -254,9 +253,9 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
      * @param oldAncestors 旧的父ID集合
      */
     public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
-        List<SysDept> children = list(new LambdaQueryWrapper<SysDept>()
+        List<TopSysDept> children = list(new LambdaQueryWrapper<TopSysDept>()
                 .apply("find_in_set({0},ancestors)",deptId));
-        for (SysDept child : children) {
+        for (TopSysDept child : children) {
             child.setAncestors(child.getAncestors().replace(oldAncestors, newAncestors));
         }
         if (children.size() > 0) {
@@ -278,11 +277,11 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
     /**
      * 递归列表
      */
-    private void recursionFn(List<SysDept> list, SysDept t) {
+    private void recursionFn(List<TopSysDept> list, TopSysDept t) {
         // 得到子节点列表
-        List<SysDept> childList = getChildList(list, t);
+        List<TopSysDept> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysDept tChild : childList) {
+        for (TopSysDept tChild : childList) {
             if (hasChild(list, tChild)) {
                 recursionFn(list, tChild);
             }
@@ -292,11 +291,11 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
     /**
      * 得到子节点列表
      */
-    private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
-        List<SysDept> tlist = new ArrayList<SysDept>();
-        Iterator<SysDept> it = list.iterator();
+    private List<TopSysDept> getChildList(List<TopSysDept> list, TopSysDept t) {
+        List<TopSysDept> tlist = new ArrayList<TopSysDept>();
+        Iterator<TopSysDept> it = list.iterator();
         while (it.hasNext()) {
-            SysDept n = (SysDept) it.next();
+            TopSysDept n = (TopSysDept) it.next();
             if (Validator.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
                 tlist.add(n);
             }
@@ -307,7 +306,7 @@ public class TopSysDeptServiceImpl extends ServiceImpl<TopSysDeptMapper, TopSysD
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysDept> list, SysDept t) {
+    private boolean hasChild(List<TopSysDept> list, TopSysDept t) {
         return getChildList(list, t).size() > 0 ? true : false;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysMenuServiceImpl.java

@@ -5,20 +5,19 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.UserConstants;
-import com.zhongzheng.common.core.domain.TreeSelect;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
-import com.zhongzheng.common.core.domain.entity.SysRole;
-import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.utils.SecurityUtils;
-import com.zhongzheng.modules.system.domain.SysRoleMenu;
 import com.zhongzheng.modules.system.domain.vo.MetaVo;
 import com.zhongzheng.modules.system.domain.vo.RouterVo;
-import com.zhongzheng.modules.system.mapper.SysRoleMapper;
-import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
-import com.zhongzheng.modules.system.service.ISysUserService;
 import com.zhongzheng.modules.top.domain.TopSysMenu;
+import com.zhongzheng.modules.top.domain.TopSysRole;
+import com.zhongzheng.modules.top.domain.TopSysRoleMenu;
 import com.zhongzheng.modules.top.mapper.TopSysMenuMapper;
+import com.zhongzheng.modules.top.mapper.TopSysRoleMapper;
+import com.zhongzheng.modules.top.mapper.TopSysRoleMenuMapper;
 import com.zhongzheng.modules.top.service.ITopSysMenuService;
+import com.zhongzheng.modules.top.service.ITopSysUserService;
+import com.zhongzheng.modules.top.util.TreeSelectTop;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,13 +35,13 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
     public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
     @Autowired
-    private SysRoleMapper roleMapper;
+    private TopSysRoleMapper topRoleMapper;
 
     @Autowired
-    private SysRoleMenuMapper roleMenuMapper;
+    private TopSysRoleMenuMapper topRoleMenuMapper;
 
     @Autowired
-    private ISysUserService userService;
+    private ITopSysUserService topSysUserService;
 
     /**
      * 根据用户查询系统菜单列表
@@ -51,8 +50,8 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId) {
-        return selectMenuList(new SysMenu(), userId);
+    public List<TopSysMenu> selectMenuList(Long userId) {
+        return selectMenuList(new TopSysMenu(), userId);
     }
 
     /**
@@ -62,17 +61,17 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId) {
-        List<SysMenu> menuList = null;
-        SysUser sysUser = userService.selectUserById(userId);
+    public List<TopSysMenu> selectMenuList(TopSysMenu menu, Long userId) {
+        List<TopSysMenu> menuList = null;
+        TopSysUser sysUser = topSysUserService.selectUserById(userId);
         // 管理员显示所有菜单信息
-        if (SysUser.isAdmin(sysUser.getUserName())) {
-            menuList = list(new LambdaQueryWrapper<SysMenu>()
-                    .like(StrUtil.isNotBlank(menu.getMenuName()),SysMenu::getMenuName,menu.getMenuName())
-                    .eq(StrUtil.isNotBlank(menu.getVisible()),SysMenu::getVisible,menu.getVisible())
-                    .eq(StrUtil.isNotBlank(menu.getStatus()),SysMenu::getStatus,menu.getStatus())
-                    .orderByAsc(SysMenu::getParentId)
-                    .orderByAsc(SysMenu::getOrderNum));
+        if (TopSysUser.isAdmin(sysUser.getUserName())) {
+            menuList = list(new LambdaQueryWrapper<TopSysMenu>()
+                    .like(StrUtil.isNotBlank(menu.getMenuName()),TopSysMenu::getMenuName,menu.getMenuName())
+                    .eq(StrUtil.isNotBlank(menu.getVisible()),TopSysMenu::getVisible,menu.getVisible())
+                    .eq(StrUtil.isNotBlank(menu.getStatus()),TopSysMenu::getStatus,menu.getStatus())
+                    .orderByAsc(TopSysMenu::getParentId)
+                    .orderByAsc(TopSysMenu::getOrderNum));
         } else {
             menu.getParams().put("userId", userId);
             menuList = baseMapper.selectMenuListByUserId(menu);
@@ -105,8 +104,8 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId) {
-        List<SysMenu> menus = null;
+    public List<TopSysMenu> selectMenuTreeByUserId(Long userId) {
+        List<TopSysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId)) {
             menus = baseMapper.selectMenuTreeAll();
         } else {
@@ -123,7 +122,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      */
     @Override
     public List<Integer> selectMenuListByRoleId(Long roleId) {
-        SysRole role = roleMapper.selectById(roleId);
+        TopSysRole role = topRoleMapper.selectById(roleId);
         return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
     }
 
@@ -134,17 +133,17 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 路由列表
      */
     @Override
-    public List<RouterVo> buildMenus(List<SysMenu> menus) {
+    public List<RouterVo> buildMenus(List<TopSysMenu> menus) {
         List<RouterVo> routers = new LinkedList<RouterVo>();
-        for (SysMenu menu : menus) {
+        for (TopSysMenu menu : menus) {
             RouterVo router = new RouterVo();
             router.setMenuId(menu.getMenuId());
             router.setHidden("1".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
             router.setPath(getRouterPath(menu));
             router.setComponent(getComponent(menu));
-            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
-            List<SysMenu> cMenus = menu.getChildren();
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache().toString())));
+            List<TopSysMenu> cMenus = menu.getChildren();
             if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
                 router.setAlwaysShow(true);
                 router.setRedirect("noRedirect");
@@ -156,7 +155,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
                 children.setName(StrUtil.upperFirst(menu.getPath()));
-                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache())));
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StrUtil.equals("1", menu.getIsCache().toString())));
                 childrenList.add(children);
                 router.setChildren(childrenList);
             }
@@ -172,14 +171,14 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 树结构列表
      */
     @Override
-    public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
+    public List<TopSysMenu> buildMenuTree(List<TopSysMenu> menus) {
+        List<TopSysMenu> returnList = new ArrayList<TopSysMenu>();
         List<Long> tempList = new ArrayList<Long>();
-        for (SysMenu dept : menus) {
+        for (TopSysMenu dept : menus) {
             tempList.add(dept.getMenuId());
         }
-        for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
-            SysMenu menu = (SysMenu) iterator.next();
+        for (Iterator<TopSysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
+            TopSysMenu menu = (TopSysMenu) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
@@ -199,9 +198,9 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildMenuTreeSelect(List<SysMenu> menus) {
-        List<SysMenu> menuTrees = buildMenuTree(menus);
-        return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
+    public List<TreeSelectTop> buildMenuTreeSelect(List<TopSysMenu> menus) {
+        List<TopSysMenu> menuTrees = buildMenuTree(menus);
+        return menuTrees.stream().map(TreeSelectTop::new).collect(Collectors.toList());
     }
 
     /**
@@ -211,7 +210,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 菜单信息
      */
     @Override
-    public SysMenu selectMenuById(Long menuId) {
+    public TopSysMenu selectMenuById(Long menuId) {
         return getById(menuId);
     }
 
@@ -223,7 +222,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      */
     @Override
     public boolean hasChildByMenuId(Long menuId) {
-        int result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId,menuId));
+        int result = count(new LambdaQueryWrapper<TopSysMenu>().eq(TopSysMenu::getParentId,menuId));
         return result > 0 ? true : false;
     }
 
@@ -235,7 +234,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      */
     @Override
     public boolean checkMenuExistRole(Long menuId) {
-        int result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId,menuId));
+        int result = topRoleMenuMapper.selectCount(new LambdaQueryWrapper<TopSysRoleMenu>().eq(TopSysRoleMenu::getMenuId,menuId));
         return result > 0 ? true : false;
     }
 
@@ -246,7 +245,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 结果
      */
     @Override
-    public int insertMenu(SysMenu menu) {
+    public int insertMenu(TopSysMenu menu) {
         return baseMapper.insert(menu);
     }
 
@@ -257,7 +256,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 结果
      */
     @Override
-    public int updateMenu(SysMenu menu) {
+    public int updateMenu(TopSysMenu menu) {
         return baseMapper.updateById(menu);
     }
 
@@ -279,11 +278,11 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @return 结果
      */
     @Override
-    public String checkMenuNameUnique(SysMenu menu) {
+    public String checkMenuNameUnique(TopSysMenu menu) {
         Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
-        SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
-                .eq(SysMenu::getMenuName,menu.getMenuName())
-                .eq(SysMenu::getParentId,menu.getParentId())
+        TopSysMenu info = getOne(new LambdaQueryWrapper<TopSysMenu>()
+                .eq(TopSysMenu::getMenuName,menu.getMenuName())
+                .eq(TopSysMenu::getParentId,menu.getParentId())
                 .last("limit 1"));
         if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
             return UserConstants.NOT_UNIQUE;
@@ -292,12 +291,12 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
     }
 
     @Override
-    public List<SysMenu> listSysMenuByTenant(Long tenantId) {
+    public List<TopSysMenu> listSysMenuByTenant(Long tenantId) {
         return baseMapper.listSysMenuByTenant(tenantId);
     }
 
     @Override
-    public Integer updateParentById(SysMenu newMenus) {
+    public Integer updateParentById(TopSysMenu newMenus) {
         return baseMapper.updateParentById(newMenus);
     }
 
@@ -307,7 +306,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param menu 菜单信息
      * @return 路由名称
      */
-    public String getRouteName(SysMenu menu) {
+    public String getRouteName(TopSysMenu menu) {
         String routerName = StrUtil.upperFirst(menu.getPath());
         // 非外链并且是一级目录（类型为目录）
         if (isMenuFrame(menu)) {
@@ -322,7 +321,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param menu 菜单信息
      * @return 路由地址
      */
-    public String getRouterPath(SysMenu menu) {
+    public String getRouterPath(TopSysMenu menu) {
         String routerPath = menu.getPath();
         // 非外链并且是一级目录（类型为目录）
         if (0 == menu.getParentId().intValue() && UserConstants.TYPE_DIR.equals(menu.getMenuType())
@@ -342,7 +341,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param menu 菜单信息
      * @return 组件信息
      */
-    public String getComponent(SysMenu menu) {
+    public String getComponent(TopSysMenu menu) {
         String component = UserConstants.LAYOUT;
         if (StrUtil.isNotEmpty(menu.getComponent()) && !isMenuFrame(menu)) {
             component = menu.getComponent();
@@ -358,7 +357,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isMenuFrame(SysMenu menu) {
+    public boolean isMenuFrame(TopSysMenu menu) {
         return menu.getParentId().intValue() == 0 && UserConstants.TYPE_MENU.equals(menu.getMenuType())
                 && menu.getIsFrame().equals(UserConstants.NO_FRAME);
     }
@@ -369,7 +368,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param menu 菜单信息
      * @return 结果
      */
-    public boolean isParentView(SysMenu menu) {
+    public boolean isParentView(TopSysMenu menu) {
         return menu.getParentId().intValue() != 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType());
     }
 
@@ -380,10 +379,10 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param parentId 传入的父节点ID
      * @return String
      */
-    public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
-            SysMenu t = (SysMenu) iterator.next();
+    public List<TopSysMenu> getChildPerms(List<TopSysMenu> list, int parentId) {
+        List<TopSysMenu> returnList = new ArrayList<TopSysMenu>();
+        for (Iterator<TopSysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
+            TopSysMenu t = (TopSysMenu) iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
             if (t.getParentId() == parentId) {
                 recursionFn(list, t);
@@ -399,11 +398,11 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
      * @param list
      * @param t
      */
-    private void recursionFn(List<SysMenu> list, SysMenu t) {
+    private void recursionFn(List<TopSysMenu> list, TopSysMenu t) {
         // 得到子节点列表
-        List<SysMenu> childList = getChildList(list, t);
+        List<TopSysMenu> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysMenu tChild : childList) {
+        for (TopSysMenu tChild : childList) {
             if (hasChild(list, tChild)) {
                 recursionFn(list, tChild);
             }
@@ -413,11 +412,11 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
     /**
      * 得到子节点列表
      */
-    private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
-        List<SysMenu> tlist = new ArrayList<SysMenu>();
-        Iterator<SysMenu> it = list.iterator();
+    private List<TopSysMenu> getChildList(List<TopSysMenu> list, TopSysMenu t) {
+        List<TopSysMenu> tlist = new ArrayList<TopSysMenu>();
+        Iterator<TopSysMenu> it = list.iterator();
         while (it.hasNext()) {
-            SysMenu n = (SysMenu) it.next();
+            TopSysMenu n = (TopSysMenu) it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue()) {
                 tlist.add(n);
             }
@@ -428,7 +427,7 @@ public class TopSysMenuServiceImpl extends ServiceImpl<TopSysMenuMapper, TopSysM
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysMenu> list, SysMenu t) {
+    private boolean hasChild(List<TopSysMenu> list, TopSysMenu t) {
         return getChildList(list, t).size() > 0 ? true : false;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysPostServiceImpl.java

@@ -6,11 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.modules.system.domain.SysPost;
-import com.zhongzheng.modules.system.domain.SysUserPost;
-import com.zhongzheng.modules.system.mapper.SysUserPostMapper;
 import com.zhongzheng.modules.top.domain.TopSysPost;
+import com.zhongzheng.modules.top.domain.TopSysUserPost;
 import com.zhongzheng.modules.top.mapper.TopSysPostMapper;
+import com.zhongzheng.modules.top.mapper.TopSysUserPostMapper;
 import com.zhongzheng.modules.top.service.ITopSysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -28,7 +27,7 @@ import java.util.List;
 public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysPost> implements ITopSysPostService {
 
     @Autowired
-    private SysUserPostMapper userPostMapper;
+    private TopSysUserPostMapper topUserPostMapper;
 
     /**
      * 查询岗位信息集合
@@ -37,12 +36,12 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 岗位信息集合
      */
     @Override
-    public List<SysPost> selectPostList(SysPost post) {
-        return list(new LambdaQueryWrapper<SysPost>()
-                .like(StrUtil.isNotBlank(post.getPostCode()), SysPost::getPostCode, post.getPostCode())
-                .eq(StrUtil.isNotBlank(post.getStatus()), SysPost::getStatus, post.getStatus())
-                .in(post.getStatusArray()!=null, SysPost::getStatus, post.getStatusArray())
-                .like(StrUtil.isNotBlank(post.getPostName()), SysPost::getPostName, post.getPostName()));
+    public List<TopSysPost> selectPostList(TopSysPost post) {
+        return list(new LambdaQueryWrapper<TopSysPost>()
+                .like(StrUtil.isNotBlank(post.getPostCode()), TopSysPost::getPostCode, post.getPostCode())
+                .eq(StrUtil.isNotBlank(post.getStatus()), TopSysPost::getStatus, post.getStatus())
+                .in(post.getStatusArray()!=null, TopSysPost::getStatus, post.getStatusArray())
+                .like(StrUtil.isNotBlank(post.getPostName()), TopSysPost::getPostName, post.getPostName()));
     }
 
     /**
@@ -51,7 +50,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 岗位列表
      */
     @Override
-    public List<SysPost> selectPostAll() {
+    public List<TopSysPost> selectPostAll() {
         return list();
     }
 
@@ -62,7 +61,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 角色对象信息
      */
     @Override
-    public SysPost selectPostById(Long postId) {
+    public TopSysPost selectPostById(Long postId) {
         return getById(postId);
     }
 
@@ -84,10 +83,10 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 结果
      */
     @Override
-    public String checkPostNameUnique(SysPost post) {
+    public String checkPostNameUnique(TopSysPost post) {
         Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
-                .eq(SysPost::getPostName, post.getPostName()).last("limit 1"));
+        TopSysPost info = getOne(new LambdaQueryWrapper<TopSysPost>()
+                .eq(TopSysPost::getPostName, post.getPostName()).last("limit 1"));
         if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -101,10 +100,10 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 结果
      */
     @Override
-    public String checkPostCodeUnique(SysPost post) {
+    public String checkPostCodeUnique(TopSysPost post) {
         Long postId = Validator.isNull(post.getPostId()) ? -1L : post.getPostId();
-        SysPost info = getOne(new LambdaQueryWrapper<SysPost>()
-                .eq(SysPost::getPostCode, post.getPostCode()).last("limit 1"));
+        TopSysPost info = getOne(new LambdaQueryWrapper<TopSysPost>()
+                .eq(TopSysPost::getPostCode, post.getPostCode()).last("limit 1"));
         if (Validator.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
@@ -119,7 +118,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      */
     @Override
     public int countUserPostById(Long postId) {
-        return userPostMapper.selectCount(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getPostId,postId));
+        return topUserPostMapper.selectCount(new LambdaQueryWrapper<TopSysUserPost>().eq(TopSysUserPost::getPostId,postId));
     }
 
     /**
@@ -143,7 +142,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
     @Override
     public int deletePostByIds(Long[] postIds) {
         for (Long postId : postIds) {
-            SysPost post = selectPostById(postId);
+            TopSysPost post = selectPostById(postId);
             if (countUserPostById(postId) > 0) {
                 throw new CustomException(String.format("%1$s已分配,不能删除", post.getPostName()));
             }
@@ -158,7 +157,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 结果
      */
     @Override
-    public int insertPost(SysPost post) {
+    public int insertPost(TopSysPost post) {
         return baseMapper.insert(post);
     }
 
@@ -169,7 +168,7 @@ public class TopSysPostServiceImpl extends ServiceImpl<TopSysPostMapper, TopSysP
      * @return 结果
      */
     @Override
-    public int updatePost(SysPost post) {
+    public int updatePost(TopSysPost post) {
         return baseMapper.updateById(post);
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysRoleServiceImpl.java

@@ -8,8 +8,6 @@ import com.zhongzheng.common.annotation.DataScope;
 import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.spring.SpringUtils;
-import com.zhongzheng.modules.system.domain.SysRoleDept;
-import com.zhongzheng.modules.system.domain.SysRoleMenu;
 import com.zhongzheng.modules.top.domain.TopSysRole;
 import com.zhongzheng.modules.top.domain.TopSysRoleDept;
 import com.zhongzheng.modules.top.domain.TopSysRoleMenu;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/service/impl/TopSysUserServiceImpl.java

@@ -12,16 +12,12 @@ import com.zhongzheng.common.constant.UserConstants;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseBusinessQueryBo;
-import com.zhongzheng.modules.system.domain.SysUserPost;
-import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.top.bo.TopSysUserAddBo;
 import com.zhongzheng.modules.top.bo.TopSysUserEditBo;
 import com.zhongzheng.modules.top.bo.TopSysUserQueryBo;
 import com.zhongzheng.modules.top.domain.TopSysUserPost;
 import com.zhongzheng.modules.top.domain.TopSysUserRole;
-import com.zhongzheng.modules.top.mapper.TopSysPostMapper;
 import com.zhongzheng.modules.top.mapper.TopSysUserMapper;
 import com.zhongzheng.modules.top.mapper.TopSysUserPostMapper;
 import com.zhongzheng.modules.top.mapper.TopSysUserRoleMapper;
@@ -122,7 +118,41 @@ public class TopSysUserServiceImpl extends ServiceImpl<TopSysUserMapper, TopSysU
         }
         return this.removeByIds(ids);
     }
+    /**
+     * 校验用户名称是否唯一
+     *
+     * @param user 用户信息
+     * @return
+     */
+    @Override
+    public String checkPhoneUnique(TopSysUser user) {
+        Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
+        TopSysUser info = getOne(new LambdaQueryWrapper<TopSysUser>()
+                .select(TopSysUser::getUserId, TopSysUser::getPhonenumber)
+                .eq(TopSysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
+        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
 
+    /**
+     * 校验email是否唯一
+     *
+     * @param user 用户信息
+     * @return
+     */
+    @Override
+    public String checkEmailUnique(TopSysUser user) {
+        Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
+        TopSysUser info = getOne(new LambdaQueryWrapper<TopSysUser>()
+                .select(TopSysUser::getUserId, TopSysUser::getEmail)
+                .eq(TopSysUser::getEmail, user.getEmail()).last("limit 1"));
+        if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
 
     /**
      * 根据条件分页查询用户列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/util/TreeSelectTop.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.top.util;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.zhongzheng.modules.top.domain.TopSysDept;
+import com.zhongzheng.modules.top.domain.TopSysMenu;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Treeselect树结构实体类
+ * 
+ * @author zhongzheng
+ */
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+public class TreeSelectTop implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 节点ID */
+    private Long id;
+
+    /** 节点名称 */
+    private String label;
+
+    /** 子节点 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private List<TreeSelectTop> children;
+
+    public TreeSelectTop(TopSysDept dept)
+    {
+        this.id = dept.getDeptId();
+        this.label = dept.getDeptName();
+        this.children = dept.getChildren().stream().map(TreeSelectTop::new).collect(Collectors.toList());
+    }
+
+    public TreeSelectTop(TopSysMenu menu)
+    {
+        this.id = menu.getMenuId();
+        this.label = menu.getMenuName();
+        this.children = menu.getChildren().stream().map(TreeSelectTop::new).collect(Collectors.toList());
+    }
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/vo/TopSysConfigVo.java

@@ -1,12 +1,13 @@
 package com.zhongzheng.modules.top.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -48,4 +49,20 @@ public class TopSysConfigVo {
 	@Excel(name = "配置模块")
 	@ApiModelProperty("配置模块")
 	private String configModule;
+	/**
+	 * 更新者
+	 */
+	@ApiModelProperty("更新者")
+	private String updateBy;
+	/**
+	 * 创建者
+	 */
+	@ApiModelProperty("创建者")
+	private String createBy;
+
+	/**
+	 * 请求参数
+	 */
+	@TableField(exist = false)
+	private Map<String, Object> params = new HashMap<>();
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysConfigMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.TopSysConfigMapper">
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysConfigMapper">
 
-    <resultMap type="com.zhongzheng.system.domain.TopSysConfig" id="TopSysConfigResult">
+    <resultMap type="com.zhongzheng.modules.top.domain.TopSysConfig" id="TopSysConfigResult">
         <result property="configId" column="config_id"/>
         <result property="configName" column="config_name"/>
         <result property="configKey" column="config_key"/>
@@ -18,5 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="configModule" column="config_module"/>
     </resultMap>
 
-
+    <select id="getSysConfigByKeyTenant" parameterType="map" resultType="com.zhongzheng.modules.top.domain.TopSysConfig">
+        select * from top_sys_config where config_key = #{key}
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysDeptMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.TopSysDeptMapper">
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysDeptMapper">
 
-    <resultMap type="com.zhongzheng.system.domain.TopSysDept" id="TopSysDeptResult">
+    <resultMap type="com.zhongzheng.modules.top.domain.TopSysDept" id="TopSysDeptResult">
         <result property="deptId" column="dept_id"/>
         <result property="parentId" column="parent_id"/>
         <result property="ancestors" column="ancestors"/>
@@ -21,5 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-
+    <select id="selectDeptListByRoleId" resultType="Integer">
+        select d.dept_id
+        from top_sys_dept d
+        left join top_sys_role_dept rd on d.dept_id = rd.dept_id
+        where rd.role_id = #{roleId}
+        <if test="deptCheckStrictly">
+            and d.dept_id not in (select d.parent_id from top_sys_dept d inner join sys_role_dept rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysMenuMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.TopSysMenuMapper">
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysMenuMapper">
 
-    <resultMap type="com.zhongzheng.system.domain.TopSysMenu" id="TopSysMenuResult">
+    <resultMap type="com.zhongzheng.modules.top.domain.TopSysMenu" id="TopSysMenuResult">
         <result property="menuId" column="menu_id"/>
         <result property="menuName" column="menu_name"/>
         <result property="parentId" column="parent_id"/>
@@ -24,6 +24,133 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="remark" column="remark"/>
     </resultMap>
+    <sql id="selectMenuVo">
+        select menu_id,
+               menu_name,
+               parent_id,
+               order_num,
+               path,
+               component,
+               is_frame,
+               is_cache,
+               menu_type,
+               visible,
+               status,
+               ifnull(perms, '') as perms,
+               icon,
+               create_time
+        from top_sys_menu
+    </sql>
 
 
+    <select id="selectMenuTreeAll" resultMap="TopSysMenuResult">
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.visible,
+                        m.status,
+                        ifnull(m.perms, '') as perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from top_sys_menu m
+        where m.menu_type in ('M', 'C')
+          and m.status = '1'
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuListByUserId" parameterType="com.zhongzheng.modules.top.domain.TopSysMenu" resultMap="TopSysMenuResult">
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.visible, m.status,
+        ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+        from top_sys_menu m
+        left join top_sys_role_menu rm on m.menu_id = rm.menu_id
+        left join top_sys_user_role ur on rm.role_id = ur.role_id
+        left join top_sys_role ro on ur.role_id = ro.role_id
+        where ur.user_id = #{params.userId}
+        <if test="menuName != null and menuName != ''">
+            AND menu_name like concat('%', #{menuName}, '%')
+        </if>
+        <if test="visible != null and visible != ''">
+            AND visible = #{visible}
+        </if>
+        <if test="status != null and status != ''">
+            AND m.status = #{status}
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="TopSysMenuResult">
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.visible,
+                        m.status,
+                        ifnull(m.perms, '') as perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from top_sys_menu m
+                 left join top_sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join top_sys_user_role ur on rm.role_id = ur.role_id
+                 left join top_sys_role ro on ur.role_id = ro.role_id
+                 left join top_sys_user u on ur.user_id = u.user_id
+        where u.user_id = #{userId}
+          and m.menu_type in ('M', 'C')
+          and m.status = 1
+          AND ro.status = 1
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuListByRoleId" resultType="Integer">
+        select m.menu_id
+        from top_sys_menu m
+        left join top_sys_role_menu rm on m.menu_id = rm.menu_id
+        where rm.role_id = #{roleId}
+        <if test="menuCheckStrictly">
+            and m.menu_id not in (select m.parent_id from top_sys_menu m inner join top_sys_role_menu rm on m.menu_id =
+            rm.menu_id and rm.role_id = #{roleId})
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="listSysMenuByTenant" parameterType="java.lang.Long" resultType="com.zhongzheng.common.core.domain.entity.SysMenu">
+        select * from top_sys_menu where tenant_id = #{tenantId}
+    </select>
+
+    <update id="updateParentById" parameterType="com.zhongzheng.common.core.domain.entity.SysMenu" >
+        update top_sys_menu
+        <set>
+            parent_id=#{newMenus.parentId}
+        </set>
+        where menu_id = #{newMenus.menuId}
+    </update>
+
+    <select id="selectMenuPerms" resultType="String">
+        select distinct m.perms
+        from top_sys_menu m
+                 left join top_sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join top_sys_user_role ur on rm.role_id = ur.role_id
+    </select>
+
+    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from top_sys_menu m
+                 left join top_sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join top_sys_user_role ur on rm.role_id = ur.role_id
+                 left join top_sys_role r on r.role_id = ur.role_id
+        where m.status = '1'
+          and r.status = '1'
+          and ur.user_id = #{userId}
+    </select>
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysPostMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysPostMapper">
+
+    <resultMap type="com.zhongzheng.modules.top.domain.TopSysPost" id="SysPostResult">
+        <id property="postId" column="post_id"/>
+        <result property="postCode" column="post_code"/>
+        <result property="postName" column="post_name"/>
+        <result property="postSort" column="post_sort"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectPostVo">
+        select post_id,
+               post_code,
+               post_name,
+               post_sort,
+               status,
+               create_by,
+               create_time,
+               remark
+        from top_sys_post
+    </sql>
+
+    <select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
+        select p.post_id
+        from top_sys_post p
+                 left join top_sys_user_post up on up.post_id = p.post_id
+                 left join top_sys_user u on u.user_id = up.user_id
+        where u.user_id = #{userId}
+    </select>
+
+    <select id="selectPostsByUserName" parameterType="String" resultMap="SysPostResult">
+        select p.post_id, p.post_name, p.post_code
+        from top_sys_post p
+                 left join top_sys_user_post up on up.post_id = p.post_id
+                 left join top_sys_user u on u.user_id = up.user_id
+        where u.user_name = #{userName}
+    </select>
+
+</mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysRoleMapper.xml

@@ -33,10 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         r.del_flag,
                         r.create_time,
                         r.remark
-        from sys_role r
-                 left join sys_user_role ur on ur.role_id = r.role_id
-                 left join sys_user u on u.user_id = ur.user_id
-                 left join sys_dept d on u.dept_id = d.dept_id
+        from top_sys_role r
+                 left join top_sys_user_role ur on ur.role_id = r.role_id
+                 left join top_sys_user u on u.user_id = ur.user_id
+                 left join top_sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="TopSysRoleResult">
@@ -46,9 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
         select r.role_id
-        from sys_role r
-                 left join sys_user_role ur on ur.role_id = r.role_id
-                 left join sys_user u on u.user_id = ur.user_id
+        from top_sys_role r
+                 left join top_sys_user_role ur on ur.role_id = r.role_id
+                 left join top_sys_user u on u.user_id = ur.user_id
         where u.user_id = #{userId}
     </select>
 

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysRoleMenuMapper.xml

@@ -2,12 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.TopSysRoleMenuMapper">
-
-    <resultMap type="com.zhongzheng.system.domain.TopSysRoleMenu" id="TopSysRoleMenuResult">
-        <result property="roleId" column="role_id"/>
-        <result property="menuId" column="menu_id"/>
-    </resultMap>
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysRoleMenuMapper">
 
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/top/TopSysUserRoleMapper.xml

@@ -2,12 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.system.mapper.TopSysUserRoleMapper">
-
-    <resultMap type="com.zhongzheng.system.domain.TopSysUserRole" id="TopSysUserRoleResult">
-        <result property="userId" column="user_id"/>
-        <result property="roleId" column="role_id"/>
-    </resultMap>
+<mapper namespace="com.zhongzheng.modules.top.mapper.TopSysUserRoleMapper">
 
 
 </mapper>