嘉定公交调度系统计划调度功能优化2

1、用户登录系统后，提示密码过期（过期前3天提示）

嘉定公交调度系统计划调度功能优化2
1、用户登录系统后，提示密码过期（过期前3天提示）
徐烜
1 parent a83ee6e3
Showing 6 changed files with 98 additions and 24 deletions
src/main/java/com/bsth/controller/sys/UserController.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/home.html
src/main/resources/static/pages/permission/user/list.html
src/main/resources/static/pages/permission/user/resetPWD.html
@@ -303,6 +303,18 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
         }
     }
+    @RequestMapping(value = "/validPWDExpired", method = RequestMethod.GET)
+    public String validPWDExpired() {
+        try {
+            SysUser sysUser = SecurityUtils.getCurrentUser();
+            this.sysUserService.validPWDExpired(sysUser.getUserName());
+            return "ok";
+        } catch (Exception exp) {
+            exp.printStackTrace();
+            return exp.getMessage();
+        }
+    }
+
     @RequestMapping(value = "/register", method = RequestMethod.POST)
     public Map<String, Object> register(SysUser u) {
         return sysUserService.register(u);
@@ -7,13 +7,19 @@ import java.util.List;
 import java.util.Map;
 public interface SysUserService extends BaseService<SysUser, Integer>{
-	
+
 	SysUser findByUserName(String name);
-	
+
 	int changeEnabled(int id,int enabled);
-	
+
 	int changePWD(int id,String newPWD);
+    /**
+     * 检测指定用户密码是否过期
+     * @param userName 用户名
+     */
+	boolean validPWDExpired(String userName);
+
 	void resetPWD(int id, String newPWD, int validperiod);
 	Map<String,Object> register(SysUser u);
@@ -5,6 +5,8 @@ import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.SysUserService;
+import org.joda.time.DateTime;
+import org.joda.time.Days;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,15 +24,15 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	SysUserRepository sysUserRepository;
 	Logger logger = LoggerFactory.getLogger(this.getClass());
-	
+
 	@Override
 	public SysUser findByUserName(String name) {
 		return sysUserRepository.findByUserName(name);
 	}
-	
+
 	@Override
 	public Map<String, Object> save(SysUser t) {
-		// 
+		//
 		if(t.getPassword() == null || t.getPassword().trim().equals("")){
 			SysUser user = sysUserRepository.findOne(t.getId());
 			t.setPassword(user.getPassword());
@@ -52,6 +54,32 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	}
     @Override
+    public boolean validPWDExpired(String userName) {
+        SysUser sysUser = this.sysUserRepository.findByUserName(userName);
+        if (sysUser == null) {
+            throw new RuntimeException("用户[" + userName + "]不存在！");
+        }
+        if (sysUser.getPwdValidPeriod() == null || sysUser.getLastPwdDate() == null) {
+            // 如果没有设定密码过期时间，判定为不过期
+            return true;
+        }
+        DateTime now = new DateTime();
+        DateTime lastPwdDate = new DateTime(sysUser.getLastPwdDate());
+        Integer now_period_days = Days.daysBetween(lastPwdDate, now).getDays();
+        Integer expiredTipDays = 3; // 密码过期提前提示天数
+        if (now_period_days < (sysUser.getPwdValidPeriod() - expiredTipDays)) {
+            return true;
+        } else if (now_period_days >= (sysUser.getPwdValidPeriod() - expiredTipDays) &&
+                now_period_days < sysUser.getPwdValidPeriod()) {
+            // 快过期前提示
+            throw new RuntimeException("当前用户密码还有[" + (sysUser.getPwdValidPeriod() - now_period_days) + "]天过期！");
+        } else {
+            throw new RuntimeException("当前用户密码已过期！");
+        }
+
+    }
+
+    @Override
     public void resetPWD(int id, String newPWD, int validperiod) {
 	    SysUser user = sysUserRepository.findOne(id);
 	    user.setPwdValidPeriod(validperiod);
@@ -81,3 +81,24 @@
         <li><span class="label s_c_change">修复</span>3、修复基础中线路站点的序号问题。</li>
     </ul>
 </div>
+
+<script type="text/javascript">
+    $.get("/user/validPWDExpired", function(msg) {
+       if ("ok" === msg) {
+           return;
+       }
+
+       var htmlText = [];
+       htmlText.push("<span style='font-weight: bold; font-style: italic; '>" + msg + "</span></br>");
+       swal({
+           title: "账户密码提示",
+           text: htmlText.join("</br>"),
+           html: true,
+           type: "warning",
+           showCancelButton: true,
+           cancelButtonText: "关闭",
+           confirmButtonColor: "#3598dc",
+           closeOnConfirm: false
+       });
+    });
+</script>
@@ -64,7 +64,7 @@
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
-                                                                
+
 									<button class="btn btn-sm red btn-outline filter-cancel">
                                                             <i class="fa fa-times"></i> 重置</button>
 								</td>
@@ -134,15 +134,15 @@ $(function(){
 	    checkboxClass: 'icheckbox_flat-blue',
 	    increaseArea: '20%'
 	};
-	
+
 	jsDoQuery(null,true);
-	
+
 	//重置
 	$('tr.filter .filter-cancel').on('click', function(){
 		$('tr.filter input, select').val('').change();
 		jsDoQuery(null, true);
 	});
-	
+
 	//提交
 	$('tr.filter .filter-submit').on('click', function(){
 		var cells = $('tr.filter')[0].cells
@@ -160,7 +160,7 @@ $(function(){
 		page = 0;
 		jsDoQuery(params, true);
 	});
-	
+
 	/*
 	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
 	*/
@@ -208,20 +208,20 @@ $(function(){
 		});
 	}
-	
+
 	function iCheckChange(){
 		var tr = $(this).parents('tr');
 		if(this.checked)
 			tr.addClass('row-active');
 		else
 			tr.removeClass('row-active');
-		
+
 		if($('#datatable_resource input.icheck:checked').length == 1)
 			$('#removeButton').removeAttr('disabled');
 		else
 			$('#removeButton').attr('disabled', 'disabled');
 	}
-	
+
 	function showPagination(data){
 		//分页
 		$('#pagination').jqPaginator({
@@ -237,15 +237,15 @@ $(function(){
 		    	if(initPagination){
 		    		initPagination = false;
 		    		return;
-		    	}	
-		    	
-		    	
+		    	}
+
+
 		    	page = num - 1;
 		    	jsDoQuery(null, false);
 		    }
 		});
 	}
-	
+
 	function openAllotWindow() {
 		var id = $(this).data('id');
 		$.get('/pages/permission/user/controlAllot.html', function (content) {
@@ -262,14 +262,14 @@ $(function(){
 			});
 		});
 	}
-	
+
 	//删除
 	$('#removeButton').on('click', function(){
 		if($(this).attr('disabled'))
 			return;
-		
+
 		var id = $('#datatable_resource input.icheck:checked').data('id');
-		
+
 		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
 			$('tr.filter .filter-submit').click();
 		});
@@ -294,9 +294,10 @@ function resetPassword(userId, ld) {
             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") : '');
+                $(layero).find('#window_index').val(index);
             }
         });
     });
 }
-</script>
 \ No newline at end of file
+</script>
@@ -2,6 +2,7 @@
     <div class="col-md-12">
         <!-- BEGIN VALIDATION STATES-->
         <div class="portlet light portlet-fit portlet-form bordered">
+            <input type="hidden" id="window_index" name="window_index">
             <div class="portlet-body">
                 <form class="form-horizontal" id="resetPWDForm">
                     <input type="hidden" id="user_id" name="user_id">
@@ -37,7 +38,7 @@
                         <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>
+                                <button type="button" id="pwd_cancel" class="btn default">取消</button>
                             </div>
                         </div>
                     </div>
@@ -58,5 +59,10 @@
                 layer.alert(msg);
             });
         });
+
+        $("#pwd_cancel").on("click", function() {
+            var index = $("#window_index").val();
+            parent.layer.close(index);
+        });
     });
-</script>
 \ No newline at end of file
+</script>