1

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

@@ -1,9 +1,83 @@
 package com.judong.chuanyiserver.controller;
 
+import com.judong.chuanyiserver.annotation.PermissionControl;
+import com.judong.chuanyiserver.entity.Department;
+import com.judong.chuanyiserver.entity.Role;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.DepartmentService;
+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("department")
 public class DepartmentController {
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    /**
+     * 新增部门
+     *
+     * @param department
+     * @return
+     */
+    @PostMapping("/addDepartment")
+    @PermissionControl
+    public Result addDepartment(Department department) {
+        if (Blank.isEmpty(department)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return departmentService.addDepartment(department);
+    }
+
+    /**
+     * 修改角色信息
+     *
+     * @param department
+     * @return
+     */
+    @PostMapping("/updateDepartment")
+    @PermissionControl
+    public Result updateDepartment(Department department) {
+        if (Blank.isEmpty(department)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return departmentService.updateDepartment(department);
+    }
+
+    /**
+     * 分页查询所有的角色信息
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GetMapping("/getDepartmentListByPage")
+    @PermissionControl
+    public Result getDepartmentListByPage(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 departmentService.getDepartmentListByPage(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 departmentService.getRoleById(id);
+//    }
 }

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

@@ -1,9 +1,82 @@
 package com.judong.chuanyiserver.controller;
 
+import com.judong.chuanyiserver.annotation.PermissionControl;
+import com.judong.chuanyiserver.entity.Menu;
+import com.judong.chuanyiserver.enums.ResultEnum;
+import com.judong.chuanyiserver.service.MenuService;
+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("menu")
 public class MenuController {
+
+    @Autowired
+    private MenuService menuService;
+
+    /**
+     * 新增菜单
+     *
+     * @param menu
+     * @return
+     */
+    @PostMapping("/addMenu")
+    @PermissionControl
+    public Result addMenu(Menu menu) {
+        if (Blank.isEmpty(menu)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return menuService.addMenu(menu);
+    }
+
+    /**
+     * 修改菜单信息
+     *
+     * @param menu
+     * @return
+     */
+    @PostMapping("/updateMenu")
+    @PermissionControl
+    public Result updateMenu(Menu menu) {
+        if (Blank.isEmpty(menu)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return menuService.updateMenu(menu);
+    }
+
+    /**
+     * 分页查询所有的菜单信息
+     *
+     * @param page
+     * @param limit
+     * @return
+     */
+    @GetMapping("/getMenuListByPage")
+    @PermissionControl
+    public Result getMenuListByPage(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 menuService.getMenuListByPage(page, limit);
+    }
+
+    /**
+     * 通过id查看菜单信息
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping("/getMenuById")
+    @PermissionControl
+    public Result getMenuById(Integer id) {
+        if (Blank.isEmpty(id)) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return menuService.getMenuById(id);
+    }
 }

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

@@ -1,7 +1,22 @@
 package com.judong.chuanyiserver.dao;
 
+import com.judong.chuanyiserver.entity.Department;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface DepartmentDao {
+
+    DepartmentDao getDepartmentByName(String departmentName);
+
+    Integer addDepartment(Department department);
+
+    Department getDepartmentByNoIdName(int id, String departmentName);
+
+    Integer updateDepartment(Department department);
+
+    Long getDepartmentCount();
+
+    List<Department> getDepartmentListByPage(Long startNum, Long limitNum);
 }

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

@@ -1,7 +1,24 @@
 package com.judong.chuanyiserver.dao;
 
+import com.judong.chuanyiserver.entity.Menu;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface MenuDao {
+
+    Menu getMenuByUrl(String menuUrl);
+
+    Integer addMenu(Menu menu);
+
+    Menu getMenuByNoIdUrl(int id, String menuUrl);
+
+    Integer updateMenu(Menu menu);
+
+    Long getMenuCount();
+
+    List<Menu> getMenuListByPage(Long startNum, Long limitNum);
+
+    Menu getMenuById(Integer id);
 }

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

@@ -1,8 +1,11 @@
 package com.judong.chuanyiserver.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
+@Data
 public class Department implements Serializable {
 
     private static final long serialVersionUID = -96536212774977561L;

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

@@ -1,9 +1,12 @@
 package com.judong.chuanyiserver.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class Menu implements Serializable {
 
     private static final long serialVersionUID = -96536212774977561L;

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

@@ -3,6 +3,7 @@ package com.judong.chuanyiserver.entity;
 import lombok.Data;
 
 import java.io.Serializable;
+
 @Data
 public class Permission implements Serializable {
 
@@ -11,7 +12,7 @@ public class Permission implements Serializable {
     /**
      * id
      */
-    private int id ;
+    private int id;
     /**
      * 权限路径
      */

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

@@ -38,7 +38,11 @@ public class User implements Serializable {
     /**
      * 创建时间
      */
-    private Date createDate;
+    private Date createTime;
+    /**
+     * 创建时间
+     */
+    private Date updateTime;
     /**
      * 最后登录时间
      */

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

@@ -1,4 +1,13 @@
 package com.judong.chuanyiserver.service;
 
+import com.judong.chuanyiserver.entity.Department;
+import com.judong.chuanyiserver.util.Result;
+
 public interface DepartmentService {
+
+    Result addDepartment(Department department);
+
+    Result updateDepartment(Department department);
+
+    Result getDepartmentListByPage(Integer page, Integer limit);
 }

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

@@ -1,4 +1,15 @@
 package com.judong.chuanyiserver.service;
 
+import com.judong.chuanyiserver.entity.Menu;
+import com.judong.chuanyiserver.util.Result;
+
 public interface MenuService {
+
+    Result addMenu(Menu menu);
+
+    Result updateMenu(Menu menu);
+
+    Result getMenuListByPage(Integer page, Integer limit);
+
+    Result getMenuById(Integer id);
 }

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

@@ -79,7 +79,7 @@ public class ConnectServiceImpl implements ConnectService {
     }
 
     @Override
-    public Result deleteConnect(int id) {
+    public synchronized Result deleteConnect(int id) {
         String userId = userUtil.getCurrentUserId();
         if (connectDao.deleteConnect(id, userId) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除连接失败");

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

@@ -1,10 +1,62 @@
 package com.judong.chuanyiserver.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.judong.chuanyiserver.dao.DepartmentDao;
+import com.judong.chuanyiserver.entity.Department;
+import com.judong.chuanyiserver.entity.Menu;
+import com.judong.chuanyiserver.enums.ResultEnum;
 import com.judong.chuanyiserver.service.DepartmentService;
+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 DepartmentServiceImpl implements DepartmentService {
+
+    @Autowired
+    private DepartmentDao departmentDao;
+
+    @Override
+    public synchronized Result addDepartment(Department department) {
+        if (Blank.isEmpty(department.getParentId(), department.getDepartmentName())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "父id，部门名称不能为空");
+        }
+        if (Blank.isEmpty(departmentDao.getDepartmentByName(department.getDepartmentName()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该部门名称已被使用，请更换其他部门名称");
+        }
+        if (departmentDao.addDepartment(department) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增失败");
+        }
+        return Result.ok("添加部门成功");
+    }
+
+    @Override
+    public synchronized Result updateDepartment(Department department) {
+        if (Blank.isEmpty(department.getId(), department.getParentId(), department.getDepartmentName())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "id,父id，部门名称不能为空");
+        }
+        if (Blank.isNotEmpty(departmentDao.getDepartmentByNoIdName(department.getId(), department.getDepartmentName()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该部门名称，请更换部门名称");
+        }
+        if (departmentDao.updateDepartment(department) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改部门失败");
+        }
+        return Result.ok("修改部门成功");
+    }
+
+    @Override
+    public Result getDepartmentListByPage(Integer page, Integer limit) {
+        JSONObject jsonObject = new JSONObject();
+        Long count = departmentDao.getDepartmentCount();
+        Long startNum = Long.valueOf((page - 1) * limit);
+        List<Department> departmentList = departmentDao.getDepartmentListByPage(startNum, Long.valueOf(limit));
+        jsonObject.put("count", count);
+        jsonObject.put("departmentList", departmentList);
+        return Result.ok(jsonObject);
+    }
 }

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

@@ -1,10 +1,68 @@
 package com.judong.chuanyiserver.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.judong.chuanyiserver.dao.MenuDao;
+import com.judong.chuanyiserver.entity.Menu;
+import com.judong.chuanyiserver.enums.ResultEnum;
 import com.judong.chuanyiserver.service.MenuService;
+import com.judong.chuanyiserver.util.Blank;
+import com.judong.chuanyiserver.util.ConstantStr;
+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 MenuServiceImpl implements MenuService {
+    @Autowired
+    private MenuDao menuDao;
+
+    @Override
+    public synchronized Result addMenu(Menu menu) {
+        if (Blank.isEmpty(menu.getParentId(), menu.getMenuName(), menu.getMenuUrl())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "父id，菜单名称，菜单路径不能为空");
+        }
+        if (Blank.isEmpty(menuDao.getMenuByUrl(menu.getMenuUrl()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该菜单路径已被使用，请更换其他菜单路径");
+        }
+        //新增菜单，默认为可用
+        menu.setMenuStatus(ConstantStr.MENU_AVAILABLE);
+        if (menuDao.addMenu(menu) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "新增失败");
+        }
+        return Result.ok("添加菜单成功");
+    }
+
+    @Override
+    public Result updateMenu(Menu menu) {
+        if (Blank.isEmpty(menu.getId(), menu.getParentId(), menu.getMenuName(), menu.getMenuUrl())) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "id,父id，菜单名称，菜单路径不能为空");
+        }
+        if (Blank.isNotEmpty(menuDao.getMenuByNoIdUrl(menu.getId(), menu.getMenuUrl()))) {
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "已存在该菜单路径，请更换菜单路径");
+        }
+        if (menuDao.updateMenu(menu) <= 0) {
+            return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "修改菜单失败");
+        }
+        return Result.ok("修改菜单成功");
+    }
+
+    @Override
+    public Result getMenuListByPage(Integer page, Integer limit) {
+        JSONObject jsonObject = new JSONObject();
+        Long count = menuDao.getMenuCount();
+        Long startNum = Long.valueOf((page - 1) * limit);
+        List<Menu> menuList = menuDao.getMenuListByPage(startNum, Long.valueOf(limit));
+        jsonObject.put("count", count);
+        jsonObject.put("menuList", menuList);
+        return Result.ok(jsonObject);
+    }
+
+    @Override
+    public Result getMenuById(Integer id) {
+        return Result.ok(menuDao.getMenuById(id));
+    }
 }

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

@@ -21,7 +21,7 @@ public class PermissionServiceImpl implements PermissionService {
     private PermissionDao permissionDao;
 
     @Override
-    public Result addPermission(Permission permission) {
+    public synchronized Result addPermission(Permission permission) {
         if (Blank.isEmpty(permission.getPermissionUrl()) || Blank.isEmpty(permission.getPermissionName())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "权限路径和名称不能为空");
         }
@@ -35,7 +35,7 @@ public class PermissionServiceImpl implements PermissionService {
     }
 
     @Override
-    public Result updatePermission(Permission permission) {
+    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，路径,名称不能为空");
         }
@@ -65,7 +65,7 @@ public class PermissionServiceImpl implements PermissionService {
     }
 
     @Override
-    public Result deletePermissionById(Integer id) {
+    public synchronized Result deletePermissionById(Integer id) {
         if (permissionDao.deletePermissionById(id) <= 0) {
             return Result.no(ResultEnum.SERVER_ERROR.getRespCode(), "删除权限失败");
         }

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

@@ -19,8 +19,9 @@ public class RoleServiceImpl implements RoleService {
 
     @Autowired
     private RoleDao roleDao;
+
     @Override
-    public Result addRole(String roleName) {
+    public synchronized Result addRole(String roleName) {
         if (Blank.isNotEmpty(roleDao.getRoleByName(roleName))) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "该角色名已被使用，请更换其他角色名");
         }
@@ -31,7 +32,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    public Result updateRole(Role role) {
+    public synchronized Result updateRole(Role role) {
         if (Blank.isEmpty(role.getId()) || Blank.isEmpty(role.getRoleName())) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "角色Id和角色名称不能为空");
         }

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

@@ -265,7 +265,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Result updateUserStateById(String userId, Integer userState) {
+    public synchronized Result updateUserStateById(String userId, Integer userState) {
         if (userState != ConstantStr.NORMAL_USE && userState != ConstantStr.LOCK_USER && userState != ConstantStr.TOMBSTONE) {
             return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "用户状态参数只能为0,1,2");
         }
@@ -299,7 +299,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public Result assignPermission(int roleId, List<Permission> permissionList) {
+    public synchronized Result assignPermission(int roleId, List<Permission> permissionList) {
         List<Permission> sharePermissionList = userDao.getSharePermissionList(roleId, permissionList);
         List<Permission> newPermissionList = new ArrayList<>();
         if (Blank.isEmpty(sharePermissionList)) {

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

@@ -28,6 +28,13 @@ public class ConstantStr {
     public static final int OPC_DA = 0;
     public static final int OPC_UA = 1;
 
+    //菜单是否可用1：可用，0：不可用
+    public static final int MENU_NOT_AVAILABLE = 0;
+    public static final int MENU_AVAILABLE = 1;
+
+    //UA登录是否匿名
+    public static final int NOT_ANONYMOUS = 0;
+    public static final int IS_ANONYMOUS = 1;
 
 
 }

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

@@ -2,4 +2,41 @@
 <!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">
 
+    <insert id="addDepartment">
+        insert into sys_department (parent_id, department_name, department_describe, department_num, create_time)
+            VALUE (#{parentId}, #{departmentName}, #{departmentDescribe}, #{departmentNum}, now())
+    </insert>
+    <update id="updateDepartment">
+        update sys_department
+        set parent_id=#{parentId},
+            department_name=#{departmentName},
+            department_describe=#{departmentDescribe},
+            department_num=#{departmentNum},
+            update_time=now()
+        where id = #{id}
+    </update>
+
+    <select id="getDepartmentByName" resultType="com.judong.chuanyiserver.dao.DepartmentDao">
+        select id, parent_id, department_name, department_describe, department_num, create_time, update_time
+        from sys_department
+        where department_name = #{departmentName}
+    </select>
+
+    <select id="getDepartmentByNoIdName" resultType="com.judong.chuanyiserver.entity.Department">
+        select id, parent_id, department_name, department_describe, department_num, create_time, update_time
+        from sys_department
+        where id != #{id}
+          and department_name = #{departmentName}
+    </select>
+
+    <select id="getDepartmentCount" resultType="java.lang.Long">
+        select count(*)
+        from sys_department
+    </select>
+
+    <select id="getDepartmentListByPage" resultType="com.judong.chuanyiserver.entity.Department">
+        select id, parent_id, department_name, department_describe, department_num, create_time, update_time
+        from sys_department
+        limit #{startNum},#{limitNum}
+    </select>
 </mapper>

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

@@ -2,4 +2,85 @@
 <!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">
 
+    <insert id="addMenu">
+        INSERT INTO sys_menu (parent_id,
+                              menu_name,
+                              menu_url,
+                              menu_icon,
+                              sort_num,
+                              menu_status,
+                              create_time)
+            VALUE (#{parentId}, #{menuName}, #{menuUrl}, #{menuIcon}, #{sortNum}, #{menuStatus}, now())
+    </insert>
+    <update id="updateMenu">
+        update sys_menu
+        set parent_id=#{parentId},
+            menu_name=#{menuName},
+            menu_url=#{menuUrl},
+            menu_icon=#{menuIcon},
+            sort_num=#{sortNum},
+            menu_status=#{menuStatus},
+            update_time=now()
+        where id = #{id}
+    </update>
+
+    <select id="getMenuByUrl" resultType="com.judong.chuanyiserver.entity.Menu">
+        select id,
+               parent_id,
+               menu_name,
+               menu_url,
+               menu_icon,
+               sort_num,
+               menu_status,
+               create_time,
+               update_time
+        from sys_menu
+        where menu_url = #{menuUrl}
+    </select>
+    <select id="getMenuByNoIdUrl" resultType="com.judong.chuanyiserver.entity.Menu">
+        select id,
+               parent_id,
+               menu_name,
+               menu_url,
+               menu_icon,
+               sort_num,
+               menu_status,
+               create_time,
+               update_time
+        from sys_menu
+        where id != #{id}
+          and menu_url = #{menuUrl}
+    </select>
+
+    <select id="getMenuCount" resultType="java.lang.Long">
+        select count(*)
+        from sys_menu
+    </select>
+
+    <select id="getMenuListByPage" resultType="com.judong.chuanyiserver.entity.Menu">
+        select id,
+               parent_id,
+               menu_name,
+               menu_url,
+               menu_icon,
+               sort_num,
+               menu_status,
+               create_time,
+               update_time
+        from sys_menu
+        limit #{startNum},#{limitNum}
+    </select>
+    <select id="getMenuById" resultType="com.judong.chuanyiserver.entity.Menu">
+        select id,
+               parent_id,
+               menu_name,
+               menu_url,
+               menu_icon,
+               sort_num,
+               menu_status,
+               create_time,
+               update_time
+        from sys_menu
+        where id = #{id}
+    </select>
 </mapper>

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

@@ -7,7 +7,7 @@
         SELECT user_id,
                user_name,
                PASSWORD,
-               create_date,
+               create_time,
                last_login_time,
                state
         FROM sys_user
@@ -19,7 +19,7 @@
         SELECT user_id,
                user_name,
                PASSWORD,
-               create_date,
+               create_time,
                last_login_time,
                state
         FROM sys_user
@@ -30,7 +30,7 @@
         SELECT user_id,
                user_name,
                PASSWORD,
-               create_date,
+               create_time,
                last_login_time,
                state
         FROM sys_user
@@ -38,7 +38,7 @@
     </select>
 
     <insert id="addUser">
-        INSERT INTO sys_user (user_id, user_name, PASSWORD, create_date, state)
+        INSERT INTO sys_user (user_id, user_name, PASSWORD, create_time, state)
             VALUE (#{userId}, #{userName}, #{password}, now(), 0)
     </insert>
 
@@ -123,9 +123,9 @@
         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
+        select user_id, user_name, password, create_time, last_login_time, state
         from sys_user
-        order by create_date DESC
+        order by create_time DESC
         limit #{startNum},#{limitNum}
     </select>
     <select id="getNoShareOldRoleList" resultType="java.lang.Integer">
@@ -138,7 +138,7 @@
     </select>
 
     <select id="getUserByNameNoId" resultType="com.judong.chuanyiserver.entity.User">
-        select user_id, user_name, password, create_date, last_login_time, state
+        select user_id, user_name, password, create_time, last_login_time, state
         from sys_user
         where user_id != #{userId}
           and user_name = #{userName}