set sessionMap as sipPhone,Session

src/main/java/com/ctrip/fun/admin/eventhandler/NewStateEventHandler.java

@@ -75,8 +75,9 @@ public class NewStateEventHandler extends AbstractEventHandler {
             String mobileNo = event.getConnectedLineNumber().replaceFirst("^0*", "");
 //            String username = SecurityContextHolder.getContext().getAuthentication().getName();
 //            UserDetails user = (UserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal();  
-    		String username = SpringSecurityUtil.getCurrentUserName();
-            NewStateWebSocket.unicast(username,mobileNo);
+    		//String username = SpringSecurityUtil.getCurrentUserName();
+            String callerIdNumber = event.getCallerIdNumber();
+            NewStateWebSocket.unicast(callerIdNumber,mobileNo);
             
         
             

src/main/java/com/ctrip/fun/admin/eventhandler/NewStateWebSocket.java

@@ -12,6 +12,11 @@ import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 
+/**
+ * userName : 代表分机号
+ * @author lyhuang
+ *
+ */
 @ServerEndpoint("/websocket/{userName}")
 public class NewStateWebSocket {
 	
@@ -87,9 +92,10 @@ public class NewStateWebSocket {
 	public static void unicast(String username, String mobileNo) {
 		String message = "/system/user/"+mobileNo+"/detailByUid";
 		Session session = sessionMap.get(username);
-		NewStateWebSocket socket = NewStateWebSocket.getInstance();
+		//NewStateWebSocket socket = NewStateWebSocket.getInstance();
 		try {
-			socket.onMessage(message, session, username);
+			session.getBasicRemote().sendText(message);
+			//socket.onMessage(message, session, username);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

src/main/webapp/WEB-INF/templates/common/navbar.ftl

 
 <div class="navbar">
-	<input type="hidden" name="loginUsername" id="loginUsername" value="${Session["SPRING_SECURITY_CONTEXT"].authentication.name}" />
 	
+	<input type="hidden" name="loginUsername" id="loginUsername" value='${Session["SPRING_SECURITY_CONTEXT"].authentication.name}' />
     <div class="navbar-inner">
         <a class="logo" href="/golf/course/list">主题游管理</a>
         <ul class="nav">

src/main/webapp/resource/js/app/op.js

@@ -15,6 +15,8 @@
 		 
 		    webSocket.onopen = function(event) {
 	//    		document.getElementById("list").innerHTML="连接建立成功！";
+//		    	var msg = "username"+":"+loginUsername;
+//		    	webSocket.send(msg);
 		    };
 		 
 		    webSocket.onmessage = function(event) {
@@ -32,20 +34,22 @@
     }
     
     
-    /*function sendMessage() {
-      var msg=document.getElementById("nickname").value+"："+document.getElementById("textarea").value;
-      document.getElementById("textarea").value="";
-      webSocket.send(msg);
-    }*/
+    function sendMessage(msg) {
+//      var msg=document.getElementById("nickname").value+"："+document.getElementById("textarea").value;
+//      document.getElementById("textarea").value="";
+//      webSocket.send(msg);
+    }
 
 	$(document).ready(function(data){
 		//查询绑定关系
 		var loginUsername = $("#loginUsername").val();
+		var sipPhoneName = "";
 		$.get("/callcenter/sipPhone/getBindInfo?agentAid="+loginUsername,{},function(data){
 			var vhtml ="";
+			sipPhoneName = data.sipPhoneName;
 			if(data.errCode==0 && data.sipPhoneName!=0){
 				vhtml = '<button class="btn btn-default  btn-danger" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">';
-				vhtml += '已绑座机: '+data.sipPhoneName;
+				vhtml += '已绑座机: '+sipPhoneName;
 				vhtml += '<span class="caret"></span></button>';
 				vhtml += '<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">';
 				vhtml += '<li><a href="#"  data-toggle="modal" data-target="#bindModal">重新绑定</a></li>';
@@ -57,7 +61,7 @@
 			}
 			$(".navbar .pull-right .dropdown").html(vhtml);
 		});
-		connectSocket(loginUsername);
+		connectSocket(sipPhoneName);
 
 	});
 	$('#bindModal').on('show.bs.modal', function (e) {