修改表为sys_开头，将每个controller层层级分清

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/DepartmentController.java

@@ -0,0 +1,9 @@
+package com.judong.chuanyiserver.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("department")
+public class DepartmentController {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/MenuController.java

@@ -0,0 +1,9 @@
+package com.judong.chuanyiserver.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("menu")
+public class MenuController {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/PermissionController.java

@@ -0,0 +1,97 @@
+package com.judong.chuanyiserver.controller;
+
+import com.judong.chuanyiserver.annotation.PermissionControl;
+import com.judong.chuanyiserver.entity.Permission;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.PermissionService;
+import com.judong.chuanyiserver.util.Blank;
+import com.judong.chuanyiserver.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("permission")
+public class PermissionController {
+
+    @Autowired
+    private PermissionService permissionService;
+
+    /**
+     * 新增权限资源
+     *
+     * @param permission
+     * @return
+     */
+    @PostMapping("/addPermission")
+    @PermissionControl
+    public Result addPermission(Permission permission) {
+        if (Blank.isEmpty(permission)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return permissionService.addPermission(permission);
+    }
+
+    /**
+     * 修改权限
+     *
+     * @param permission
+     * @return
+     */
+    @PostMapping("/updatePermission")
+    @PermissionControl
+    public Result updatePermission(Permission permission) {
+        if (Blank.isEmpty(permission)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return permissionService.updatePermission(permission);
+    }
+
+    /**
+     * 通过id查询权限
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getPermissionById")
+    @PermissionControl
+    public Result getPermissionById(Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return permissionService.getPermissionById(id);
+    }
+
+    /**
+     * 分页查询权限
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GetMapping("/getPermissionListByPage")
+    @PermissionControl
+    public Result getPermissionListByPage(Integer page, Integer limit) {
+        if (Blank.isEmpty(page, limit) || page < 1 || limit < 1) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return permissionService.getPermissionListByPage(page, limit);
+    }
+
+    /**
+     * 删除权限
+     *
+     * @param id
+     * @return
+     */
+    @PostMapping("/deletePermissionById")
+    @PermissionControl
+    public Result deletePermissionById(Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return permissionService.deletePermissionById(id);
+    }
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/RoleController.java

@@ -0,0 +1,82 @@
+package com.judong.chuanyiserver.controller;
+
+import com.judong.chuanyiserver.annotation.PermissionControl;
+import com.judong.chuanyiserver.entity.Role;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.RoleService;
+import com.judong.chuanyiserver.util.Blank;
+import com.judong.chuanyiserver.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("role")
+public class RoleController {
+
+    @Autowired
+    private RoleService roleService;
+
+    /**
+     * 新增角色
+     *
+     * @param roleName
+     * @return
+     */
+    @PostMapping("/addRole")
+    @PermissionControl
+    public Result addRole(String roleName) {
+        if (Blank.isEmpty(roleName)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return roleService.addRole(roleName);
+    }
+
+    /**
+     * 修改角色信息
+     *
+     * @param role
+     * @return
+     */
+    @PostMapping("/updateRole")
+    @PermissionControl
+    public Result updateRole(Role role) {
+        if (Blank.isEmpty(role)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return roleService.updateRole(role);
+    }
+
+    /**
+     * 分页查询所有的角色信息
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GetMapping("/getRoleListByPage")
+    @PermissionControl
+    public Result getRoleListByPage(Integer page, Integer limit) {
+        if (Blank.isEmpty(page, limit) || page < 1 || limit < 1) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return roleService.getRoleListByPage(page, limit);
+    }
+
+    /**
+     * 通过角色id查看角色信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getRoleById")
+    @PermissionControl
+    public Result getRoleById(Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return roleService.getRoleById(id);
+    }
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/UserController.java

@@ -154,36 +154,6 @@ public class UserController {
     }
 
     /**
-     * 新增角色
-     *
-     * @param roleName
-     * @return
-     */
-    @PostMapping("/addRole")
-    @PermissionControl
-    public Result addRole(String roleName) {
-        if (Blank.isEmpty(roleName)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.addRole(roleName);
-    }
-
-    /**
-     * 修改角色信息
-     *
-     * @param role
-     * @return
-     */
-    @PostMapping("/updateRole")
-    @PermissionControl
-    public Result updateRole(Role role) {
-        if (Blank.isEmpty(role)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.updateRole(role);
-    }
-
-    /**
      * 分配角色
      *
      * @param user
@@ -199,113 +169,6 @@ public class UserController {
     }
 
     /**
-     * 分页查询所有的角色信息
-     *
-     * @param page
-     * @param limit
-     * @return
-     */
-    @GetMapping("/getRoleListByPage")
-    @PermissionControl
-    public Result getRoleListByPage(Integer page, Integer limit) {
-        if (Blank.isEmpty(page, limit) || page < 1 || limit < 1) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.getRoleListByPage(page, limit);
-    }
-
-    /**
-     * 通过角色id查看角色信息
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/getRoleById")
-    @PermissionControl
-    public Result getRoleById(Integer id) {
-        if (Blank.isEmpty(id)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.getRoleById(id);
-    }
-
-    /**
-     * 新增权限资源
-     *
-     * @param permission
-     * @return
-     */
-    @PostMapping("/addPermission")
-    @PermissionControl
-    public Result addPermission(Permission permission) {
-        if (Blank.isEmpty(permission)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.addPermission(permission);
-    }
-
-    /**
-     * 修改权限
-     *
-     * @param permission
-     * @return
-     */
-    @PostMapping("/updatePermission")
-    @PermissionControl
-    public Result updatePermission(Permission permission) {
-        if (Blank.isEmpty(permission)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.updatePermission(permission);
-    }
-
-    /**
-     * 通过id查询权限
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping("/getPermissionById")
-    @PermissionControl
-    public Result getPermissionById(Integer id) {
-        if (Blank.isEmpty(id)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.getPermissionById(id);
-    }
-
-    /**
-     * 分页查询权限
-     *
-     * @param page
-     * @param limit
-     * @return
-     */
-    @GetMapping("/getPermissionListByPage")
-    @PermissionControl
-    public Result getPermissionListByPage(Integer page, Integer limit) {
-        if (Blank.isEmpty(page, limit) || page < 1 || limit < 1) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.getPermissionListByPage(page, limit);
-    }
-
-    /**
-     * 删除权限
-     *
-     * @param id
-     * @return
-     */
-    @PostMapping("/deletePermissionById")
-    @PermissionControl
-    public Result deletePermissionById(Integer id) {
-        if (Blank.isEmpty(id)) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
-        }
-        return userService.deletePermissionById(id);
-    }
-
-    /**
      * 给角色分配权限
      *
      * @param role

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/DepartmentDao.java

@@ -0,0 +1,7 @@
+package com.judong.chuanyiserver.dao;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface DepartmentDao {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/MenuDao.java

@@ -0,0 +1,7 @@
+package com.judong.chuanyiserver.dao;
+
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface MenuDao {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/PermissionDao.java

@@ -0,0 +1,28 @@
+package com.judong.chuanyiserver.dao;
+
+import com.judong.chuanyiserver.entity.Permission;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PermissionDao {
+    
+    Permission getPermissionByUrl(String permissionUrl);
+
+    Integer addPermission(Permission permission);
+
+    Permission getPermissionByNoIdUrl(int id, String permissionUrl);
+
+    Integer updatePermission(Permission permission);
+
+    Permission getPermissionById(Integer id);
+
+    Long getPermissionCount();
+
+    List<Permission> getPermissionListByPage(Long startNum, Long limitNum);
+
+    Integer deletePermissionById(Integer id);
+
+    Integer deleteRolePermissionById(Integer id);
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/RoleDao.java

@@ -0,0 +1,25 @@
+package com.judong.chuanyiserver.dao;
+
+import com.judong.chuanyiserver.entity.Role;
+import com.judong.chuanyiserver.util.Result;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface RoleDao {
+
+    Role getRoleByName(String roleName);
+
+    Integer addRole(String roleName);
+
+    Role getRoleByNoIdName(int id, String roleName);
+
+    Integer updateRole(Role role);
+
+    Long getRoleCount();
+
+    List<Role> getRoleListByPage(Long startNum, Long limitNum);
+
+    Role getRoleById(Integer id);
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/UserDao.java

@@ -18,10 +18,6 @@ public interface UserDao {
 
     Integer addUser(String userId, String userName, String password);
 
-    Role getRoleByName(String roleName);
-
-    Integer addRole(String roleName);
-
     Integer addUserRole(String userId, int roleId);
 
     List<Integer> getRoleIdListByUserId(String userId);
@@ -50,36 +46,8 @@ public interface UserDao {
 
     Integer updateUser(User user);
 
-    Integer updateRole(Role role);
-
-    Long getRoleCount();
-
-    List<Role> getRoleListByPage(Long startNum, Long limitNum);
-
-    Role getRoleById(Integer id);
-
-    Permission getPermissionByUrl(String permissionUrl);
-
-    Integer addPermission(Permission permission);
-
     User getUserByNameNoId(String userId, String userName);
 
-    Role getRoleByNoIdName(int id, String roleName);
-
-    Permission getPermissionByNoIdUrl(int id, String permissionUrl);
-
-    Integer updatePermission(Permission permission);
-
-    Permission getPermissionById(Integer id);
-
-    Long getPermissionCount();
-
-    List<Permission> getPermissionListByPage(Long startNum, Long limitNum);
-
-    Integer deletePermissionById(Integer id);
-
-    Integer deleteRolePermissionById(Integer id);
-
     List<Permission> getSharePermissionList(int roleId, List<Permission> permissionList);
 
     Integer deleteRolePermissionByRoleId(int roleId);

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/Department.java

@@ -0,0 +1,38 @@
+package com.judong.chuanyiserver.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class Department implements Serializable {
+
+    private static final long serialVersionUID = -96536212774977561L;
+
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 父id
+     */
+    private int parentId;
+    /**
+     * 菜单名称
+     */
+    private String departmentName;
+    /**
+     * 菜单路径
+     */
+    private String departmentDescribe;
+    /**
+     * 排序号
+     */
+    private int departmentNum;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/Menu.java

@@ -0,0 +1,49 @@
+package com.judong.chuanyiserver.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+public class Menu implements Serializable {
+
+    private static final long serialVersionUID = -96536212774977561L;
+
+    /**
+     * id
+     */
+    private int id;
+    /**
+     * 父id
+     */
+    private int parentId;
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+    /**
+     * 菜单路径
+     */
+    private String menuUrl;
+    /**
+     * 菜单图标
+     */
+    private String menuIcon;
+    /**
+     * 排序号
+     */
+    private int sortNum;
+    /**
+     * 菜单状态1：可用，0：不可用
+     */
+    private int menuStatus;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    private Date updateTime;
+
+    private List<Permission> permissionList;
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/Role.java

@@ -19,4 +19,6 @@ public class Role implements Serializable {
     private String roleName;
 
     private List<Permission> permissionList;
+
+    private List<Menu> menuList;
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/entity/User.java

@@ -46,4 +46,7 @@ public class User implements Serializable {
 
     private List<Role> roleList;
 
+    private List<Department> departmentList;
+
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/DepartmentService.java

@@ -0,0 +1,4 @@
+package com.judong.chuanyiserver.service;
+
+public interface DepartmentService {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/MenuService.java

@@ -0,0 +1,4 @@
+package com.judong.chuanyiserver.service;
+
+public interface MenuService {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/PermissionService.java

@@ -0,0 +1,17 @@
+package com.judong.chuanyiserver.service;
+
+import com.judong.chuanyiserver.entity.Permission;
+import com.judong.chuanyiserver.util.Result;
+
+public interface PermissionService {
+
+    Result addPermission(Permission permission);
+
+    Result updatePermission(Permission permission);
+
+    Result getPermissionById(Integer id);
+
+    Result getPermissionListByPage(Integer page, Integer limit);
+
+    Result deletePermissionById(Integer id);
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/RoleService.java

@@ -0,0 +1,15 @@
+package com.judong.chuanyiserver.service;
+
+import com.judong.chuanyiserver.entity.Role;
+import com.judong.chuanyiserver.util.Result;
+
+public interface RoleService {
+
+    Result addRole(String roleName);
+
+    Result updateRole(Role role);
+
+    Result getRoleListByPage(Integer page, Integer limit);
+
+    Result getRoleById(Integer id);
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/UserService.java

@@ -34,15 +34,6 @@ public interface UserService {
      */
     Result addUser(String userName, String password);
 
-    /**
-     * 新增角色
-     *
-     * @param roleName
-     * @return
-     */
-    Result addRole(String roleName);
-
-
     Result assignRole(String userId, List<Role> roleList);
 
     Result userLoginOut();
@@ -55,22 +46,6 @@ public interface UserService {
 
     Result updateUser(User user);
 
-    Result updateRole(Role role);
-
-    Result getRoleListByPage(Integer page, Integer limit);
-
-    Result getRoleById(Integer id);
-
-    Result addPermission(Permission permission);
-
-    Result updatePermission(Permission permission);
-
-    Result getPermissionById(Integer id);
-
-    Result getPermissionListByPage(Integer page, Integer limit);
-
-    Result deletePermissionById(Integer id);
-
     Result assignPermission(int roleId, List<Permission> permissionList);
 
     Result getCodeImage(boolean hasPubKey);

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/DepartmentServiceImpl.java

@@ -0,0 +1,10 @@
+package com.judong.chuanyiserver.service.impl;
+
+import com.judong.chuanyiserver.service.DepartmentService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class DepartmentServiceImpl implements DepartmentService {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/MenuServiceImpl.java

@@ -0,0 +1,10 @@
+package com.judong.chuanyiserver.service.impl;
+
+import com.judong.chuanyiserver.service.MenuService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class MenuServiceImpl implements MenuService {
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/PermissionServiceImpl.java

@@ -0,0 +1,75 @@
+package com.judong.chuanyiserver.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.judong.chuanyiserver.dao.PermissionDao;
+import com.judong.chuanyiserver.entity.Permission;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.PermissionService;
+import com.judong.chuanyiserver.util.Blank;
+import com.judong.chuanyiserver.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+public class PermissionServiceImpl implements PermissionService {
+
+    @Autowired
+    private PermissionDao permissionDao;
+
+    @Override
+    public Result addPermission(Permission permission) {
+        if (Blank.isEmpty(permission.getPermissionUrl()) || Blank.isEmpty(permission.getPermissionName())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "权限路径和名称不能为空");
+        }
+        if (Blank.isNotEmpty(permissionDao.getPermissionByUrl(permission.getPermissionUrl()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该路径已分配权限，请更换其他路径");
+        }
+        if (permissionDao.addPermission(permission) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增权限失败");
+        }
+        return Result.ok("新增资源权限成功");
+    }
+
+    @Override
+    public Result updatePermission(Permission permission) {
+        if (Blank.isEmpty(permission.getId()) || Blank.isEmpty(permission.getPermissionUrl()) || Blank.isEmpty(permission.getPermissionName())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "权限id，路径,名称不能为空");
+        }
+        if (Blank.isNotEmpty(permissionDao.getPermissionByNoIdUrl(permission.getId(), permission.getPermissionUrl()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该权限路径，请更换权限路径");
+        }
+        if (permissionDao.updatePermission(permission) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改权限失败");
+        }
+        return Result.ok("修改权限成功");
+    }
+
+    @Override
+    public Result getPermissionById(Integer id) {
+        return Result.ok(permissionDao.getPermissionById(id));
+    }
+
+    @Override
+    public Result getPermissionListByPage(Integer page, Integer limit) {
+        JSONObject jsonObject = new JSONObject();
+        Long count = permissionDao.getPermissionCount();
+        Long startNum = Long.valueOf((page - 1) * limit);
+        List<Permission> permissionList = permissionDao.getPermissionListByPage(startNum, Long.valueOf(limit));
+        jsonObject.put("count", count);
+        jsonObject.put("permissionList", permissionList);
+        return Result.ok(jsonObject);
+    }
+
+    @Override
+    public Result deletePermissionById(Integer id) {
+        if (permissionDao.deletePermissionById(id) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除权限失败");
+        }
+        permissionDao.deleteRolePermissionById(id);
+        return Result.ok("删除权限成功");
+    }
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RoleServiceImpl.java

@@ -0,0 +1,63 @@
+package com.judong.chuanyiserver.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.judong.chuanyiserver.dao.RoleDao;
+import com.judong.chuanyiserver.entity.Role;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.RoleService;
+import com.judong.chuanyiserver.util.Blank;
+import com.judong.chuanyiserver.util.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+public class RoleServiceImpl implements RoleService {
+
+    @Autowired
+    private RoleDao roleDao;
+    @Override
+    public Result addRole(String roleName) {
+        if (Blank.isNotEmpty(roleDao.getRoleByName(roleName))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该角色名已被使用，请更换其他角色名");
+        }
+        if (roleDao.addRole(roleName) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增失败");
+        }
+        return Result.ok("添加角色成功");
+    }
+
+    @Override
+    public Result updateRole(Role role) {
+        if (Blank.isEmpty(role.getId()) || Blank.isEmpty(role.getRoleName())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "角色Id和角色名称不能为空");
+        }
+        if (Blank.isNotEmpty(roleDao.getRoleByNoIdName(role.getId(), role.getRoleName()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该角色名，请更换角色名称");
+        }
+        if (roleDao.updateRole(role) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改角色失败");
+        }
+        return Result.ok("修改角色成功");
+    }
+
+    @Override
+    public Result getRoleListByPage(Integer page, Integer limit) {
+        JSONObject jsonObject = new JSONObject();
+        Long count = roleDao.getRoleCount();
+        Long startNum = Long.valueOf((page - 1) * limit);
+        List<Role> roleList = roleDao.getRoleListByPage(startNum, Long.valueOf(limit));
+        jsonObject.put("count", count);
+        jsonObject.put("roleList", roleList);
+        return Result.ok(jsonObject);
+    }
+
+    @Override
+    public Result getRoleById(Integer id) {
+        return Result.ok(roleDao.getRoleById(id));
+    }
+
+}

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserServiceImpl.java

@@ -196,23 +196,6 @@ public class UserServiceImpl implements UserService {
         return Result.ok("添加用户成功");
     }
 
-    /**
-     * 新增角色
-     *
-     * @param roleName
-     * @return
-     */
-    @Override
-    public synchronized Result addRole(String roleName) {
-        if (Blank.isNotEmpty(userDao.getRoleByName(roleName))) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该角色名已被使用，请更换其他角色名");
-        }
-        if (userDao.addRole(roleName) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增失败");
-        }
-        return Result.ok("添加角色成功");
-    }
-
     @Override
     public synchronized Result assignRole(String userId, List<Role> roleList) {
         //查询出拥有新旧角色集合拥有的公共角色
@@ -316,89 +299,6 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public synchronized Result updateRole(Role role) {
-        if (Blank.isEmpty(role.getId()) || Blank.isEmpty(role.getRoleName())) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "角色Id和角色名称不能为空");
-        }
-        if (Blank.isNotEmpty(userDao.getRoleByNoIdName(role.getId(), role.getRoleName()))) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该角色名，请更换角色名称");
-        }
-        if (userDao.updateRole(role) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改角色失败");
-        }
-        return Result.ok("修改角色成功");
-    }
-
-    @Override
-    public Result getRoleListByPage(Integer page, Integer limit) {
-        JSONObject jsonObject = new JSONObject();
-        Long count = userDao.getRoleCount();
-        Long startNum = Long.valueOf((page - 1) * limit);
-        List<Role> roleList = userDao.getRoleListByPage(startNum, Long.valueOf(limit));
-        jsonObject.put("count", count);
-        jsonObject.put("roleList", roleList);
-        return Result.ok(jsonObject);
-    }
-
-    @Override
-    public Result getRoleById(Integer id) {
-        return Result.ok(userDao.getRoleById(id));
-    }
-
-    @Override
-    public synchronized Result addPermission(Permission permission) {
-        if (Blank.isEmpty(permission.getPermissionUrl()) || Blank.isEmpty(permission.getPermissionName())) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "权限路径和名称不能为空");
-        }
-        if (Blank.isNotEmpty(userDao.getPermissionByUrl(permission.getPermissionUrl()))) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该路径已分配权限，请更换其他路径");
-        }
-        if (userDao.addPermission(permission) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增权限失败");
-        }
-        return Result.ok("新增资源权限成功");
-    }
-
-    @Override
-    public synchronized Result updatePermission(Permission permission) {
-        if (Blank.isEmpty(permission.getId()) || Blank.isEmpty(permission.getPermissionUrl()) || Blank.isEmpty(permission.getPermissionName())) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "权限id，路径,名称不能为空");
-        }
-        if (Blank.isNotEmpty(userDao.getPermissionByNoIdUrl(permission.getId(), permission.getPermissionUrl()))) {
-            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该权限路径，请更换权限路径");
-        }
-        if (userDao.updatePermission(permission) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改权限失败");
-        }
-        return Result.ok("修改权限成功");
-    }
-
-    @Override
-    public Result getPermissionById(Integer id) {
-        return Result.ok(userDao.getPermissionById(id));
-    }
-
-    @Override
-    public Result getPermissionListByPage(Integer page, Integer limit) {
-        JSONObject jsonObject = new JSONObject();
-        Long count = userDao.getPermissionCount();
-        Long startNum = Long.valueOf((page - 1) * limit);
-        List<Permission> permissionList = userDao.getPermissionListByPage(startNum, Long.valueOf(limit));
-        jsonObject.put("count", count);
-        jsonObject.put("permissionList", permissionList);
-        return Result.ok(jsonObject);
-    }
-
-    @Override
-    public Result deletePermissionById(Integer id) {
-        if (userDao.deletePermissionById(id) <= 0) {
-            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除权限失败");
-        }
-        userDao.deleteRolePermissionById(id);
-        return Result.ok("删除权限成功");
-    }
-
-    @Override
     public Result assignPermission(int roleId, List<Permission> permissionList) {
         List<Permission> sharePermissionList = userDao.getSharePermissionList(roleId, permissionList);
         List<Permission> newPermissionList = new ArrayList<>();

chuanyi_server/src/main/java/com/judong/chuanyiserver/util/ConstantStr.java

@@ -28,4 +28,6 @@ public class ConstantStr {
     public static final int OPC_DA = 0;
     public static final int OPC_UA = 1;
 
+
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/util/Test.java

@@ -1,87 +1,47 @@
 package com.judong.chuanyiserver.util;
 
-import com.judong.chuanyiserver.enums.ResultEnum;
+import com.alibaba.fastjson.JSONObject;
 import com.judong.chuanyiserver.exception.CustomException;
 import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
-import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
-import org.eclipse.milo.opcua.stack.client.DiscoveryClient;
-import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned;
-import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
+import org.eclipse.milo.opcua.sdk.client.api.UaClient;
+import org.eclipse.milo.opcua.stack.core.Stack;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.ExecutionException;
 
 public class Test {
 
-    private final CompletableFuture<OpcUaClient> future = new CompletableFuture<>();
     private static Logger logger = LoggerFactory.getLogger(Test.class);
-    private final static String endPointUrl = "opc.tcp://192.168.0.138:37800";
-    private static AtomicInteger atomic = new AtomicInteger(1);
-    private final static String certPath = "C:/Users/Administrator/Desktop/";
 
     public static void main(String[] args) throws Exception {
-
+        OpcUaClient client = test();
+        if (client == null) {
+            throw new CustomException(500, "客户端配置实例化失败");
+        }
+        // 创建连接
+        client.connect().get();
+        List<JSONObject> jsonObjectList = OpcServerUaUtil.generOpcUaTree(client, null);
+        System.out.println(jsonObjectList.toString());
     }
 
-//    private OpcUaClient createClient() throws Exception {
-//
-//        Path securityTempDir = Paths.get(certPath, "security");
-//
-//        Files.createDirectories(securityTempDir);
-//        if (!Files.exists(securityTempDir)) {
-//            throw new CustomException(ResultEnum.SERVER_ERROR.getRespCode(), "无法创建安全目录:" + securityTempDir);
-//        }
-//
-//        KeyStoreLoader loader = KeyStoreLoader.load(securityTempDir);
-//
-//        // 搜索OPC节点
-//        List<EndpointDescription> endpoints = null;
-//        try {
-//            endpoints = DiscoveryClient.getEndpoints(properties.getEndpointUrl()).get();
-//        } catch (Throwable e) {
-//            // try the explicit discovery endpoint as well
-//            String discoveryUrl = properties.getEndpointUrl();
-//
-//            if (!discoveryUrl.endsWith("/")) {
-//                discoveryUrl += "/";
-//            }
-//            discoveryUrl += "discovery";
-//
-//            log.info("Trying explicit discovery URL: {}", discoveryUrl);
-//            endpoints = DiscoveryClient.getEndpoints(discoveryUrl).get();
-//        }
-//
-//        EndpointDescription endpoint = endpoints.stream()
-//                .filter(e -> e.getSecurityPolicyUri().equals(SecurityPolicy.None.getUri())).filter(endpointFilter())
-//                .findFirst().orElseThrow(() -> new Exception("no desired endpoints returned"));
-//
-//        OpcUaClientConfig config = OpcUaClientConfig.builder()
-//                .setApplicationName(LocalizedText.english("my"))
-//                .setApplicationUri("urn:Jellyleo:UnifiedAutomation:UaExpert@Jellyleo")
-//                .setCertificate(loader.getClientCertificate()).setKeyPair(loader.getClientKeyPair())
-//                .setEndpoint(endpoint)
-////				.setIdentityProvider(new UsernameProvider("jellyleo", "123456"))
-//                .setIdentityProvider(new AnonymousProvider()) // 匿名验证
-//                .setRequestTimeout(Unsigned.uint(5000)).build();
-//
-//        return OpcUaClient.create(config);
-//    }
-//
-//    public static void xxx() {
-//        OpcUaClient opcUaClient = null;
-//        if (Blank.isEmpty(opcUaClient)) {
-//            throw new CustomException(ResultEnum.SERVER_ERROR.getRespCode(), ResultEnum.SERVER_ERROR.getRespMsg());
-//        }
-//    }
+    public static OpcUaClient test() throws Exception {
+        OpcUaClient client = OpcServerUaUtil.createClient();
+        OpcServerUaUtil.getFuture().whenCompleteAsync((c, ex) -> {
+            if (ex != null) {
+                throw new CustomException(500, ex.getMessage());
+            }
+            try {
+                c.disconnect().get();
+                Stack.releaseSharedResources();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new CustomException(500, e.getMessage());
+            }
+        });
+        return client;
+    }
 
 
 }

chuanyi_server/src/main/resources/mapper/ConnectDao.xml

@@ -3,11 +3,11 @@
 <mapper namespace="com.judong.chuanyiserver.dao.ConnectDao">
 
     <insert id="saveConnect">
-        insert into server_information(user_id, ip_address, ip_user_name, ip_password, agreement_type, create_time)
+        insert into sys_server_information(user_id, ip_address, ip_user_name, ip_password, agreement_type, create_time)
             value (#{userId}, #{ipAddress}, #{ipUserName}, #{ipPassword}, #{agreementType}, now())
     </insert>
     <update id="editConnect">
-        update server_information
+        update sys_server_information
         set ip_address=#{ipAddress},
             ip_user_name=#{ipUserName},
             ip_password=#{ipPassword},
@@ -16,30 +16,30 @@
     </update>
     <delete id="deleteConnect">
         delete
-        from server_information
+        from sys_server_information
         where id = #{id}
           and user_id = #{userId}
     </delete>
     <select id="getServerInformation" resultType="com.judong.chuanyiserver.entity.ServerInformation">
         select id, user_id, ip_address, ip_user_name, ip_password, agreement_type, create_time
-        from server_information
+        from sys_server_information
         where user_id = #{userId}
           and ip_address = #{ipAddress}
     </select>
     <select id="getServerInformationById" resultType="com.judong.chuanyiserver.entity.ServerInformation">
         select id, user_id, ip_address, ip_user_name, ip_password, agreement_type, create_time
-        from server_information
+        from sys_server_information
         where id = #{id}
     </select>
     <select id="selectAllConnect" resultType="com.judong.chuanyiserver.entity.ServerInformation">
         select id, ip_address, agreement_type, create_time
-        from server_information
+        from sys_server_information
         where user_id = #{userId}
         order by create_time desc
     </select>
     <select id="getServerInformationEdit" resultType="com.judong.chuanyiserver.entity.ServerInformation">
         select id, user_id, ip_address, ip_user_name, ip_password, agreement_type, create_time
-        from server_information
+        from sys_server_information
         where user_id = #{userId}
           and ip_address = #{ipAddress}
           and id != #{id}

chuanyi_server/src/main/resources/mapper/DepartmentDao.xml

@@ -0,0 +1,5 @@
+<?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.judong.chuanyiserver.dao.DepartmentDao">
+
+</mapper>

chuanyi_server/src/main/resources/mapper/MenuDao.xml

@@ -0,0 +1,5 @@
+<?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.judong.chuanyiserver.dao.MenuDao">
+
+</mapper>

chuanyi_server/src/main/resources/mapper/PermissionDao.xml

@@ -0,0 +1,55 @@
+<?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.judong.chuanyiserver.dao.PermissionDao">
+
+    <insert id="addPermission">
+        INSERT INTO sys_permission (permission_url, permission_name)
+            VALUE (#{permissionUrl}, #{permissionName})
+    </insert>
+    <update id="updatePermission">
+        update sys_permission
+        set permission_url=#{permissionUrl},
+            permission_name=#{permissionName}
+        where id = #{id}
+    </update>
+    <delete id="deletePermissionById">
+        delete
+        from sys_permission
+        where id = #{id}
+    </delete>
+    <delete id="deleteRolePermissionById">
+        delete
+        from sys_role_permission
+        where permission_id = #{id}
+    </delete>
+
+    <select id="getPermissionByUrl" resultType="com.judong.chuanyiserver.entity.Permission">
+        select id, permission_url, permission_name
+        from sys_permission
+        where permission_url = #{permissionUrl}
+    </select>
+
+    <select id="getPermissionByNoIdUrl" resultType="com.judong.chuanyiserver.entity.Permission">
+        select id, permission_url, permission_name
+        from sys_permission
+        where id != #{id}
+          and permission_url = #{permissionUrl}
+    </select>
+
+    <select id="getPermissionById" resultType="com.judong.chuanyiserver.entity.Permission">
+        select id, permission_url, permission_name
+        from sys_permission
+        where id = #{id}
+    </select>
+
+    <select id="getPermissionCount" resultType="java.lang.Long">
+        select count(*)
+        from sys_permission
+    </select>
+
+    <select id="getPermissionListByPage" resultType="com.judong.chuanyiserver.entity.Permission">
+        select id, permission_url, permission_name
+        from sys_permission
+        limit #{startNum},#{limitNum}
+    </select>
+</mapper>

chuanyi_server/src/main/resources/mapper/RoleDao.xml

@@ -0,0 +1,46 @@
+<?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.judong.chuanyiserver.dao.RoleDao">
+
+    <insert id="addRole">
+        INSERT INTO sys_role (role_name)
+            VALUE (#{roleName})
+    </insert>
+
+    <update id="updateRole">
+        update sys_role
+        set role_name=#{roleName}
+        where id = #{id}
+    </update>
+
+    <select id="getRoleByName" resultType="com.judong.chuanyiserver.entity.Role">
+        SELECT id,
+               role_name
+        FROM sys_role
+        WHERE role_name = #{roleName}
+    </select>
+
+    <select id="getRoleByNoIdName" resultType="com.judong.chuanyiserver.entity.Role">
+        select id, role_name
+        from sys_role
+        where id != #{id}
+          and role_name = #{roleName}
+    </select>
+
+    <select id="getRoleCount" resultType="java.lang.Long">
+        select count(*)
+        from sys_role
+    </select>
+
+    <select id="getRoleListByPage" resultType="com.judong.chuanyiserver.entity.Role">
+        select id, role_name
+        from sys_role
+        limit #{startNum},#{limitNum}
+    </select>
+
+    <select id="getRoleById" resultType="com.judong.chuanyiserver.entity.Role">
+        select id, role_name
+        from sys_role
+        where id = #{id}
+    </select>
+</mapper>

chuanyi_server/src/main/resources/mapper/ServerInDao.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.judong.chuanyiserver.dao.ServerInDao">
 
     <select id="selectServerByUser" resultType="com.judong.chuanyiserver.entity.ServerInformation">
-        select * from
+
     </select>
 </mapper>

chuanyi_server/src/main/resources/mapper/UserDao.xml

@@ -10,7 +10,7 @@
                create_date,
                last_login_time,
                state
-        FROM user
+        FROM sys_user
         WHERE user_name = #{userName}
           and password = #{password}
     </select>
@@ -22,7 +22,7 @@
                create_date,
                last_login_time,
                state
-        FROM user
+        FROM sys_user
         WHERE user_id = #{userId}
     </select>
 
@@ -33,62 +33,50 @@
                create_date,
                last_login_time,
                state
-        FROM user
+        FROM sys_user
         WHERE user_name = #{userName}
     </select>
 
     <insert id="addUser">
-        INSERT INTO USER (user_id, user_name, PASSWORD, create_date, state)
+        INSERT INTO sys_user (user_id, user_name, PASSWORD, create_date, state)
             VALUE (#{userId}, #{userName}, #{password}, now(), 0)
     </insert>
 
-    <insert id="addRole">
-        INSERT INTO role (role_name)
-            VALUE (#{roleName})
-    </insert>
     <insert id="addUserRole">
-        INSERT INTO user_role (user_id, role_id)
+        INSERT INTO sys_user_role (user_id, role_id)
             VALUE (#{userId}, #{roleId})
     </insert>
+
     <insert id="addRoleList">
-        INSERT INTO user_role (user_id, role_id) VALUES
+        INSERT INTO sys_user_role (user_id, role_id) VALUES
         <foreach collection="roleList" item="role" index="index" separator=",">
             (#{userId},#{role.id})
         </foreach>
     </insert>
-    <insert id="addPermission">
-        INSERT INTO permission (permission_url, permission_name)
-            VALUE (#{permissionUrl}, #{permissionName})
-    </insert>
+
     <insert id="addPermissionList">
-        INSERT INTO role_permission (role_id, permission_id) VALUES
+        INSERT INTO sys_role_permission (role_id, permission_id) VALUES
         <foreach collection="permissionList" item="permission" index="index" separator=",">
             (#{roleId},#{permission.id})
         </foreach>
     </insert>
 
-    <select id="getRoleByName" resultType="com.judong.chuanyiserver.entity.Role">
-        SELECT id,
-               role_name
-        FROM role
-        WHERE role_name = #{roleName}
-    </select>
     <select id="getRoleIdListByUserId" resultType="java.lang.Integer">
         SELECT role_id
-        from user_role
+        from sys_user_role
         where user_id = #{userId}
     </select>
     <select id="getShareRoleList" resultType="com.judong.chuanyiserver.entity.Role">
         select id, role_name
-        from role where id in
-        ( SELECT role_id FROM user_role where user_id=#{userId} and role_id in
+        from sys_role where id in
+        ( SELECT role_id FROM sys_user_role where user_id=#{userId} and role_id in
         <foreach collection="roleList" item="role" index="index" open="(" close=")" separator=",">
             #{role.id}
         </foreach>)
     </select>
 
     <delete id="deleteUserRole">
-        delete from user_role where user_id=#{userId}
+        delete from sys_user_role where user_id=#{userId}
         AND role_id in (
         <foreach collection="roleIdList" item="roleId" index="index" separator=",">
             #{roleId}
@@ -96,26 +84,17 @@
     </delete>
     <delete id="deleteUserRoleByUserId">
         delete
-        from user_role
+        from sys_user_role
         where user_id = #{userId}
     </delete>
-    <delete id="deletePermissionById">
-        delete
-        from permission
-        where id = #{id}
-    </delete>
-    <delete id="deleteRolePermissionById">
-        delete
-        from role_permission
-        where permission_id = #{id}
-    </delete>
+
     <delete id="deleteRolePermissionByRoleId">
         delete
-        from role_permission
+        from sys_role_permission
         where role_id = #{roleId}
     </delete>
     <delete id="deleteRolePermission">
-        delete from role_permission where role_id=#{roleId}
+        delete from sys_role_permission where role_id=#{roleId}
         AND permission_id in (
         <foreach collection="permissionIdList" item="permissionId" index="index" separator=",">
             #{permissionId}
@@ -123,9 +102,9 @@
     </delete>
 
     <select id="getPermissionByRoleList" resultType="com.judong.chuanyiserver.entity.Permission">
-        SELECT id, permission_url, permission_name FROM permission
+        SELECT id, permission_url, permission_name FROM sys_permission
         WHERE id in (
-        SELECT permission_id FROM role_permission WHERE
+        SELECT permission_id FROM sys_role_permission WHERE
         role_id in (
         <foreach collection="roleList" item="role" index="index" separator=",">
             #{role}
@@ -133,91 +112,48 @@
     </select>
     <select id="getRoleListByUserId" resultType="com.judong.chuanyiserver.entity.Role">
         select id, role_name
-        from role
+        from sys_role
         where id in (
             SELECT role_id
-            from user_role
+            from sys_user_role
             where user_id = #{userId})
     </select>
     <select id="getUserCount" resultType="java.lang.Long">
         select count(*)
-        from user;
+        from sys_user;
     </select>
     <select id="getUserPage" resultType="com.judong.chuanyiserver.entity.User">
         select user_id, user_name, password, create_date, last_login_time, state
-        from user
+        from sys_user
         order by create_date DESC
         limit #{startNum},#{limitNum}
     </select>
     <select id="getNoShareOldRoleList" resultType="java.lang.Integer">
-        SELECT role_id FROM user_role WHERE user_id=#{userId} AND role_id NOT IN
+        SELECT role_id FROM sys_user_role WHERE user_id=#{userId} AND role_id NOT IN
         (
         <foreach collection="roleList" item="role" index="index" separator=",">
             #{role.id}
         </foreach>
         )
     </select>
-    <select id="getRoleCount" resultType="java.lang.Long">
-        select count(*)
-        from role
-    </select>
-    <select id="getRoleListByPage" resultType="com.judong.chuanyiserver.entity.Role">
-        select id, role_name
-        from role
-        limit #{startNum},#{limitNum}
-    </select>
-    <select id="getRoleById" resultType="com.judong.chuanyiserver.entity.Role">
-        select id, role_name
-        from role
-        where id = #{id}
-    </select>
-    <select id="getPermissionByUrl" resultType="com.judong.chuanyiserver.entity.Permission">
-        select id, permission_url, permission_name
-        from permission
-        where permission_url = #{permissionUrl}
-    </select>
+
     <select id="getUserByNameNoId" resultType="com.judong.chuanyiserver.entity.User">
         select user_id, user_name, password, create_date, last_login_time, state
-        from user
+        from sys_user
         where user_id != #{userId}
           and user_name = #{userName}
     </select>
-    <select id="getRoleByNoIdName" resultType="com.judong.chuanyiserver.entity.Role">
-        select id, role_name
-        from role
-        where id != #{id}
-          and role_name = #{roleName}
-    </select>
-    <select id="getPermissionByNoIdUrl" resultType="com.judong.chuanyiserver.entity.Permission">
-        select id, permission_url, permission_name
-        from permission
-        where id != #{id}
-          and permission_url = #{permissionUrl}
-    </select>
-    <select id="getPermissionById" resultType="com.judong.chuanyiserver.entity.Permission">
-        select id, permission_url, permission_name
-        from permission
-        where id = #{id}
-    </select>
-    <select id="getPermissionCount" resultType="java.lang.Long">
-        select count(*)
-        from permission
-    </select>
-    <select id="getPermissionListByPage" resultType="com.judong.chuanyiserver.entity.Permission">
-        select id, permission_url, permission_name
-        from permission
-        limit #{startNum},#{limitNum}
-    </select>
+
     <select id="getSharePermissionList" resultType="com.judong.chuanyiserver.entity.Permission">
         select id, permission_url, permission_name
-        from permission where id in
-        ( SELECT permission_id FROM role_permission where role_id=#{roleId} and permission_id in
+        from sys_permission where id in
+        ( SELECT permission_id FROM sys_role_permission where role_id=#{roleId} and permission_id in
         <foreach collection="permissionList" item="permission" index="index" open="(" close=")" separator=",">
             #{permission.id}
         </foreach>)
     </select>
     <select id="getNoShareOldPermissionList" resultType="java.lang.Integer">
-        SELECT permission_id FROM role_permission WHERE role_id=#{roleId} AND permission_id NOT IN
+        SELECT permission_id FROM sys_role_permission WHERE role_id=#{roleId} AND permission_id NOT IN
         (
         <foreach collection="permissionList" item="permission" index="index" separator=",">
             #{permission.id}
@@ -226,30 +162,20 @@
     </select>
 
     <update id="updateUserState">
-        update user
+        update sys_user
         set state=#{userState}
         where user_id = #{userId}
     </update>
     <update id="updateLoginState">
-        update user
+        update sys_user
         set last_login_time=now()
         where user_id = #{userId}
     </update>
     <update id="updateUser">
-        update user
+        update sys_user
         set user_name=#{userName},
             password=#{password}
         where user_id = #{userId}
     </update>
-    <update id="updateRole">
-        update role
-        set role_name=#{roleName}
-        where id = #{id}
-    </update>
-    <update id="updatePermission">
-        update permission
-        set permission_url=#{permissionUrl},
-            permission_name=#{permissionName}
-        where id = #{id}
-    </update>
+
 </mapper>