Merge branch 'release' of 192.168.10.6:caosy/fun-admin into release

src/main/java/com/ctrip/fun/admin/controller/tools/CallCenterController.java

@@ -128,6 +128,7 @@ public class CallCenterController {
 			// 1)找出具体的命令实例。
 			// 1)找出具体的命令实例。
 			logger.debug("event [" + event + "] is ready to execute...");
 			logger.debug("event [" + event + "] is ready to execute...");
 			logger.debug(eventJsonString);
 			logger.debug(eventJsonString);
+			System.out.println("EEEEEEEEEEEEEEEEEEEEEEEEEEEEE: "+eventJsonString);
 			AbstractEventHandler eventHandler = eventHandlerMap.get(event);
 			AbstractEventHandler eventHandler = eventHandlerMap.get(event);
 
 
 			// 2)执行命令并返回结果
 			// 2)执行命令并返回结果

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

@@ -15,8 +15,8 @@ import com.ctrip.fun.admin.vo.callcenter.RsmwNewStateEvent;
  * 
  * 
  * ringing时弹屏, down时话后
  * ringing时弹屏, down时话后
  * 
  * 
- * @author jyf
  *
  *
+ * @author jyf
  */
  */
 @Controller
 @Controller
 public class NewStateEventHandler extends AbstractEventHandler {
 public class NewStateEventHandler extends AbstractEventHandler {
@@ -40,7 +40,9 @@ public class NewStateEventHandler extends AbstractEventHandler {
             logger.debug("收到了ringing消息： " + event.getChannel() + event.getConnectedLineNumber());
             logger.debug("收到了ringing消息： " + event.getChannel() + event.getConnectedLineNumber());
             //来电手机号码
             //来电手机号码
             String mobileNo = event.getConnectedLineNumber().replaceFirst("^0*", "");
             String mobileNo = event.getConnectedLineNumber().replaceFirst("^0*", "");
-            String callerIdNumber = event.getCallerIdNumber();
+//            String callerIdNumber = event.getCallerIdNumber();
+            String callerIdNumber = event.getChannel().substring(4, 8);
+            
             NewStateWebSocket.unicast(callerIdNumber,mobileNo);
             NewStateWebSocket.unicast(callerIdNumber,mobileNo);
         }
         }
         return "";
         return "";

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

@@ -6,19 +6,13 @@
     	url +=sipPhoneName;
     	url +=sipPhoneName;
     	if(webSocket==null){
     	if(webSocket==null){
 	    	webSocket=new WebSocket(url);
 	    	webSocket=new WebSocket(url);
+	    	webSocket.onerror = function(event) {};
+		    webSocket.onopen = function(event) {};
+		    webSocket.onmessage = function(event) {
+		    	window.open(event.data, "用户来电通知");
+		    };
+		    webSocket.onclose = function(event){};
     	}
     	}
-    	webSocket.onerror = function(event) {
-	    };
-	 
-	    webSocket.onopen = function(event) {
-	    };
-	 
-	    webSocket.onmessage = function(event) {
-	    	window.open(event.data, "用户来电通知");
-	    };
-	    webSocket.onclose = function(event){
-	    };
-    	
     }
     }
     //关闭Socket
     //关闭Socket
     function closeSocket(){
     function closeSocket(){