将顾问排序的优先级调整为

1、是否在线
2、活跃度

src/main/java/com/qiqiim/webserver/user/controller/ImController.java

@@ -70,17 +70,17 @@ public class ImController extends BaseController {
         request.setAttribute("allsession", userAccountServiceImpl.getAllConsultant(0l));
         return "user/consultantlist";
     }
-    @RequestMapping("/consultantlist1")
+    @RequestMapping("/conljtycsultant")
     public String consultantlist1(@RequestParam Map<String, Object> params,HttpServletRequest request){
         request.setAttribute("allsession", userAccountServiceImpl.getAllConsultant(1l));
         return "user/conljtycsultant";
     }
-    @RequestMapping("/consultantlist3")
+    @RequestMapping("/conljjlwsultant")
     public String consultantlist3(@RequestParam Map<String, Object> params,HttpServletRequest request){
         request.setAttribute("allsession", userAccountServiceImpl.getAllConsultant(3l));
         return "user/conljjlwsultant";
     }
-    @RequestMapping("/consultantlist4")
+    @RequestMapping("/conljjyfsultant")
     public String consultantlist4(@RequestParam Map<String, Object> params,HttpServletRequest request){
         request.setAttribute("allsession", userAccountServiceImpl.getAllConsultant(4l));
         return "user/conljjyfsultant";
@@ -506,15 +506,21 @@ public class ImController extends BaseController {
         Session[] sessions = sessionManager.getSessions();
         List<Session> list = Arrays.asList(sessions);
         List<UserAdminInfoEntity> resultList = userAdminInfoServiceImpl.sortOnlineAdmin(allAdminId);
+        List<UserAdminInfoEntity> onlineList = new ArrayList<>();
+        List<UserAdminInfoEntity> offlineList = new ArrayList<>();
         loop1:for (UserAdminInfoEntity userAdminInfoEntity : resultList) {
             for (Session session : sessions) {
                 if(Long.valueOf(session.getAccount()) == userAdminInfoEntity.getUid()) {
                     userAdminInfoEntity.setOnline(true);
+                    onlineList.add(userAdminInfoEntity);
                     continue loop1;
                 }
             }
+            offlineList.add(userAdminInfoEntity);
         }
-		return resultList;
+        //将在线客服排在非在线之前
+        onlineList.addAll(offlineList);
+		return onlineList;
     }
 
 
@@ -545,11 +551,26 @@ public class ImController extends BaseController {
             whereToGo = "";
         }
         if (files.length() > 0) {
-            userInfoServiceImpl.updateHeadPic("layui/images/headpic/" + fileName + ".jpg", uid);
-            return new ModelAndView("redirect:/consultantlist" + whereToGo);
+            userInfoServiceImpl.updateHeadPic("layui/images/headpic/" + files, uid);
+            if(whereToGo.equals("1")){
+                return new ModelAndView("redirect:/conljtycsultant");
+            }else if(whereToGo.equals("3")){
+                return new ModelAndView("redirect:/conljjlwsultant");
+            }else if(whereToGo.equals("4")){
+                return new ModelAndView("redirect:/conljjyfsultant");
+            }else{
+                return new ModelAndView("redirect:/consultantlist");
+            }
+        }
+        if(whereToGo.equals("1")){
+            return new ModelAndView("redirect:/conljtycsultant");
+        }else if(whereToGo.equals("3")){
+            return new ModelAndView("redirect:/conljjlwsultant");
+        }else if(whereToGo.equals("4")){
+            return new ModelAndView("redirect:/conljjyfsultant");
+        }else{
+            return new ModelAndView("redirect:/consultantlist");
         }
-
-        return new ModelAndView("redirect:/consultantlist" + whereToGo);
     }
 
 
@@ -559,7 +580,15 @@ public class ImController extends BaseController {
         if(consultantManagerEntity.getWhereToGo() == null){
             consultantManagerEntity.setWhereToGo("");
         }
-        return new ModelAndView("redirect:/consultantlist" + consultantManagerEntity.getWhereToGo());
+        if(consultantManagerEntity.getWhereToGo().equals("1")){
+            return new ModelAndView("redirect:/conljtycsultant");
+        }else if(consultantManagerEntity.getWhereToGo().equals("3")){
+            return new ModelAndView("redirect:/conljjlwsultant");
+        }else if(consultantManagerEntity.getWhereToGo().equals("4")){
+            return new ModelAndView("redirect:/conljjyfsultant");
+        }else{
+            return new ModelAndView("redirect:/consultantlist");
+        }
     }
 
     @RequestMapping(value = "/addConsultant", method = RequestMethod.POST)
@@ -581,7 +610,17 @@ public class ImController extends BaseController {
         userInfoEntity.setPhone(phone);
         userAccountEntity.setUserInfo(userInfoEntity);
         userAccountServiceImpl.save(userAccountEntity);
-        return new ModelAndView("redirect:/consultantlist" + whereToGo);
+        if(whereToGo.equals("1")){
+            return new ModelAndView("redirect:/conljtycsultant");
+        }else if(whereToGo.equals("3")){
+            return new ModelAndView("redirect:/conljjlwsultant");
+        }else if(whereToGo.equals("4")){
+            return new ModelAndView("redirect:/conljjyfsultant");
+        }else{
+            return new ModelAndView("redirect:/consultantlist");
+        }
+
+
     }
 
     @RequestMapping(value = "/delConsultant", method = RequestMethod.POST)
@@ -594,7 +633,15 @@ public class ImController extends BaseController {
         if(whereToGo == null){
             whereToGo = "";
         }
-        return new ModelAndView("redirect:/consultantlist" + whereToGo);
+        if(whereToGo.equals("1")){
+            return new ModelAndView("redirect:/conljtycsultant");
+        }else if(whereToGo.equals("3")){
+            return new ModelAndView("redirect:/conljjlwsultant");
+        }else if(whereToGo.equals("4")){
+            return new ModelAndView("redirect:/conljjyfsultant");
+        }else{
+            return new ModelAndView("redirect:/consultantlist");
+        }
     }
 }
 

src/main/webapp/WEB-INF/page/user/conljjlwsultant.jsp

@@ -35,7 +35,7 @@
             <tbody>
             <c:forEach items="${allsession}" var="user">
                 <tr>
-                    <td><img style="width: 75px;height: 75px" src="${user.headPic}"/></td>
+                    <td><img style="width: 50px;height: 50px" src="${user.headPic}"/></td>
                     <td>${user.id}</td>
                     <td>${user.account}</td>
                     <td>${user.name}</td>
@@ -107,8 +107,7 @@
                     <div class="layui-form-item">
                         <div class="layui-input-block">
                             <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank">返回
                             </a>
                         </div>
                     </div>
@@ -154,8 +153,7 @@
                     <div class="layui-form-item">
                         <div class="layui-input-block">
                             <button class="layui-btn" id="regBut" lay-submit="" lay-filter="reg">添加</button>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank">返回
                             </a>
                         </div>
                     </div>
@@ -172,6 +170,8 @@
 </div>
 
 <script>
+    layui.use('form', function(){
+        var form = layui.form;});
     var addForm = document.getElementById("addForm");
     var list = document.getElementById("list");
     var updatePicForm = document.getElementById("updatePic");

src/main/webapp/WEB-INF/page/user/conljjyfsultant.jsp

@@ -35,7 +35,7 @@
             <tbody>
             <c:forEach items="${allsession}" var="user">
                 <tr>
-                    <td><img style="width: 75px;height: 75px" src="${user.headPic}"/></td>
+                    <td><img style="width: 50px;height: 50px" src="${user.headPic}"/></td>
                     <td>${user.id}</td>
                     <td>${user.account}</td>
                     <td>${user.name}</td>
@@ -108,8 +108,7 @@
                     <div class="layui-form-item">
                         <div class="layui-input-block">
                             <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg" value="修改"/>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank">返回
                             </a>
                         </div>
                     </div>
@@ -155,8 +154,7 @@
                     <div class="layui-form-item">
                         <div class="layui-input-block">
                             <button class="layui-btn" id="regBut" lay-submit="" lay-filter="reg">添加</button>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank">返回
                             </a>
                         </div>
                     </div>
@@ -173,6 +171,8 @@
 </div>
 
 <script>
+    layui.use('form', function(){
+        var form = layui.form;});
     var addForm = document.getElementById("addForm");
     var list = document.getElementById("list");
     var updatePicForm = document.getElementById("updatePic");

src/main/webapp/WEB-INF/page/user/consultantlist.jsp

@@ -36,7 +36,7 @@
             <tbody>
             <c:forEach items="${allsession}" var="user">
                 <tr>
-                    <td><img style="width: 75px;height: 75px" src="${user.headPic}"/></td>
+                    <td><img style="width: 50px;height: 50px" src="${user.headPic}"/></td>
                     <td>${user.id}</td>
                     <td>${user.account}</td>
                     <td>${user.name}</td>
@@ -107,7 +107,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">所在部门</label>
                         <div class="layui-input-block">
-                            <select name="deptName" id="deptName1" lay-verify="required">
+                            <select name="deptName" id="deptName1" lay-verify="required" style="display: none">
                                 <option value="1" selected>
                                     路劲太阳城
                                 </option>
@@ -122,8 +122,7 @@
                         <div class="layui-input-block">
                             <input type="submit" id="updBut" class="layui-btn" lay-submit="" lay-filter="reg"
                                    value="修改"/>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()">返回
                             </a>
                         </div>
                     </div>
@@ -167,7 +166,7 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label">所在部门</label>
                         <div class="layui-input-block">
-                            <select name="deptid" id="deptid2" lay-verify="required" style="display: block">
+                            <select name="deptid" id="deptid2" lay-verify="required" style="display: none">
                                 <option value="1" selected>
                                     路劲太阳城
                                 </option>
@@ -176,22 +175,12 @@
                                 </option>
                                 <option value="4">路劲隽悦府</option>
                             </select>
-                            <%--<div class="layui-unselect layui-form-select">--%>
-                                <%--<div class="layui-select-title"><input type="text" placeholder="请选择" value="--%>
-							<%--路劲太阳城" readonly="" class="layui-input layui-unselect"><i class="layui-edge"></i></div>--%>
-                                <%--<dl class="layui-anim layui-anim-upbit" style="">--%>
-                                    <%--<dd lay-value="1" class="layui-this">路劲太阳城</dd>--%>
-                                    <%--<dd lay-value="3" class="">路劲隽澜湾</dd>--%>
-                                    <%--<dd lay-value="4" class="">路劲隽悦府</dd>--%>
-                                <%--</dl>--%>
-                            <%--</div>--%>
                         </div>
                     </div>
                     <div class="layui-form-item">
                         <div class="layui-input-block">
                             <button id="regBut" class="layui-btn" lay-submit="" lay-filter="reg">添加</button>
-                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank"><i
-                                    class="layui-icon">&#xe613;</i>返回
+                            <a class="layui-btn layui-btn-primary" onclick="cancel()" target="_blank">返回
                             </a>
                         </div>
                     </div>
@@ -209,6 +198,12 @@
 </div>
 
 <script>
+    layui.use('form', function(){
+        var form = layui.form;
+    });
+    layui.use('forms', function(){
+        var forms = layui.form;
+    });
     var delForm = document.getElementById("delForm");
     var addForm = document.getElementById("addForm");
     var list = document.getElementById("list");