Home Explore Help
Register Sign In
root
/
gs_bg
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

新增个人信息

RuoYi 7 years ago
parent
66a904d71e
commit
ba37447239
17 changed files with 72 additions and 13 deletions
Unified View Show Diff Stats
  1. 1 1
      README.md
  2. 2 2
      src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java
  3. 2 2
      src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
  4. 2 2
      src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
  5. 7 0
      src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
  6. 3 3
      src/main/java/com/ruoyi/project/system/user/controller/UserController.java
  7. BIN
      src/main/resources/static/img/a1.jpg
  8. BIN
      src/main/resources/static/img/a2.jpg
  9. BIN
      src/main/resources/static/img/a3.jpg
  10. BIN
      src/main/resources/static/img/a4.jpg
  11. BIN
      src/main/resources/static/img/a5.jpg
  12. BIN
      src/main/resources/static/img/a6.jpg
  13. BIN
      src/main/resources/static/img/a7.jpg
  14. BIN
      src/main/resources/static/img/a8.jpg
  15. BIN
      src/main/resources/static/img/a9.jpg
  16. 6 3
      src/main/resources/templates/index.html
  17. 49 0
      src/main/resources/templates/system/user/profile.html

+ 1 - 1
README.md
View File 

@@ -20,7 +20,7 @@
 
 12. 在线构建器：拖动表单元素生成相应的HTML代码

 12. 在线构建器：拖动表单元素生成相应的HTML代码

 13. 连接池监视：监视当期系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。

 13. 连接池监视：监视当期系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。

 

 

-## 系统演示 ## [www.ruoyi.club](http://www.ruoyi.club)

+## 系统演示 [www.ruoyi.club](http://www.ruoyi.club)

 

 

 ![登录界面](https://static.oschina.net/uploads/space/2018/0425/110329_Ftsu_1438828.png)

 ![登录界面](https://static.oschina.net/uploads/space/2018/0425/110329_Ftsu_1438828.png)

+ 2 - 2
src/main/java/com/ruoyi/project/system/menu/dao/IMenuDao.java
View File 

@@ -59,9 +59,9 @@ public interface IMenuDao
 
     public Menu selectMenuById(Long menuId);

     public Menu selectMenuById(Long menuId);

     

     

     /**

     /**

-     * 查询子菜单数量

+     * 查询菜单数量

      * 

      * 

-     * @param menuId 菜单ID

+     * @param parentId 菜单父ID

      * @return 结果

      * @return 结果

      */

      */

     public int selectCountMenuByParentId(Long parentId);

     public int selectCountMenuByParentId(Long parentId);

+ 2 - 2
src/main/java/com/ruoyi/project/system/menu/service/IMenuService.java
View File 

@@ -77,9 +77,9 @@ public interface IMenuService
 
     public Menu selectMenuById(Long menuId);

     public Menu selectMenuById(Long menuId);

 

 

     /**

     /**

-     * 查询子菜单数量

+     * 查询菜单数量

      * 

      * 

-     * @param menuId 菜单ID

+     * @param parentId 菜单父ID

      * @return 结果

      * @return 结果

      */

      */

     public int selectCountMenuByParentId(Long parentId);

     public int selectCountMenuByParentId(Long parentId);

+ 2 - 2
src/main/java/com/ruoyi/project/system/role/controller/RoleController.java
View File 

@@ -81,7 +81,7 @@ public class RoleController extends BaseController
 
     @RequiresPermissions("system:role:save")

     @RequiresPermissions("system:role:save")

     @Log(title = "系统管理", action = "角色管理-保存角色")

     @Log(title = "系统管理", action = "角色管理-保存角色")

     @PostMapping("/save")

     @PostMapping("/save")

-    @Transactional

+    @Transactional(rollbackFor=Exception.class)

     @ResponseBody

     @ResponseBody

     public Message save(Role role)

     public Message save(Role role)

     {

     {

@@ -95,7 +95,7 @@ public class RoleController extends BaseController
 
     @RequiresPermissions("system:role:remove")

     @RequiresPermissions("system:role:remove")

     @Log(title = "系统管理", action = "角色管理-删除角色")

     @Log(title = "系统管理", action = "角色管理-删除角色")

     @RequestMapping("/remove/{roleId}")

     @RequestMapping("/remove/{roleId}")

-    @Transactional

+    @Transactional(rollbackFor=Exception.class)

     @ResponseBody

     @ResponseBody

     public Message remove(@PathVariable("roleId") Long roleId)

     public Message remove(@PathVariable("roleId") Long roleId)

     {

     {

+ 7 - 0
src/main/java/com/ruoyi/project/system/user/controller/IndexController.java
View File 

@@ -47,4 +47,11 @@ public class IndexController extends BaseController
 
         return "main";

         return "main";

     }

     }

 

 

+    // 个人信息

+    @GetMapping("/system/profile")

+    public String profile(Model model)

+    {

+        return "system/user/profile";

+    }

+

 }

 }

+ 3 - 3
src/main/java/com/ruoyi/project/system/user/controller/UserController.java
View File 

@@ -120,7 +120,7 @@ public class UserController extends BaseController
 
     @RequiresPermissions("system:user:remove")

     @RequiresPermissions("system:user:remove")

     @Log(title = "系统管理", action = "用户管理-删除用户")

     @Log(title = "系统管理", action = "用户管理-删除用户")

     @RequestMapping("/remove/{userId}")

     @RequestMapping("/remove/{userId}")

-    @Transactional

+    @Transactional(rollbackFor=Exception.class)

     @ResponseBody

     @ResponseBody

     public Message remove(@PathVariable("userId") Long userId)

     public Message remove(@PathVariable("userId") Long userId)

     {

     {

@@ -139,7 +139,7 @@ public class UserController extends BaseController
 
     @RequiresPermissions("system:user:batchRemove")

     @RequiresPermissions("system:user:batchRemove")

     @Log(title = "系统管理", action = "用户管理-批量删除")

     @Log(title = "系统管理", action = "用户管理-批量删除")

     @PostMapping("/batchRemove")

     @PostMapping("/batchRemove")

-    @Transactional

+    @Transactional(rollbackFor=Exception.class)

     @ResponseBody

     @ResponseBody

     public Message batchRemove(@RequestParam("ids[]") Long[] ids)

     public Message batchRemove(@RequestParam("ids[]") Long[] ids)

     {

     {

@@ -157,7 +157,7 @@ public class UserController extends BaseController
 
     @RequiresPermissions("system:user:save")

     @RequiresPermissions("system:user:save")

     @Log(title = "系统管理", action = "部门管理-保存部门")

     @Log(title = "系统管理", action = "部门管理-保存部门")

     @PostMapping("/save")

     @PostMapping("/save")

-    @Transactional

+    @Transactional(rollbackFor=Exception.class)

     @ResponseBody

     @ResponseBody

     public Message save(User user)

     public Message save(User user)

     {

     {

BIN
src/main/resources/static/img/a1.jpg
View File


BIN
src/main/resources/static/img/a2.jpg
View File


BIN
src/main/resources/static/img/a3.jpg
View File


BIN
src/main/resources/static/img/a4.jpg
View File


BIN
src/main/resources/static/img/a5.jpg
View File


BIN
src/main/resources/static/img/a6.jpg
View File


BIN
src/main/resources/static/img/a7.jpg
View File


BIN
src/main/resources/static/img/a8.jpg
View File


BIN
src/main/resources/static/img/a9.jpg
View File


+ 6 - 3
src/main/resources/templates/index.html
View File 

@@ -16,6 +16,9 @@
 
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.css}" rel="stylesheet"/>

     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.css}" rel="stylesheet"/>

     <link href="../static/css/animate.css" th:href="@{/css/animate.css}" rel="stylesheet"/>

     <link href="../static/css/animate.css" th:href="@{/css/animate.css}" rel="stylesheet"/>

     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>

     <link href="../static/css/style.css" th:href="@{/css/style.css}" rel="stylesheet"/>

+    <style type="text/css">

+        .nav > li:hover .dropdown-menu {display: block;}

+    </style>

 </head>

 </head>

 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">

 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden">

 <div id="wrapper">

 <div id="wrapper">

@@ -32,11 +35,11 @@
 
                          <img src="img/profile_small.jpg" alt="image" class="img-circle" height="60" width="60"/></span>

                          <img src="img/profile_small.jpg" alt="image" class="img-circle" height="60" width="60"/></span>

                          <a data-toggle="dropdown" class="dropdown-toggle" href="#">

                          <a data-toggle="dropdown" class="dropdown-toggle" href="#">

                          <span class="clear"><span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">RuoYi</strong></span>

                          <span class="clear"><span class="block m-t-xs"><strong class="font-bold" th:text="${user.userName}">RuoYi</strong></span>

-                         <span class="text-muted text-xs block" th:text="${user.dept.deptName}">研发部<b class="caret"></b></span> </span> </a>

+                         <span class="text-muted text-xs block"><span th:text="${user.dept.deptName}">研发部</span> <b class="caret"></b></span> </span> </a>

                          <ul class="dropdown-menu animated fadeInRight m-t-xs">

                          <ul class="dropdown-menu animated fadeInRight m-t-xs">

-                             <li><a class="menuItem" href="profile.html">个人信息</a></li>

+                             <li><a class="menuItem" th:href="@{/system/profile}">个人信息</a></li>

                              <li class="divider"></li>

                              <li class="divider"></li>

-                             <li><a th-href="@{/logout}">退出</a></li>

+                             <li><a th:href="@{logout}">退出</a></li>

                          </ul>

                          </ul>

                     </div>

                     </div>

                 </li>

                 </li>

+ 49 - 0
src/main/resources/templates/system/user/profile.html
View File 

@@ -0,0 +1,49 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+    <meta charset="utf-8">
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <!--360浏览器优先以webkit内核解析-->
 
+    <title>个人信息</title>
 
+    <link rel="shortcut icon" href="favicon.ico">
 
+    <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 
+    <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.css}" rel="stylesheet"/>
 
+    <link href="../static/css/main/animate.min.css" th:href="@{/css/main/animate.min.css}" rel="stylesheet"/>
 
+    <link href="../static/css/main/style.min862f.css" th:href="@{/css/main/style.min862f.css}" rel="stylesheet"/>
 
+</head>
 
+
 
+<body class="gray-bg">
 
+    <div class="wrapper wrapper-content">
 
+        <div class="row animated fadeInRight">
 
+            <div class="col-sm-6">
 
+                <div class="ibox float-e-margins">
 
+                    <div class="ibox-title">
 
+                        <h5>个人资料</h5>
 
+                    </div>
 
+                    <div class="contact-box">
 
+	                        <div class="col-sm-4">
 
+	                            <div class="text-center">
 
+	                                <img alt="image" class="img-circle m-t-xs img-responsive" src="/img/a2.jpg">
 
+	                                <div class="m-t-xs font-bold">CEO</div>
 
+	                            </div>
 
+	                        </div>
 
+	                        <div class="col-sm-8">
 
+	                            <h3><strong>admin</strong></h3>
 
+	                            <p><i class="fa fa-user"></i> 若依 / 管理员</p>
 
+	                            <p><i class="fa fa-phone"></i> 15888888888</p>
 
+	                            <p><i class="fa fa-group"></i> 开发一部 / 初级开发</p>
 
+	                            <p><i class="fa fa-transgender"></i> 女</p>
 
+	                            <p><i class="fa fa-envelope-o"></i> ruoyi@163.com</p>
 
+	                            <p><i class="fa fa-calendar"></i> 2018-05-20 13:14:00</p>
 
+	                        </div>
 
+	                        <div class="clearfix"></div>
 
+	                    </a>
 
+                    </div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+    <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 
+    <script src="../static/js/bootstrap.min.js" th:src="@{/js/bootstrap.min.js}"></script>
 
+</body>
 
+</html>