Merge branch 'pudong_jdk8' of http://192.168.168.245:8888/panzhaov5/bsth_control into pudong_jdk8

youxiw2000
2 parents 4c1b7419 9f0aa4e2
Showing 10 changed files with 567 additions and 340 deletions
src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/service/sys/impl/PwdGenerator.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/java/com/bsth/util/MailUtils.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/static/pages/base/line/editRoute.html
src/main/resources/static/pages/base/stationroute/addstationstemplate.html
src/main/resources/static/pages/permission/user/list.html
@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
  
 import com.bsth.service.schedule.utils.SpringUtils;
+import com.bsth.util.MailUtils;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -44,6 +45,9 @@ public class AdminUtilsController {
     Logger logger = LoggerFactory.getLogger(this.getClass());
  
     @Autowired
+    private ObjectMapper objectMapper;
+
+    @Autowired
     DayOfSchedule dayOfSchedule;
  
     @Autowired
@@ -58,6 +62,9 @@ public class AdminUtilsController {
     @Autowired
     PilotReport pilotReport;
  
+    @Autowired
+    MailUtils mailUtils;
+
     /**
      * 出现重复班次的车辆
      *
@@ -258,4 +265,31 @@ public class AdminUtilsController {
  
         return "error";
     }
+
+
+
+    @RequestMapping("/changeEmail")
+    public String changeEmail(@RequestParam String email) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            mailUtils.setEmailSendToAddress(email);
+            return "success";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
+
+    @RequestMapping("/viewEmail")
+    public String viewEmail() {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            return mailUtils.getEmailSendToAddress();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return "error";
+    }
 }
 \ No newline at end of file
+package com.bsth.service.sys.impl;
+
+import java.util.Random;
+
+public class PwdGenerator {
+    private static final String SPECIAL_CHARS = "!@#$%^&*_=+-/";
+
+    /**
+     * 查找一个char数组中还没有填充字符的位置
+     */
+    private static int nextIndex(char[] chars, Random rnd) {
+        int index = rnd.nextInt(chars.length);
+        while (chars[index] != 0) {
+            index = rnd.nextInt(chars.length);
+        }
+        return index;
+    }
+
+    /**
+     * 返回一个随机的特殊字符
+     */
+    private static char nextSpecialChar(Random rnd) {
+        return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+    }
+
+    /**
+     * 返回一个随机的大写字母
+     */
+    private static char nextUpperLetter(Random rnd) {
+        return (char) ('A' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的小写字母
+     */
+    private static char nextLowerLetter(Random rnd) {
+        return (char) ('a' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的数字
+     */
+    private static char nextNumLetter(Random rnd) {
+        return (char) ('0' + rnd.nextInt(10));
+    }
+
+    /**
+     * 返回一个随机的字符
+     */
+    private static char nextChar(Random rnd) {
+        switch (rnd.nextInt(4)) {
+            case 0:
+                return (char) ('a' + rnd.nextInt(26));
+            case 1:
+                return (char) ('A' + rnd.nextInt(26));
+            case 2:
+                return (char) ('0' + rnd.nextInt(10));
+            default:
+                return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+        }
+    }
+
+    /**
+     * 生成指定位数的随机数
+     */
+    public static String randomPassword(int length) {
+        if(length < 3){
+            return "";
+        }
+        char[] chars = new char[length];
+        Random rnd = new Random();
+
+        //1. 至少生成一个大写字母、小写字母、特殊字符、数字
+        chars[nextIndex(chars, rnd)] = nextUpperLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextLowerLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextNumLetter(rnd);
+
+        //2. 填补其他位置的字符
+        for (int i = 0; i < length; i++) {
+            if (chars[i] == 0) {
+                chars[i] = nextChar(rnd);
+            }
+        }
+
+        //3. 返回结果
+        return new String(chars);
+    }
+
+
+    /**
+     * 测试代码
+     */
+    public static void main(String[] args) {
+        for (int i = 0; i < 10; i++) {
+            System.out.println(randomPassword(16));
+        }
+
+    }
+
+}
@@ -2,6 +2,8 @@ package com.bsth.service.sys.impl;
  
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.SendEmailController;
+import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
@@ -9,6 +11,8 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.RoleService;
 import com.bsth.service.sys.SysUserService;
+import com.bsth.util.IpUtils;
+import com.bsth.util.MailUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.slf4j.Logger;
@@ -33,6 +37,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	@Autowired
 	RoleService roleService;
  
+	// 发送邮件
+	@Autowired
+	private MailUtils mailUtils;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	@Override
@@ -166,7 +174,14 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 					Legality = true;
 			}
 			if(Legality){
-				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode("123456"));
+				String pwd = PwdGenerator.randomPassword(16);
+				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(pwd));
+				//发送邮件
+				EmailBean mail = new EmailBean();
+				mail.setSubject(IpUtils.getLocalIpAddress() +":密码重置");
+				mail.setContent(pwd);
+				mailUtils.sendMail(mail);
+				logger.info("setLD-sendMail:邮件发送成功！");
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("msg", "密码重置成功！");
 			}else {
+package com.bsth.util;
+
+import com.bsth.email.SimpleMailSender;
+import com.bsth.email.entity.EmailBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Hill
+ */
+@Component
+public class MailUtils {
+
+    @Value("${admin.mail}")
+    private String emailSendToAddress;
+
+    private Tools tools = new Tools("mailbox.properties");
+
+    private SimpleMailSender sms = new SimpleMailSender(tools.getValue("username"),tools.getValue("password"));
+
+    public String getEmailSendToAddress() {
+        return emailSendToAddress;
+    }
+
+    public void setEmailSendToAddress(String emailSendToAddress) {
+        this.emailSendToAddress = emailSendToAddress;
+    }
+
+    /**
+     * recipients
+     * 收件人集合
+     * mail
+     * 邮件
+     */
+    public int sendMail(List<String> recipients, EmailBean mail){
+        try {
+            for (String recipient : recipients) {
+                sms.send(recipient, mail.getSubject(),mail.getContent());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    /**
+     * recipient
+     * 收件人
+     * mail
+     * 邮件
+     */
+    public int sendMail(String recipient,EmailBean mail){
+        try {
+            sms.send(recipient, mail.getSubject(),mail.getContent());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    public int sendMail(EmailBean mail){
+        return sendMail(emailSendToAddress, mail);
+    }
+}
@@ -52,4 +52,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -54,4 +54,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -45,4 +45,6 @@ ms.fl.generate=false
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -333,6 +333,8 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 			}else {
 				if(isPush) {
 					stationList.push({name:tempStr[3], potion:{lng:tempPoint.lng, lat:tempPoint.lat} , wgs:{x:tempStr[0], y:tempStr[1]}});
+				} else {
+					sectionList[k] = point;
 				}
 				isPush = false; 
 			}
@@ -280,6 +280,8 @@ $(&#39;#add_station_template_mobal&#39;).on(&#39;AddStationTempMobal.show&#39;, function(e,map,a
 				if(isPush) {
 					sectionList[k] = point;
 					stationList.push({name:tempStr[3], potion:{lng:tempPoint.lng, lat:tempPoint.lat} , wgs:{x:tempStr[0], y:tempStr[1]}});
+				} else {
+					sectionList[k] = point;
 				}
 				isPush = false; 
 			}
-<div class="page-head">
-	<div class="page-title">
-		<h1>用户管理</h1>
-	</div>
-</div>
-
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">权限管理</span> <i class="fa fa-circle"></i></li>
-	<li><span class="active">用户管理</span></li>
-</ul>
-
-<div class="row">
-	<div class="col-md-12">
-		<!-- Begin: life time stats -->
-		<div class="portlet light portlet-fit portlet-datatable bordered">
-			<div class="portlet-title">
-				<div class="caption">
-					 <i class="fa fa-users font-dark"></i> <span
-						class="caption-subject font-dark sbold uppercase">用户数据表</span>
-				</div>
-				<div class="actions">
-					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a>
-
-				</div>
-			</div>
-			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px">
-					<table
-						class="table table-striped table-bordered table-hover table-checkable"
-						id="datatable_user">
-						<thead>
-							<tr role="row" class="heading">
-								<th width="3%">#</th>
-								<th width="15%">登录名</th>
-								<th width="13%">姓名</th>
-								<th width="100">所属机构</th>
-								<th width="11%">角色</th>
-								<th width="10%">状态</th>
-								<th width="18%">最后登录时间</th>
-								<th width="18%">操作</th>
-							</tr>
-							<tr role="row" class="filter">
-								<td></td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="userName_like">
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="name_like">
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="agencies_like">
-								</td>
-								<td></td>
-								<td>
-									<select class="form-control form-filter " name="enabled_eq">
-                                         <option value="">请选择...</option>
-                                         <option value="true">可用</option>
-                                         <option value="false">禁用</option>
-                                     </select>
-								</td>
-								<td></td>
-
-								<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>
-							</tr>
-						</thead>
-						<tbody></tbody>
-					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script id="user_list_temp" type="text/html">
-{{each list as obj i}}
-<tr>
-	<td style="vertical-align: middle;">
-		<!--<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">-->
-		{{++i}}
-	</td>
-	<td>
-		{{obj.userName}}
-	</td>
-	<td>
-		{{obj.name}}
-	</td>
-	<td>
-		{{obj.agencies}}
-	</td>
-	<td>
-		{{each obj.roles as role j}}
-			{{role.roleName}}、
-		{{/each}}
-	</td>
-	<td>
-		{{if obj.enabled}}
-			可用
-		{{else}}
-			禁用
-		{{/if}}
-	</td>
-	<td>
-		{{obj.lastLoginDate}}
-	</td>
-	<td>
-		{{if obj.isEdit == 0}}
-			<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
-			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
-		{{/if}}
-		{{if obj.isAdmin}}
-			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
-		{{/if}}
-	</td>
-</tr>
-{{/each}}
-{{if list.length == 0}}
-<tr>
-	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
-</tr>
-{{/if}}
-</script>
-
-<script>
-$(function(){
-	var page = 0, initPagination;
-	var user,isAdmin = false;
-	var icheckOptions = {
-	    checkboxClass: 'icheckbox_flat-blue',
-	    increaseArea: '20%'
-	};
-	$.get('/user/getCurrentUser', function(data) {
-        user = data;
-        var roles = user.roles;
-        $.each(roles,function () {
-            if(this.level == 1)
-                isAdmin = true;
-        })
-
-    });
-
-	setTimeout(function () {
-        $(document).on('click', 'a.reset_password', function () {
-            var id = $(this).data('id');
-            var name = $(this).data('name');
-            swal({
-                    title: "重装密码",
-                    text: "将登录名为"+name+"的用户，密码重置为默认密码！",
-                    type: "warning",
-                    showCancelButton: true,
-                    confirmButtonColor: "#DD6B55",
-                    confirmButtonText: "重置",
-                    cancelButtonText: "取消",
-                    closeOnConfirm: false },
-                function(){
-                    $.post('/user/resetPassword',{'id':id},function(result){
-                        if(result.status=='SUCCESS') {
-                            // 弹出添加成功提示消息
-                            swal("登录名为"+name+"的用户密码重置成功！", "success");
-                        } else if(result.status=='ERROR') {
-                            // 弹出添加失败提示消息
-                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
-                        }
-                        //				loadPage('list.html');
-                        // 发布后刷新页面
-                        jsDoQuery(getParams(), true);
-                    });
-                });
-        });
-        jsDoQuery(null,true);
-
-        //重置
-        $('tr.filter .filter-cancel').on('click', function(){
-            $('tr.filter input, select').val('').change();
-            jsDoQuery(null, true);
-        });
-
-		function getParams() {
-		 var cells = $('tr.filter')[0].cells
-			 ,params = {}
-			 ,name;
-		 $.each(cells, function(i, cell){
-			 var items = $('input,select', cell);
-			 for(var j = 0, item; item = items[j++];){
-				 name = $(item).attr('name');
-				 if(name){
-					 params[name] = $(item).val();
-				 }
-			 }
-		 });
-		 return params;
-		}
-
-        //提交
-        $('tr.filter .filter-submit').on('click', function(){
-            jsDoQuery(getParams(), true);
-        });
-
-        /*
-        * 获取数据 p: 要提交的参数， pagination: 是否重新分页
-        */
-        function jsDoQuery(p, pagination){
-            var roles = new Map();
-            // 查询下级角色
-            $.ajax({
-                url: "/role/findSubordinate",
-                type: "Get",
-                async:false,
-                data: null,
-                success: function (rs) {
-                    if(rs.status == "SUCCESS"){
-                        $.each(rs.list,function(i,obj){
-                            roles[obj.id] = obj;
-                        });
-                    }
-                }
-            });
-            var params = {};
-            if(p)
-                params = p;
-            //更新时间排序
-            params['order'] = 'lastLoginDate';
-            params['page'] = page;
-            // params['id_eq'] = "1";
-            var i = layer.load(2);
-            $get('/user' ,params, function(data){
-                var list = data.content;
-                $.each(list, function(i, obj) {
-                    if(roles[obj.roles[0].id] != null && roles[obj.roles[0].id] != undefined){
-                        obj.isEdit = 0;
-                    } else{
-                        obj.isEdit = 1;
-                    }
-                    obj.isAdmin = isAdmin;
-                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-                });
-
-                var bodyHtm = template('user_list_temp', {list: list});
-
-                $('#datatable_user tbody').html(bodyHtm)
-                    .find('.icheck').iCheck(icheckOptions)
-                    .on('ifChanged', iCheckChange);
-                if(pagination && list.length > 0){
-                    //重新分页
-                    initPagination = true;
-                    showPagination(data);
-                }
-                layer.close(i);
-
-                $('.line_allot_btn').on('click', openAllotWindow);
-            });
-        }
-
-        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({
-                totalPages: data.totalPages,
-                visiblePages: 6,
-                currentPage: page + 1,
-                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
-                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
-                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
-                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
-                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
-                onPageChange: function (num, type) {
-                    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) {
-                layer.open({
-                    type: 1,
-                    area: ['600px', '395px'],
-                    content: content,
-                    title: '线路调度权限分配',
-                    shift: 5,
-                    scrollbar: false,
-                    success: function () {
-                        $('#pageRealControlAllotWrap').trigger('init', id);
-                    }
-                });
-            });
-        }
-
-        //删除
-        $('#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();
-            });
-        });
-    },1000);
-
-});
-//改变状态
-function changeEnabled(id,enabled){
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
+<div class="page-head">
+	<div class="page-title">
+		<h1>用户管理</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">权限管理</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">用户管理</span></li>
+</ul>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-users font-dark"></i> <span
+						class="caption-subject font-dark sbold uppercase">用户数据表</span>
+				</div>
+				<div class="actions">
+					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a>
+
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table
+						class="table table-striped table-bordered table-hover table-checkable"
+						id="datatable_user">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="15%">登录名</th>
+								<th width="13%">姓名</th>
+								<th width="100">所属机构</th>
+								<th width="11%">角色</th>
+								<th width="10%">状态</th>
+								<th width="18%">最后登录时间</th>
+								<th width="18%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="userName_like">
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="name_like">
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="agencies_like">
+								</td>
+								<td></td>
+								<td>
+									<select class="form-control form-filter " name="enabled_eq">
+                                         <option value="">请选择...</option>
+                                         <option value="true">可用</option>
+                                         <option value="false">禁用</option>
+                                     </select>
+								</td>
+								<td></td>
+
+								<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>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script id="user_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<!--<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">-->
+		{{++i}}
+	</td>
+	<td>
+		{{obj.userName}}
+	</td>
+	<td>
+		{{obj.name}}
+	</td>
+	<td>
+		{{obj.agencies}}
+	</td>
+	<td>
+		{{each obj.roles as role j}}
+			{{role.roleName}}、
+		{{/each}}
+	</td>
+	<td>
+		{{if obj.enabled}}
+			可用
+		{{else}}
+			禁用
+		{{/if}}
+	</td>
+	<td>
+		{{obj.lastLoginDate}}
+	</td>
+	<td>
+		{{if obj.isEdit == 0}}
+			<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
+			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
+		{{/if}}
+		{{if obj.isAdmin}}
+			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
+		{{/if}}
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script>
+$(function(){
+	var page = 0, initPagination;
+	var user,isAdmin = false;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	};
+	$.get('/user/getCurrentUser', function(data) {
+        user = data;
+        var roles = user.roles;
+        $.each(roles,function () {
+            if(this.level == 1)
+                isAdmin = true;
+        })
+
+    });
+
+	setTimeout(function () {
+        $(document).on('click', 'a.reset_password', function () {
+            var id = $(this).data('id');
+            var name = $(this).data('name');
+            swal({
+                    title: "重装密码",
+                    text: "将登录名为"+name+"的用户，密码重置为随机密码！",
+                    type: "warning",
+                    showCancelButton: true,
+                    confirmButtonColor: "#DD6B55",
+                    confirmButtonText: "重置",
+                    cancelButtonText: "取消",
+                    closeOnConfirm: false },
+                function(){
+                    $.post('/user/resetPassword',{'id':id},function(result){
+                        if(result.status=='SUCCESS') {
+                            // 弹出添加成功提示消息
+                            swal("登录名为"+name+"的用户密码重置成功！", "success");
+                        } else if(result.status=='ERROR') {
+                            // 弹出添加失败提示消息
+                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
+                        }
+                        //				loadPage('list.html');
+                        // 发布后刷新页面
+                        jsDoQuery(getParams(), true);
+                    });
+                });
+        });
+        jsDoQuery(null,true);
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function(){
+            $('tr.filter input, select').val('').change();
+            jsDoQuery(null, true);
+        });
+
+		function getParams() {
+		 var cells = $('tr.filter')[0].cells
+			 ,params = {}
+			 ,name;
+		 $.each(cells, function(i, cell){
+			 var items = $('input,select', cell);
+			 for(var j = 0, item; item = items[j++];){
+				 name = $(item).attr('name');
+				 if(name){
+					 params[name] = $(item).val();
+				 }
+			 }
+		 });
+		 return params;
+		}
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function(){
+            jsDoQuery(getParams(), true);
+        });
+
+        /*
+        * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+        */
+        function jsDoQuery(p, pagination){
+            var roles = new Map();
+            // 查询下级角色
+            $.ajax({
+                url: "/role/findSubordinate",
+                type: "Get",
+                async:false,
+                data: null,
+                success: function (rs) {
+                    if(rs.status == "SUCCESS"){
+                        $.each(rs.list,function(i,obj){
+                            roles[obj.id] = obj;
+                        });
+                    }
+                }
+            });
+            var params = {};
+            if(p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'lastLoginDate';
+            params['page'] = page;
+            // params['id_eq'] = "1";
+            var i = layer.load(2);
+            $get('/user' ,params, function(data){
+                var list = data.content;
+                $.each(list, function(i, obj) {
+                    if(roles[obj.roles[0].id] != null && roles[obj.roles[0].id] != undefined){
+                        obj.isEdit = 0;
+                    } else{
+                        obj.isEdit = 1;
+                    }
+                    obj.isAdmin = isAdmin;
+                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+                });
+
+                var bodyHtm = template('user_list_temp', {list: list});
+
+                $('#datatable_user tbody').html(bodyHtm)
+                    .find('.icheck').iCheck(icheckOptions)
+                    .on('ifChanged', iCheckChange);
+                if(pagination && list.length > 0){
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+                layer.close(i);
+
+                $('.line_allot_btn').on('click', openAllotWindow);
+            });
+        }
+
+        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({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    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) {
+                layer.open({
+                    type: 1,
+                    area: ['600px', '395px'],
+                    content: content,
+                    title: '线路调度权限分配',
+                    shift: 5,
+                    scrollbar: false,
+                    success: function () {
+                        $('#pageRealControlAllotWrap').trigger('init', id);
+                    }
+                });
+            });
+        }
+
+        //删除
+        $('#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();
+            });
+        });
+    },1000);
+
+});
+//改变状态
+function changeEnabled(id,enabled){
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
 </script>
 \ No newline at end of file