From ccc6e51f22bf0b2b0cebb84e32f55a5cebdb9692 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 13 Aug 2021 14:59:26 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java |   54 +++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java b/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
index b886079..be23bff 100644
--- a/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
+++ b/src/main/java/org/springblade/modules/webscoket/service/impl/PushMsgServiceImpl.java
@@ -18,36 +18,52 @@
  */
 @Service
 public class PushMsgServiceImpl implements IPushMsgService {
-    @Override
-    public void pushMsg(String userId, String msg) {
-        Channel channel = NettyConfig.getUserChannelMap().get(userId);
-		if (channel != null){
+	@Override
+	public void pushMsg(String userId, String msg) {
+		Channel channel = NettyConfig.getUserChannelMap().get(userId);
+		if (channel != null) {
 			channel.writeAndFlush(new TextWebSocketFrame(msg));
 		}
 
-    }
+	}
 
-    @Override
-    public void pushMsg(String msg) {
-        ChannelGroup group = NettyConfig.getChannelGroup();
-        String name = group.name();
-        System.out.println("空间大小:"+group.size()+",名字:"+name);
-        group.writeAndFlush(new TextWebSocketFrame(msg));
-    }
+	@Override
+	public void pushMsg(String msg) {
+		ChannelGroup group = NettyConfig.getChannelGroup();
+		String name = group.name();
+		System.out.println("空间大小:" + group.size() + ",名字:" + name);
+		group.writeAndFlush(new TextWebSocketFrame(msg));
+	}
 
-    @Override
-	public int inviteVideoCall(String userId,String time,String type) {
-    	//返回值
+	@Override
+	public int inviteVideoCall(String userId, String time, String type, String name,String faqiid) {
+		//返回值
 		int res = 0;
 		Channel channel = NettyConfig.getUserChannelMap().get(userId);
-		Map<String, Object> map = new HashMap<String, Object>();
 		JSONObject jsonObject = new JSONObject();
-		jsonObject.put("type",type);
-		jsonObject.put("roomId",time);
-		if (channel != null){
+		jsonObject.put("type", type);
+		jsonObject.put("roomId", time);
+		jsonObject.put("name", name);
+		jsonObject.put("faqiid", faqiid);
+		if (channel != null) {
 			channel.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
 			res = 1;
 		}
 		return res;
 	}
+
+	@Override
+	public void closeVideoCall(String sentId, String acceptId) {
+		Channel channel1 = NettyConfig.getUserChannelMap().get(sentId);
+		Channel channel2 = NettyConfig.getUserChannelMap().get(acceptId);
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("type", "close");
+		if (channel1 != null) {
+			channel1.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
+		}
+		if (channel2 != null) {
+			channel2.writeAndFlush(new TextWebSocketFrame(String.valueOf(jsonObject)));
+		}
+
+	}
 }

--
Gitblit v1.9.3