添加管理员重置密码，密码有效期功能

徐烜
1 parent d08cb9ee
Showing 6 changed files with 149 additions and 18 deletions
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/permission/user/resetPWD.html
@@ -107,9 +107,13 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             // 检验密码有效期
             Date lastPwdDate = user.getLastPwdDate();
             if (lastPwdDate != null) {
+                Integer validPeriod = user.getPwdValidPeriod();
+                if (validPeriod == null) {
+                    validPeriod = 180; // 默认180天
+                }
                 Period p = new Period(new DateTime(lastPwdDate), new DateTime(new Date()), PeriodType.days());
-                if (p.getDays() > 30) { // 30天不更新密码，不能登录
-                    return put(rs, "msg", "30天没有修改密码，不能登录，请联系管理员");
+                if (p.getDays() > validPeriod) {
+                    return put(rs, "msg", validPeriod + "天没有修改密码，不能登录，请联系管理员");
                 }
             }
@@ -282,6 +286,16 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         return msg;
     }
+    @RequestMapping(value = "/resetPWD", method = RequestMethod.POST)
+    public String resetPWD(@RequestParam Integer user_id, @RequestParam Integer reset_day, @RequestParam String reset_passord) {
+        try {
+            sysUserService.resetPWD(user_id, reset_passord, reset_day);
+            return "修改成功！";
+        } catch (Exception exp) {
+            return exp.getMessage();
+        }
+    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Map<String, Object> register(SysUser u) {
         return sysUserService.register(u);
@@ -35,6 +35,8 @@ public class SysUser {
     /** 最近密码更新时间 */
     private Date lastPwdDate;
+    /** 密码有效期 */
+    private Integer pwdValidPeriod;
 	private String agencies;
@@ -123,4 +125,12 @@ public class SysUser {
     public void setLastPwdDate(Date lastPwdDate) {
         this.lastPwdDate = lastPwdDate;
     }
+
+    public Integer getPwdValidPeriod() {
+        return pwdValidPeriod;
+    }
+
+    public void setPwdValidPeriod(Integer pwdValidPeriod) {
+        this.pwdValidPeriod = pwdValidPeriod;
+    }
 }
@@ -14,6 +14,8 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changePWD(int id,String newPWD);
+	void resetPWD(int id, String newPWD, int validperiod);
+
 	Map<String,Object> register(SysUser u);
 	List<SysUser> findAll_distinct();
@@ -51,7 +51,14 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
-	@Override
+    @Override
+    public void resetPWD(int id, String newPWD, int validperiod) {
+	    SysUser user = sysUserRepository.findOne(id);
+	    user.setPwdValidPeriod(validperiod);
+	    sysUserRepository.changePWD(id, new BCryptPasswordEncoder(4).encode(newPWD));
+    }
+
+    @Override
 	public Map<String, Object> register(SysUser u) {
 		Map<String, Object> rs = new HashMap();
 		try{
@@ -115,6 +115,7 @@
 	<td>
 		<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
+        <a class="btn btn-sm blue btn-outline resetpwd" style="display: {{obj.showpdc}}" onclick="resetPassword({{obj.id}}, {{obj.lastPwdDate}});"><i class="fa fa-edit"></i> 重置密码</a>
 		<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
 	</td>
 </tr>
@@ -171,23 +172,40 @@ $(function(){
 		params['order'] = 'lastLoginDate';
 		params['page'] = page;
 		var i = layer.load(2);
-		$get('/user' ,params, function(data){
-			$.each(data.content, function(i, obj) {
-                obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+		$get('/user' ,params, function(data) {
+		    // 获取当前登录用户
+            $get('/user/currentUser',{}, function(user) {
+                var b_isAdmin = false; // 是否是管理员用户
+                $.each(user.authorities, function(i, obj) {
+                    if (obj.authority === 'ROLE_ADMIN') {
+                        b_isAdmin = true;
+                    }
+                });
+
+                $.each(data.content, function(i, obj) {
+                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+                    if (b_isAdmin) {
+                        obj.showpdc = ''; // 显示重置密码按钮
+                    } else {
+                        obj.showpdc = 'none';
+                    }
+                });
+                var bodyHtm = template('user_list_temp', {list: data.content});
+
+                $('#datatable_user tbody').html(bodyHtm)
+                    .find('.icheck').iCheck(icheckOptions)
+                    .on('ifChanged', iCheckChange);
+                if(pagination && data.content.length > 0){
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+                layer.close(i);
+
+                $('.line_allot_btn').on('click', openAllotWindow);
+
             });
-			var bodyHtm = template('user_list_temp', {list: data.content});
-			
-			$('#datatable_user tbody').html(bodyHtm)
-					.find('.icheck').iCheck(icheckOptions)
-					.on('ifChanged', iCheckChange);
-			if(pagination && data.content.length > 0){
-				//重新分页
-				initPagination = true;
-				showPagination(data);
-			}
-			layer.close(i);
-			$('.line_allot_btn').on('click', openAllotWindow);
 		});
 	}
@@ -263,4 +281,22 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+// 重置密码
+function resetPassword(userId, ld) {
+    $.get('/pages/permission/user/resetPWD.html', function (content) {
+        layer.open({
+            type: 1,
+            area: ['600px', '360px'],
+            content: content,
+            title: '修改密码',
+            shift: 5,
+            scrollbar: false,
+            success: function (layero, index) {
+                $(layero).find('#user_id').val(userId);
+                $(layero).find('#last_pwd_date').val(ld ? moment(ld).format("YYYY-MM-DD HH:mm:ss") : '');
+            }
+        });
+    });
+
+}
 </script>
 \ No newline at end of file
+<div class="row">
+    <div class="col-md-12">
+        <!-- BEGIN VALIDATION STATES-->
+        <div class="portlet light portlet-fit portlet-form bordered">
+            <div class="portlet-body">
+                <form class="form-horizontal" id="resetPWDForm">
+                    <input type="hidden" id="user_id" name="user_id">
+                    <div class="form-group" style="margin-top: 60px">
+                        <label class="control-label col-md-4">最近密码更新时间：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="text" readonly class="form-control" name="last_pwd_date" id="last_pwd_date" value="" /> </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group" >
+                        <label class="control-label col-md-4">密码有效期（天）：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="number" class="form-control" name="reset_day" id="reset_day" value="180" /> </div>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label col-md-4">默认密码：
+                        </label>
+                        <div class="col-md-6">
+                            <div class="input-icon right">
+                                <i class="fa"></i>
+                                <input type="text" class="form-control" name="reset_passord" id="reset_passord" value="123456" /> </div>
+                        </div>
+                    </div>
+                    <div class="form-actions">
+                        <div class="row">
+                            <div class="col-md-offset-5 col-md-7">
+                                <button type="button" id="confirm" class="btn green">确定</button>
+                                <button type="button" class="btn default">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+<script>
+    $(function(){
+
+        $("#confirm").on("click",function(){
+            var data = $('#resetPWDForm').serializeJSON();
+            console.log(data);
+            $.post('/user/resetPWD',data,function(msg){
+                layer.alert(msg);
+            });
+        });
+    });
+</script>
 \ No newline at end of file