From 5629cc5ecd11dfc257ce5120361e363ae7e1c264 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 30 Oct 2020 11:01:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=B8=AA=E4=BA=BA=E8=B5=84?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/manage/controller/UserController.java | 57 +++++++++++
 .../WEB-INF/views/gatewayDir/gatewayIndex.jsp |  6 +-
 .../webapp/WEB-INF/views/loginDir/index.jsp   |  2 +-
 .../WEB-INF/views/userDir/updatePersonal.jsp  | 98 +++++++++++++++++++
 .../src/main/webapp/static/js/getewayIndex.js |  2 +
 .../main/webapp/static/js/updatePersonal.js   | 29 ++++++
 .../java/com/manage/dao/Power_UserMapper.java |  4 +
 .../java/com/manage/entity/Power_User.java    | 10 ++
 .../src/main/java/com/manage/vo/User.java     | 20 ++++
 .../resources/mapper/Power_UserMapper.xml     | 26 +++++
 .../com/manage/service/Power_UserService.java |  2 +
 .../service/ipml/Power_UserServiceImpl.java   |  7 +-
 12 files changed, 258 insertions(+), 5 deletions(-)
 create mode 100644 power-admin/src/main/webapp/WEB-INF/views/userDir/updatePersonal.jsp
 create mode 100644 power-admin/src/main/webapp/static/js/updatePersonal.js

diff --git a/power-admin/src/main/java/com/manage/controller/UserController.java b/power-admin/src/main/java/com/manage/controller/UserController.java
index 33af36c..d090b9b 100644
--- a/power-admin/src/main/java/com/manage/controller/UserController.java
+++ b/power-admin/src/main/java/com/manage/controller/UserController.java
@@ -11,6 +11,7 @@ import com.manage.service.cache.CacheManager;
 import com.manage.service.ImportExcel.ImportExcelUtil;
 import com.manage.util.*;
 import com.manage.vo.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -33,6 +34,8 @@ import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @Author:ly
@@ -261,4 +264,58 @@ public class UserController {
             return new ResponseEntity<String>(e.getMessage(), responseHeaders, HttpStatus.OK);
         }
     }
+
+    /**
+     * 跳转修改个人资料
+     * @param request
+     * @param model
+     * @return
+     */
+    @RequestMapping(value = "updatePersonal")
+    public String updatePersonal(HttpServletRequest request, Model model){
+        try {
+            Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+            Power_UserVo userVo = powerUserService.selectByPrimaryKey(user.getUserId());
+            model.addAttribute("user",userVo);
+            CacheManager.addExcCount("noExc");
+        }catch (Exception e){
+            ExceptionPrintUtil.printException(e);
+            CacheManager.addExcCount("exc");
+            e.printStackTrace();
+        }
+        return "/userDir/updatePersonal";
+    }
+
+    /**
+     * 修改个人资料
+     * @param user
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/updatePersonal",method = RequestMethod.POST)
+    @ResponseBody
+    public Msg updatePersonal(Power_User user) throws Exception{
+        if(StringUtils.isBlank(user.getName())){
+            //姓名不能为空
+            return Msg.fail("姓名不能为空");
+        }
+        //验证手机号格式
+        String phone = user.getUserTel();
+        if(StringUtils.isNotBlank(phone)){
+            String regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
+            if(phone.length() != 11){
+                return Msg.fail("手机号应为11位数");
+            }else{
+                Pattern p = Pattern.compile(regex);
+                Matcher m = p.matcher(phone);
+                boolean isMatch = m.matches();
+                if(!isMatch){
+                    return Msg.fail("手机号格式不正确");
+                }
+            }
+        }
+        //更新用户基本信息
+        powerUserService.updatePersonal(user);
+        return Msg.success();
+    }
 }
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index 7db877d..d9ed1e3 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -169,10 +169,10 @@
                     <span>通知信息</span>
                 </div>
             </li>
-            <li title="帮助文档">
+            <li title="个人资料">
                 <div class="aClass" onclick="menuClick(this,'help')">
                     <i class="fa fa-info"></i>
-                    <span>帮助文档</span>
+                    <span>个人资料</span>
                 </div>
             </li>
             <li title="修改密码">
@@ -325,7 +325,7 @@
         reserved.
     </footer>
 </div>
-<script type="text/javascript" src="${path}/static/js/getewayIndex.js?t=2020-08-18"></script>
+<script type="text/javascript" src="${path}/static/js/getewayIndex.js?t=2020-10-30"></script>
 <%@ include file="/WEB-INF/jspf/webSocket.jspf" %>
 <%--<script src="${path}/static/js/gatewayIndexEcharts.js"></script>--%>
 </body>
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
index 57dca4c..51e3167 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
@@ -274,7 +274,7 @@
     <!-- 底部版权-->
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
-            <b>Version</b> 20200821
+            <b>Version</b> 20201030
         </div>
         <strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
         reserved.
diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/updatePersonal.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/updatePersonal.jsp
new file mode 100644
index 0000000..0e6a66c
--- /dev/null
+++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/updatePersonal.jsp
@@ -0,0 +1,98 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: ljx
+  Date: 2019/5/13
+  Time: 17:02
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<html>
+<head>
+    <title>个人资料</title>
+    <%@ include file="/WEB-INF/jspf/common.jspf" %>
+</head>
+<body>
+    <fieldset>
+        <legend style="text-align: center;font-weight: bold;font-size: 25px">个人资料</legend>
+    </fieldset>
+    <form class="form-horizontal" id="form">
+        <input name="userId" hidden value="${user.userId}">
+        <div class="form-group">
+            <label for="userName" class="col-sm-2 control-label">账号</label>
+            <div class="col-sm-5">
+                <input type="text" id="userName" class="form-control input input-sm" disabled value="${user.userName}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="name" class="col-sm-2 control-label">姓名</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" id="name" name="name"
+                       placeholder="请输入姓名" maxlength="16" value="${user.name}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userSex" class="col-sm-2 control-label">性别</label>
+            <div class="col-sm-5">
+                <select class="form-control input-sm" id="userSex" name="userSex">
+                    <option value="">不限</option>
+                    <option value="0" <c:if test="${user.userSex == 0}">selected</c:if>>男</option>
+                    <option value="1" <c:if test="${user.userSex == 1}">selected</c:if>>女</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userAge" class="col-sm-2 control-label">年龄</label>
+            <div class="col-sm-5">
+                <input type="number" class="form-control input input-sm sexInput" id="userAge" name="userAge" oninput="if(value.length>3)value=value.slice(0,3)" value="${user.userAge}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userTel" class="col-sm-2 control-label">移动电话</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" id="userTel" name="userTel"
+                       oninput="if(value.length>11)value=value.slice(0,11)" placeholder="请输入移动电话" value="${user.userTel}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userWechat" class="col-sm-2 control-label">微信号</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" id="userWechat" name="userWechat"
+                       placeholder="请输入微信号" maxlength="50" value="${user.userWechat}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userEmail" class="col-sm-2 control-label">邮箱地址</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" id="userEmail" name="userEmail"
+                       placeholder="请输入邮箱地址" maxlength="50" value="${user.userEmail}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="userPosition" class="col-sm-2 control-label">职位</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" id="userPosition" name="userPosition" placeholder="请输入职位" maxlength="16" value="${user.userPosition}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label  class="col-sm-2 control-label">所属科室</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" disabled value="${user.powerDepts}">
+        </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-2 control-label">所属角色</label>
+            <div class="col-sm-5">
+                <input type="text" class="form-control input input-sm" disabled value="${user.roleName}">
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+                <button type="button" class="btn btn-primary" id="btn_submit">提交更改</button>
+                <button type="reset" class="btn btn-default">重置</button>
+            </div>
+        </div>
+    </form>
+</body>
+<script src="${path}/static/js/updatePersonal.js"></script>
+</html>
diff --git a/power-admin/src/main/webapp/static/js/getewayIndex.js b/power-admin/src/main/webapp/static/js/getewayIndex.js
index ec219ec..d638152 100644
--- a/power-admin/src/main/webapp/static/js/getewayIndex.js
+++ b/power-admin/src/main/webapp/static/js/getewayIndex.js
@@ -26,6 +26,8 @@ function menuClick(el,type){
             $("#iframe").prop("src",path+"/user/toUpdatePassword");
             break;
         case 'help':
+            $("#iframe").prop("src",path+"/user/updatePersonal");
+            break;
         case 'contact':
             $("#iframe").prop("src",path+"/main");
     }
diff --git a/power-admin/src/main/webapp/static/js/updatePersonal.js b/power-admin/src/main/webapp/static/js/updatePersonal.js
new file mode 100644
index 0000000..505b221
--- /dev/null
+++ b/power-admin/src/main/webapp/static/js/updatePersonal.js
@@ -0,0 +1,29 @@
+//提交更改
+$('#btn_submit').click(function () {
+    if($("#name").val() == ""){
+        toastr.warning("姓名不能为空！")
+        return false;
+    }
+    //验证手机号码
+    if($("#userTel").val() != ''){
+        if(!$("#userTel").val().match(/^1[34578]\d{9}$/)){
+            toastr.warning("移动电话格式不正确!");
+            $("#userTel").val("");
+            $("#userTel").focus();
+            return false;
+        }
+    }
+    $.ajax({
+        type: "post",
+        url: path+"/user/updatePersonal",
+        data:$("#form").serialize(),
+        dataType:'json',
+        success: function(data){
+            if(data.code == 100){
+                toastr.success("修改成功！");
+            }else{
+                toastr.error(data.msg);
+            }
+        }
+    });
+});
diff --git a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
index 8094c99..af61a37 100644
--- a/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
+++ b/power-dao/src/main/java/com/manage/dao/Power_UserMapper.java
@@ -64,4 +64,8 @@ public interface Power_UserMapper {
      * 查询有审批权限的用户id
      * */
     List<Power_User> selectUserIdsWithApprove(@Param("menuUrl")String menuUrl);
+
+    Power_UserVo selectByPrimaryKey1(Integer userId);
+
+    void updatePersonal(Power_User user);
 }
\ No newline at end of file
diff --git a/power-dao/src/main/java/com/manage/entity/Power_User.java b/power-dao/src/main/java/com/manage/entity/Power_User.java
index 834cc7c..9dae1cf 100644
--- a/power-dao/src/main/java/com/manage/entity/Power_User.java
+++ b/power-dao/src/main/java/com/manage/entity/Power_User.java
@@ -37,6 +37,16 @@ public class Power_User{
 
     private String remark;
 
+    private String userWechat;
+
+    public String getUserWechat() {
+        return userWechat;
+    }
+
+    public void setUserWechat(String userWechat) {
+        this.userWechat = userWechat;
+    }
+
     public Integer getUserId() {
         return userId;
     }
diff --git a/power-dao/src/main/java/com/manage/vo/User.java b/power-dao/src/main/java/com/manage/vo/User.java
index 3095d48..848d1e9 100644
--- a/power-dao/src/main/java/com/manage/vo/User.java
+++ b/power-dao/src/main/java/com/manage/vo/User.java
@@ -27,6 +27,26 @@ public class User {
 
     private String deptCode;
 
+    private String userTel;
+
+    private String userWechat;
+
+    public String getUserWechat() {
+        return userWechat;
+    }
+
+    public void setUserWechat(String userWechat) {
+        this.userWechat = userWechat;
+    }
+
+    public String getUserTel() {
+        return userTel;
+    }
+
+    public void setUserTel(String userTel) {
+        this.userTel = userTel;
+    }
+
     public String getDeptCode() {
         return deptCode;
     }
diff --git a/power-dao/src/main/resources/mapper/Power_UserMapper.xml b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
index 12d7dcc..f620ae4 100644
--- a/power-dao/src/main/resources/mapper/Power_UserMapper.xml
+++ b/power-dao/src/main/resources/mapper/Power_UserMapper.xml
@@ -551,6 +551,8 @@
         power_user.dept_id,
         power_user.dept_code,
         power_role.role_name,
+        power_user.user_tel,
+        power_user.user_wechat,
         name
     FROM
         power_user_dict
@@ -704,4 +706,28 @@
                   role_id = 0
               OR role_id = - 100
   </select>
+    <select id="selectByPrimaryKey1" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        select
+          user_id, user_name,name,user_sex,user_pwd, user_age, user_tel, user_email, user_position,
+    power_user.role_id, dept_id, power_role.role_name,user_wechat
+        from power_user
+        inner join
+        power_role
+        on power_user.role_id = power_role.role_id
+        where user_id = #{userId,jdbcType=INTEGER}
+    </select>
+    <!--更新个人资料-->
+    <update id="updatePersonal" parameterType="com.manage.entity.Power_User">
+    update power_user
+    set
+      name = #{name,jdbcType=VARCHAR},
+      user_sex = #{userSex,jdbcType=INTEGER},
+      user_age = #{userAge,jdbcType=INTEGER},
+      user_tel = #{userTel,jdbcType=VARCHAR},
+      user_email = #{userEmail,jdbcType=VARCHAR},
+      user_position = #{userPosition,jdbcType=VARCHAR},
+      user_wechat = #{userWechat,jdbcType=VARCHAR}
+    where user_id = #{userId,jdbcType=INTEGER}
+  </update>
+
 </mapper>
\ No newline at end of file
diff --git a/power-service/src/main/java/com/manage/service/Power_UserService.java b/power-service/src/main/java/com/manage/service/Power_UserService.java
index 01a7598..0d554a1 100644
--- a/power-service/src/main/java/com/manage/service/Power_UserService.java
+++ b/power-service/src/main/java/com/manage/service/Power_UserService.java
@@ -91,4 +91,6 @@ public interface Power_UserService {
      * @Description 根据用户名和备注获取用户信息
      * */
     public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser);
+
+    void updatePersonal(Power_User user);
 }
diff --git a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
index 836554d..5b42184 100644
--- a/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
+++ b/power-service/src/main/java/com/manage/service/ipml/Power_UserServiceImpl.java
@@ -85,7 +85,7 @@ public class Power_UserServiceImpl implements Power_UserService {
     @Override
     public Power_UserVo selectByPrimaryKey(Integer userId) {
         StringBuilder powerDepts = new StringBuilder();
-        Power_UserVo power_user = powerUserMapper.selectByPrimaryKey(userId);
+        Power_UserVo power_user = powerUserMapper.selectByPrimaryKey1(userId);
         power_user.setUserPwd(MD5.JM(Base64.decode(power_user.getUserPwd())));
         List<Power_Dept> power_depts1 = power_deptService.selectByPrimaryKeys(power_user.getDeptId());
         for(int j=0;j<power_depts1.size();j++){
@@ -256,4 +256,9 @@ public class Power_UserServiceImpl implements Power_UserService {
     public Power_UserVo findPowerUserByUserNameAndRemark(Power_User powerUser) {
         return powerUserMapper.findPowerUserByUserNameAndRemark(powerUser);
     }
+
+    @Override
+    public void updatePersonal(Power_User user) {
+        powerUserMapper.updatePersonal(user);
+    }
 }